From b103d976a96e374a4a452ac43e60a8adb3a6f986 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 14:36:49 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E9=94=80=E5=94=AE=E5=AF=B9=E5=BA=94=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8A=A9=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../EmisWaybillAjustApplyServiceImpl.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index dddf0cd64..6efc9671f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -24,6 +24,7 @@ import com.xdadan.erp.emis.domain.enumtype.WaybillOperLogType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.vo.WaybillOrder; import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper; +import com.xdadan.erp.emis.mapper.EmisSalesmenRelMapper; import com.xdadan.erp.emis.service.*; import com.xdadan.erp.system.domain.SysPost; import com.xdadan.erp.system.mapper.SysPostMapper; @@ -74,6 +75,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements @Autowired private SysUserMapper sysUserMapper; + @Autowired + private EmisSalesmenRelMapper emisSalesmenRelMapper; + /** * 查询运单调整申请 @@ -540,18 +544,18 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; // 1. 根据applyManCode查询用户岗位，判断是否包含CP（单证员） -// boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); + // boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); // 2. 检测网点费用申请是否涉及费用发生变化 boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave); if (!feeChanged) { - return; //费用没有变化，无需特殊处理 + return; // 费用没有变化，无需特殊处理 } boolean isDZZS = checkIsDZZS(emisWaybillAjustApply.getApplyManCode()); - if (!isDZZS ) { + if (!isDZZS) { return; // 不是单证专属，无需特殊处理 } @@ -566,6 +570,18 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements } if (!StringUtils.isEmpty(salesmen)) { empNames.add(salesmen); + // 从销售关联表查询销售助理并加入通知名单 + EmisSalesmenRel relCond = new EmisSalesmenRel(); + relCond.setSalesmen(salesmen); + relCond.setBlOpen("1"); + List relList = emisSalesmenRelMapper.selectEmisSalesmenRelList(relCond); + if (!CollectionUtils.isEmpty(relList)) { + for (EmisSalesmenRel rel : relList) { + if (rel != null && !StringUtils.isEmpty(rel.getSalesAss())) { + empNames.add(rel.getSalesAss()); + } + } + } } // 5. 查询去重后的emp_name对应的emp_code @@ -579,7 +595,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements if (!notifyEmpCodes.isEmpty()) { for (String empCode : notifyEmpCodes) { if (!StringUtils.isEmpty(empCode)) { - String title = emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empCode + "仔细核对，" + "单号【" + emisWaybillAjustApply.getBillCode() + "】"; + String title = emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empCode + "仔细核对，" + + "单号【" + emisWaybillAjustApply.getBillCode() + "】"; sendNoticeToEmpUser(empCode, title, "", clickPath); }