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 66408a349..7c3e4cd0f 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 @@ -31,8 +31,6 @@ import com.xdadan.erp.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper; @@ -426,7 +424,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); // 检查申请人是否为单证员且费用发生变化时,需要通知相关人员 - checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave); + checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave, isDZZS); if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 @@ -533,21 +531,22 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements * @param emisWaybillAjustApply 运单调整申请 * @param emisWaybillOld 原运单信息 * @param emisWaybillSave 新运单信息 + * @param isDZZS */ private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply, - EmisWaybill emisWaybillOld, - EmisWaybill emisWaybillSave) { + EmisWaybill emisWaybillOld, + EmisWaybill emisWaybillSave, boolean isDZZS) { try { // String message = "单证员已对运单费用进行调整,请关注相关变化"; 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 (!isCP || !feeChanged) { + if (!isDZZS || !feeChanged) { return; // 不是单证员/费用没有变化,无需特殊处理 }