From e035ed5ddb694e34379c0aff79bf4f3abd164c5d Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Thu, 20 Jun 2024 11:10:06 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 4 +-- .../web/controller/quot/QuotController.java | 20 +++++++++++ .../src/main/resources/application-druid.yml | 12 +++---- .../main/java/com/ruoyi/quot/domain/Quot.java | 5 +++ .../java/com/ruoyi/quot/domain/SysOaQuot.java | 13 +++++++ .../main/resources/mapper/quot/QuotMapper.xml | 17 +++++++-- ruoyi-ui/src/views/quot/quot/index.vue | 36 ++++++++++++++++--- ruoyi-ui/src/views/redBook/productSelect.vue | 2 +- 8 files changed, 92 insertions(+), 17 deletions(-) diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index dd2d83b..565b979 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Wed Jun 19 20:15:41 CST 2024 +#Thu Jun 20 11:01:14 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.125 @@ -7,5 +7,5 @@ jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=fO[y6l4?vRT=RiyZx5)29/4S?-@n6ptS-pq0DsUMXTA4CDTk +jco.client.passwd=w7hAeYb,##Zc}g(emH-GJL;?*-*mA;_enm-`{=LFKC[%7:pE jco.client.client=800 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 faf2eac..f78c391 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 @@ -743,6 +743,26 @@ public class QuotController extends BaseController sysOaQuot.setQuotLvPrice(quot.getQuotLvPrice()); sysOaQuot.setQuotTongPrice(quot.getQuotTongPrice()); sysOaQuot.setQuotMatpriceDiff(quot.getQuotMatpriceDiff()); + sysOaQuot.setQuotMatpriceDiff2(quot.getQuotMatpriceDiff2()); + + // 上传反馈清单 + QuotFile quotFile = new QuotFile(); + quotFile.setRelationId(quot.getQuotId()); + quotFile.setFileType("quotFkFile"); + List fileList = quotFileService.selectQuotFileList(quotFile); + String fileString = ""; + if(fileList!=null&&fileList.size()>0){ + for(QuotFile f:fileList){ + String fileUrl = f.getFileUrl(); + if(StringUtils.isEmpty(fileString)){ + fileString = fileString+fileUrl; + }else{ + fileString = fileString+","+fileUrl; + } + } + } + sysOaQuot.setQuotFkFile(fileString); + sysOaQuot.setCreateTime(DateUtils.getNowDate()); sysOaQuot.setIsFinish("0");// 报价已提交OA审批中 sysOaQuot.setMaterials(quot.getQuotMaterialList()); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 91d30d0..e8b56b2 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -53,14 +53,14 @@ spring: url: jdbc:sqlserver://192.168.9.99:1433;DatabaseName=jn_storage username: sa password: Itcenter110- - order: + #order: # 从数据源开关/默认关闭 - enabled: true - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #enabled: true + #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # 正式数据库 - url: jdbc:sqlserver://192.168.9.2:1433;DatabaseName=jn_web - username: sa - password: it12345 + #url: jdbc:sqlserver://192.168.9.2:1433;DatabaseName=jn_web + #username: sa + #password: it12345 # OA数据库数据源 oa: # 从数据源开关/默认关闭 diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index c14c84c..eba39fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -93,6 +93,8 @@ public class Quot extends BaseEntity /** 整单料价价差率 */ private String quotMatpriceDiff; + /** 整单料价价差率2 */ + private String quotMatpriceDiff2; /** 是否打印 */ private String quotPrint; @@ -305,6 +307,9 @@ public class Quot extends BaseEntity public String getQuotMatpriceDiff() { return quotMatpriceDiff; } public void setQuotMatpriceDiff(String quotMatpriceDiff) { this.quotMatpriceDiff = quotMatpriceDiff; } + public String getQuotMatpriceDiff2() { return quotMatpriceDiff2; } + + public void setQuotMatpriceDiff2(String quotMatpriceDiff2) { this.quotMatpriceDiff2 = quotMatpriceDiff2; } public String getQuotPrint() { return quotPrint; } public void setQuotPrint(String quotPrint) { this.quotPrint = quotPrint; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java index 2373c32..670e2d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java @@ -60,6 +60,11 @@ public class SysOaQuot extends BaseEntity /** 整单料价价差率 */ private String quotMatpriceDiff; + /** 整单料价价差率2 */ + private String quotMatpriceDiff2; + + /** 询价单-询价清单地址 */ + private String quotFkFile; /** OA审批状态 */ private String state; @@ -191,6 +196,14 @@ public class SysOaQuot extends BaseEntity this.quotMatpriceDiff = quotMatpriceDiff; } + public String getQuotMatpriceDiff2() { return quotMatpriceDiff2; } + + public void setQuotMatpriceDiff2(String quotMatpriceDiff2) { this.quotMatpriceDiff2 = quotMatpriceDiff2; } + + public String getQuotFkFile() { return quotFkFile; } + + public void setQuotFkFile(String quotFkFile) { this.quotFkFile = quotFkFile; } + public String getState() { return state; } public void setState(String state) { this.state = state; } diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 7ba2bb2..ae99598 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -113,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,a.quot_materials_count, - a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, + a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, @@ -143,10 +144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and quot_salesman_name like concat('%', #{quotSalesmanName}, '%') and quot_print = #{quotPrint} and quot_approval_status = #{quotApprovalStatus} + and quot_oa_approval_status = #{quotOAApprovalStatus} ${params.dataScope} - order by a.quot_inquiry_date desc +