From ca94198d512a554fed4593bca3a7671b7d3d2470 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 12 Sep 2025 09:39:14 +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?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?=
 =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../impl/EmisWaybillAjustApplyServiceImpl.java      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 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; // 不是单证员/费用没有变化，无需特殊处理
             }