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 7c3e4cd0f..dddf0cd64 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 @@ -424,7 +424,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); // 检查申请人是否为单证员且费用发生变化时,需要通知相关人员 - checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave, isDZZS); + checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave); if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 @@ -531,11 +531,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements * @param emisWaybillAjustApply 运单调整申请 * @param emisWaybillOld 原运单信息 * @param emisWaybillSave 新运单信息 - * @param isDZZS */ private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply, EmisWaybill emisWaybillOld, - EmisWaybill emisWaybillSave, boolean isDZZS) { + EmisWaybill emisWaybillSave) { try { // String message = "单证员已对运单费用进行调整,请关注相关变化"; String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; @@ -546,8 +545,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements // 2. 检测网点费用申请是否涉及费用发生变化 boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave); - if (!isDZZS || !feeChanged) { - return; // 不是单证员/费用没有变化,无需特殊处理 + if (!feeChanged) { + return; //费用没有变化,无需特殊处理 + } + + boolean isDZZS = checkIsDZZS(emisWaybillAjustApply.getApplyManCode()); + + if (!isDZZS ) { + return; // 不是单证专属,无需特殊处理 } // 3. 获取运单对应的payee、salesmen信息