diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index d913671..bab5541 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Fri May 31 09:03:02 CST 2024 +#Mon Jun 03 10:50:48 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.120 @@ -7,5 +7,5 @@ jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=dK4Y;AwNNY+M!AP8*j!bqsNgHiN+no{qJ7swP{yqQ,;.~I8T +jco.client.passwd=654321 jco.client.client=300 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java index 2bceeff..9861aba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java @@ -227,7 +227,6 @@ public class CustomerController extends BaseController customer.setUpdateBy(getUsername()); customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 }else{// 数据组创建的客户数据提交SAP - customer.setCusId(UUID.fastUUID().toString()); customer.setCusCode(IdUtils.createNo("KH_",2)); customer.setCreateBy(getUsername()); customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 @@ -250,6 +249,7 @@ public class CustomerController extends BaseController if(StringUtils.isNotEmpty(customer.getCusId())) {// 数据组 提交业务员创建的客户数据提交SAP customerService.updateCustomer(customer); }else{ + customer.setCusId(UUID.fastUUID().toString()); customerService.insertCustomer(customer); } }else{ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java index bb68be9..2136654 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java @@ -449,6 +449,7 @@ public class SapRfcUtils { JCoStructure jCoStructure = input.getStructure("IS_CUSTOMER"); jCoStructure.setValue("KTOKK",customer.getCusGroup());//客户账户组 jCoStructure.setValue("TITLE_MEDI","0003");//称谓文本 + jCoStructure.setValue("KUNNR",customer.getCusSapCode());//客户SAP编码 jCoStructure.setValue("NAME1",customer.getCusName());//客户名称 jCoStructure.setValue("SORT1",customer.getCusName());//搜索项1 jCoStructure.setValue("LANGU",customer.getCusLanguage());//SAP 语言代码 diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 8d771f1..5157dc4 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -131,7 +131,7 @@ > - + @@ -1295,7 +1295,7 @@ 提交技术协助 提交核价审核 - 生成报价单 + 生成报价单 提交反馈 驳回