From e8815264a9cbc4ece53771d194abbfa26afa73b1 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 7 Jun 2024 08:25:07 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 4 ++-- .../web/controller/customer/CustomerController.java | 6 +++--- .../com/ruoyi/web/controller/quot/QuotController.java | 9 ++++----- .../web/controller/redBook/RedBookController.java | 2 +- ruoyi-ui/src/store/modules/user.js | 1 + ruoyi-ui/src/views/quot/quot/index.vue | 11 ++++++----- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 0ff8fe6..bf5724d 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Thu Jun 06 14:19:16 CST 2024 +#Fri Jun 07 08:18:57 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=fyP*^^S)mI4.TUT*}uMrHy])~sv.u}p[_7L*O}z3,^XTYYOu +jco.client.passwd=wcV2,:%3ns!n1TrQ,`o|.r`%fsDCCa5oz~~`VEonO~?t$xIU 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 4d2f7a8..d2e3f0b 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 @@ -162,7 +162,7 @@ public class CustomerController extends BaseController public AjaxResult add(@RequestBody Customer customer) { customer.setCusId(UUID.fastUUID().toString()); - customer.setCusCode(IdUtils.createNo("KH_",2)); + customer.setCusCode(IdUtils.createNo("KH_",0)); customer.setCreateBy(getUsername()); return toAjax(customerService.insertCustomer(customer)); } @@ -192,7 +192,7 @@ public class CustomerController extends BaseController if(StringUtils.isEmpty(cus_id)){ customer.setCusId(UUID.fastUUID().toString()); - customer.setCusCode(IdUtils.createNo("KH_",2)); + customer.setCusCode(IdUtils.createNo("KH_",0)); customer.setCreateBy(getUsername()); customerService.insertCustomer(customer); sendNotice(customer);//发送消息至数据组 @@ -235,7 +235,7 @@ public class CustomerController extends BaseController customer.setUpdateBy(getUsername()); customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 }else{// 数据组创建的客户数据提交SAP - customer.setCusCode(IdUtils.createNo("KH_",2)); + customer.setCusCode(IdUtils.createNo("KH_",0)); customer.setCreateBy(getUsername()); customer.setCusApprovalStatus("2");//客户提交 状态设置为 已审核 } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 4cffba5..bc515e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -173,7 +173,7 @@ public class QuotController extends BaseController public AjaxResult add(@RequestBody Quot quot) { quot.setQuotId(UUID.fastUUID().toString()); - quot.setQuotCode(IdUtils.createNo("BJD_",2)); + quot.setQuotCode(IdUtils.createNo("BJD_",0)); quot.setCreateBy(getUsername()); quot.setQuotSalesmanCode(getUsername()); quot.setUpdateBy(getUsername()); @@ -313,7 +313,7 @@ public class QuotController extends BaseController if(StringUtils.isEmpty(quot_id)){ quot.setQuotId(UUID.fastUUID().toString()); - quot.setQuotCode(IdUtils.createNo("BJD_",2)); + quot.setQuotCode(IdUtils.createNo("BJD_",0)); quot.setCreateBy(getUsername()); quot.setQuotSalesmanCode(getUsername()); quotService.insertQuot(quot); @@ -359,7 +359,7 @@ public class QuotController extends BaseController QuotJsqr quotJsqr = new QuotJsqr(); String quotJsqrId = UUID.fastUUID().toString(); quotJsqr.setQuotJsqrId(quotJsqrId); - quotJsqr.setQuotJsqrCode(IdUtils.createNo("BJD_JSQR_",2)); + quotJsqr.setQuotJsqrCode(IdUtils.createNo("BJD_JSQR_",0)); //特缆、低压、中压、其他 协助状态设置 if(quotJsxzGroup.indexOf("TL")!=-1){ @@ -424,7 +424,7 @@ public class QuotController extends BaseController QuotHj quotHj = new QuotHj(); String quotHjId = UUID.fastUUID().toString(); quotHj.setQuotHjId(quotHjId); - quotHj.setQuotHjCode(IdUtils.createNo("BJD_HJ_",2)); + quotHj.setQuotHjCode(IdUtils.createNo("BJD_HJ_",0)); quotHj.setQuotHjPricingType("10");//核价类型 设置为 报价核价 quotHj.setCreateBy(getUsername()); @@ -557,7 +557,6 @@ public class QuotController extends BaseController @PreAuthorize("@ss.hasPermi('quot:quot:madeQuot')") public void madeQuot(HttpServletResponse response, @RequestBody Quot quot) { - quotService.updateQuot(quot); List list = quot.getQuotMaterialList(); excelUtil.exportQuotExcel(response,quot,list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java index 3c36f5b..002fe95 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java @@ -226,7 +226,7 @@ public class RedBookController extends BaseController { if(StringUtils.isEmpty(quot.getQuot_id())){ quot.setQuot_id(UUID.fastUUID().toString()); - quot.setQuotCode(IdUtils.createNo("BJD_",2)); + quot.setQuotCode(IdUtils.createNo("BJD_",0)); quot.setCreateBy(getUsername()); redBookService.insertOAQuot(quot); }else{ diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index 3dc4e6e..7524e8d 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -7,6 +7,7 @@ const user = { token: getToken(), id: '', name: '', + nickName: '', avatar: '', roles: [], permissions: [], diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 9e23807..ea38b46 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -336,13 +336,13 @@ - - + + - + @@ -1235,8 +1235,9 @@ export default { this.reset(); this.open = true; this.activeName = "quotInfo"; - this.form.quotSalesmanName = this.$store.state.user.sapUserName; - this.form.quotSalesmanBm = this.$store.state.user.sapBm; + this.form.quotSalesmanName = this.$store.state.user.nickName; + //this.form.quotSalesmanName = this.$store.state.user.sapUserName; + //this.form.quotSalesmanBm = this.$store.state.user.sapBm; this.form.quotSalesmanDeptId = this.$store.state.user.deptId; this.form.quotSalesmanDeptName = this.$store.state.user.deptName; },