From e06791ed286cf05ee21979e79be33b68d9b42b5f Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 28 Jul 2025 14:02:14 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=E8=81=94=E8=B0=83bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=8F=90=E6=88=90=E6=96=B9=E6=A1=88=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20-=20=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xdadan/erp/emis/domain/EmisCommissionQuote.java | 2 +- .../impl/EmisSalesCommissionRatioServiceImpl.java | 2 +- .../emis/service/impl/EmisWaybillServiceImpl.java | 8 ++++++++ .../resources/mapper/EmisCommissionQuoteMapper.xml | 12 +++++++++++- .../mapper/EmisSalesCommissionRatioMapper.xml | 3 ++- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java index 54405e46c..51c16314d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java @@ -65,7 +65,7 @@ public class EmisCommissionQuote extends BaseEntity private String postType; /* 快递类型:emis_biz_shipping_method */ private String transType; - /* 启用状态 1-启用 0-停用 */ + /* 启用状态 1-启用 0-停用 2-启用已过期 3-启用未过期 */ private String blOpen; /* 员工编号 */ private String empCode; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java index c25674d86..1548e5064 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSalesCommissionRatioServiceImpl.java @@ -29,7 +29,7 @@ public class EmisSalesCommissionRatioServiceImpl implements IEmisSalesCommission */ @Override public EmisSalesCommissionRatio selectEmisSalesCommissionRatioById(Long id) { - return emisSalesCommissionRatioMapper.selectById(id); + return emisSalesCommissionRatioMapper.selectEmisSalesCommissionRatioById(id); } /** 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 6945c5faf..6c14b452c 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 @@ -987,6 +987,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if (CollectionUtil.isEmpty(salesmenUsers)) { throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不支持回款"); } +// SysUser payeeUser = getEmisStaffByEmpName(emisWaybillSave.getPayee()); +// if (Objects.isNull(payeeUser)) { +// throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人不支持回款"); +// } +// SysUser salesUser = getEmisStaffByEmpName(emisWaybillSave.getSalesmen()); +// if (Objects.isNull(salesUser)) { +// throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不支持回款"); +// } // 包装类型 String packTypeStr = emisWaybillSave.getPackType(); diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml index 1e14e0269..5df59664f 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml @@ -60,7 +60,17 @@ and calc_weight_type=#{calcWeightType} and post_type=#{postType} and ( FIND_IN_SET(#{transType},trans_type) ) - and bl_open=#{blOpen} + + + and bl_open = '1' + and end_date < NOW() + + + and bl_open = '1' + and end_date >= NOW() + + + 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='全部') diff --git a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml index 98a9a2a94..caff09c55 100644 --- a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml @@ -21,6 +21,7 @@ - where id = #{id} + where del_flag='0' and id = #{id}