diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 4b51fa0..ee158ac 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Wed May 29 10:07:47 CST 2024 +#Wed May 29 13:58:29 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.120 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java index b34b447..9694076 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/quot/quotJswController.java @@ -17,6 +17,7 @@ public class quotJswController extends BaseController { @PostMapping("/updateQuot") public R updateQuot(quotModel quot) { + System.out.println(quot.getQuotCode()); return R.ok(quot); } } 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 8568a7e..bb68be9 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 @@ -461,6 +461,11 @@ public class SapRfcUtils { jCoStructure.setValue("BAHNS",customer.getCusVatNo());//增值税号 jCoStructure.setValue("TEL_NUMBER",customer.getCusPhoneNumber());//电话号码 jCoStructure.setValue("BRAN1",customer.getCusIndustryCode());//行业代码 + + jCoStructure.setValue("BAHNE",customer.getCusRegistCapiQcc());//客户注册资本 + jCoStructure.setValue("LOCCO",customer.getCusPersonScopeQcc());//客户人员规模 + jCoStructure.setValue("JMJAH",customer.getCusInsuredCountQcc());//客户参保人数 + jCoStructure.setValue("FLAG","审核通过");//审批通过 @@ -490,7 +495,20 @@ public class SapRfcUtils { tableInfo4.appendRow(); tableInfo4.setValue("BANKS",bank.getBankCountry());//国家 tableInfo4.setValue("BANKL",bank.getBankCode());//银行代码 - tableInfo4.setValue("KOINH",bank.getBankAccount());//银行账户 + + String bankAccount = bank.getBankAccount();//银行账户 + if(StringUtils.isNotBlank(bankAccount)){ + bankAccount = bankAccount.replace(" ",""); + if(bankAccount.length()>=18){ + String KOINH = bankAccount.substring(0, 18); + String BKREF = bankAccount.substring(18); + tableInfo4.setValue("KOINH",KOINH);//银行账户 + tableInfo4.setValue("BKREF",BKREF);//银行账户2 + }else{ + String KOINH = bankAccount; + tableInfo4.setValue("KOINH",KOINH);//银行账户 + } + } } function.execute(destination); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index e8410d4..ce08a44 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -132,6 +132,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/websocket/**").permitAll() + .antMatchers("/jsw/jsw/**").permitAll() .antMatchers("/magic/web/**").anonymous() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue index 96df81d..c294a77 100644 --- a/ruoyi-ui/src/views/customer/customer/index.vue +++ b/ruoyi-ui/src/views/customer/customer/index.vue @@ -1070,23 +1070,23 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.form.bankList = this.bankList; - // 遍历表格数据 - try{ + + if (this.form.cusId != null) {//数据组审核 this.bankList.forEach((row, index) => { if(!row.bankCode){ this.$modal.msgError("银行代码不能为空"); throw new Error; } }) - }catch(e){ - return; } - commitSAPCustomer(this.form).then(response => { - this.$modal.msgSuccess("提交SAP成功"); - this.open = false; - this.getList(); - }); + this.$modal.confirm('是否确认提交该客户至SAP?').then(function() {}).then(() => { + commitSAPCustomer(this.form).then(response => { + this.$modal.msgSuccess("提交SAP成功"); + this.open = false; + this.getList(); + }); + }).catch(() => {}); } }); },