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); }