From e46dc56bff94272d828c712fcbb06c9ab0309374 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 11 Jul 2025 14:13:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=E8=BF=90=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=96=E4=BB=B6=E6=96=B9=E5=BC=8F=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=AF=84=E4=BB=B6=E7=BD=91=E7=82=B9=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AEbug=E4=BF=AE=E5=A4=8D=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java | 2 +- .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 7cee9f0a8..c9b0550ed 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -208,7 +208,7 @@ public class EmisWaybill extends BaseEntity @TableField @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method") private String dispatchMethod; - /* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */ + /* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */ @TableField @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi") private String pickupMethod; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index fb8f7ebed..2f7445acc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -2071,6 +2071,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setPackType("2"); } + if ("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod())) { + emisWaybillSave.setTakePieceEmployeeCode(null); + } // 如果专属业务员不为空，则寄件网点使用业务员的网点 if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){ SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode()); From 86569422ae0a719cfb88769926ab9b2c9c2eb8a3 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 11 Jul 2025 15:21:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=E8=BF=90=E5=8D=95=E6=8F=90?= =?UTF-8?q?=E6=88=90=E6=98=8E=E7=BB=86=E9=87=8D=E7=AE=97=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=8F=90=E6=88=90=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E9=80=89=E6=8B=A9=E5=90=88=E9=80=82=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=99=E8=AE=A1=E7=AE=97bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisCommissionProfitServiceImpl.java | 14 +++++++------- .../resources/mapper/EmisCommissionQuoteMapper.xml | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java index 7176da957..5b5a5ef59 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java @@ -474,7 +474,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode()); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); @@ -607,7 +607,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode()); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); @@ -747,7 +747,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setEmpName(empUser.getEmpName()); @@ -895,7 +895,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setEmpName(empUser.getEmpName()); @@ -1041,7 +1041,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setEmpName(empUser.getEmpName()); @@ -1157,7 +1157,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setEmpName(salesmen); @@ -1293,7 +1293,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry()); - emisCommissionQuote.setTransLine(waybill.getTransLineType()); + emisCommissionQuote.setTransLineCode(waybill.getTransLineType()); emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setTransType(transLine.getTransType()); diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml index 694f41bc6..d7fa9b110 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml @@ -92,8 +92,10 @@ and bl_open=#{blOpen} and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1') and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') - - and ( trans_line_code=#{transLineCode} or trans_line_code is null or trans_line_code='') + and ( + FIND_IN_SET(#{transLineCode},trans_line_code) + or trans_line_code is null or trans_line_code='') + and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='')