From be6e3279d16e391bdbf93846848b7564fe9a6997 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 3 Jun 2025 11:45:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?demand:=20=E8=88=AA=E7=BA=BF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E6=94=AF=E6=8C=81=E6=8C=89=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=88=AA=E7=BA=BF=E6=9F=A5=E8=AF=A2/=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=89=E5=A4=9A=E4=B8=AA=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7/=E8=B4=A6=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2/?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/EmisSettleInvoiceChRecordMapper.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index ba7a519da..534e30dd2 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 emis_settle_invoice_rel rel
                 where a.apply_seq_no=rel.apply_seq_no and
                 rel.del_flag = '0'
-                and FIND_IN_SET(rel.`bill_no`,#{params.billCode})
+                and rel.bill_no REGEXP REPLACE(#{params.billCode}, '\n', '|')
                 )
                 <!--
                 AND apply_seq_no IN (
@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 select 1 from emis_settle_invoice_bill_rel x3
                 where  x3.del_flag = '0'
                 and  a.apply_seq_no=x3.apply_seq_no
-                AND FIND_IN_SET(x3.settle_bill_no, #{settleBillNo})
+                AND x3.settle_bill_no REGEXP REPLACE(#{params.settleBillNo}, '\n', '|')
                 )
             </if>
 
@@ -421,7 +421,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             emis_settle_invoice_rel rel
             where a.apply_seq_no=rel.apply_seq_no and
             rel.del_flag = '0'
-            and FIND_IN_SET(rel.`bill_no`,#{params.billCode})
+            and rel.bill_no REGEXP REPLACE(#{params.billCode}, '\n', '|')
             )
         </if>
 
@@ -431,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             FROM emis_settle_invoice_bill_rel x3
             WHERE x3.del_flag = '0'
             AND a.apply_seq_no = x3.apply_seq_no
-            AND FIND_IN_SET(x3.settle_bill_no, #{params.settleBillNo})
+            AND x3.settle_bill_no REGEXP REPLACE(#{params.settleBillNo}, '\n', '|')
             )
         </if>
 

From 6d06ca6fcc77496d933d62c97a425892c297bd79 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 4 Jun 2025 09:57:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?demand:=20=E9=97=AE=E9=A2=98=E4=BB=B6?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E7=AD=89=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=A7=A6=E5=8F=91=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E9=87=8D=E7=AE=97=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/EmisBaseService.java     | 13 +++++++++++
 .../EmisWaybillAjustApplyServiceImpl.java     | 22 +++++++++++++++----
 .../EmisWaybillProblemInfoServiceImpl.java    | 11 ++++++++++
 .../service/impl/EmisWaybillServiceImpl.java  | 16 +++++++++++++-
 .../EmisSettleInvoiceChRecordMapper.xml       |  8 +++----
 5 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index f681dd9c8..ad2b71ce5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -168,6 +168,9 @@ public class EmisBaseService {
      @Autowired
      private EmisTempCreditCustomerMapper emisTempCreditCustomerMapper;
 
+     @Autowired
+     private EmisCommissionDtlMapper emisCommissionDtlMapper;
+
      private static SysUser emptySysUser = new SysUser();
 
      static {
@@ -2329,6 +2332,9 @@ public class EmisBaseService {
          waybillProblemInfo.setDataFrom(WaybillHelper.getDataFrom());
          emisWaybillProblemInfoMapper.insertEmisWaybillProblemInfo(waybillProblemInfo);
 
+         // 删除员工提成
+         updateCommission(waybillProblemInfo);
+
          // 记录延迟天数
          EmisProblemType emisProblemType =getEmisProblemTypebyTypeId(waybillProblemInfo.getProblemType());
 
@@ -2399,6 +2405,13 @@ public class EmisBaseService {
 
      }
 
+     private void updateCommission(EmisWaybillProblemInfo waybillProblemInfo) {
+         Integer typeId = waybillProblemInfo.getProblemType();
+         if (typeId == 173 || typeId == 170 || typeId == 151) {
+             emisCommissionDtlMapper.deleteEmisCommissionDtlByBillCode(waybillProblemInfo.getBillCode());
+         }
+     }
+
 
      /**
       * 根据客户编号，获取客户信息
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 92683743d..8c7d9d273 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
@@ -20,16 +20,16 @@ import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 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.service.EmisBaseService;
-import com.xdadan.erp.emis.service.IEmisSettleBillService;
-import com.xdadan.erp.emis.service.IEmisWaybillService;
+import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper;
+import com.xdadan.erp.emis.service.*;
 import com.xdadan.erp.emis.utils.WaybillHelper;
+import com.xdadan.erp.system.service.ISysFileInfoService;
+import com.xdadan.erp.system.service.ISysNoticeService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper;
-import com.xdadan.erp.emis.service.IEmisWaybillAjustApplyService;
 import org.springframework.transaction.annotation.Transactional;
 
  /**
@@ -47,6 +47,12 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
     @Autowired
     private IEmisWaybillService emisWaybillService;
 
+    @Autowired
+    private IEmisCommissionProfitService emisCommissionProfitService;
+
+    @Autowired
+    private EmisCommissionDtlMapper emisCommissionDtlMapper;
+
 
     /**
      * 查询运单调整申请
@@ -313,6 +319,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】";
         sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList");
 
+        if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) {
+            // 重新计算提成
+            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+        }
+        if (!"6".equals(emisWaybillOld.getPaymentType()) && "6".equals(emisWaybillSave.getPaymentType())) {
+            // 删除提成
+            emisCommissionDtlMapper.deleteEmisCommissionDtlByBillCode(emisWaybillSave.getBillCode());
+        }
 
         // 审核通过
         return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
index 6fb6e4dbd..ae0f7fbe3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
@@ -20,6 +20,7 @@ import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.scan.ScanInfo;
 import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.emis.service.IEmisCommissionProfitService;
 import com.xdadan.erp.emis.service.IEmisTmsScanRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +40,9 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
     @Autowired
     private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper;
 
+    @Autowired
+    private IEmisCommissionProfitService emisCommissionProfitService;
+
     /**
      * 查询问题件
      * 
@@ -119,6 +123,13 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
             // 删除问题件
             emisWaybillProblemInfoMapper.deleteEmisWaybillProblemInfoById(id);
 
+            // 获取运单信息
+            EmisWaybill waybill = getWaybillByBillCode(emisWaybillProblemInfo.getBillCode());
+            if (!"6".equals(waybill.getPaymentType())) {
+                // 重新计算提成
+                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode());
+            }
+
             // 删除运单的问题件记录
             EmisWaybill emisWaybill = new EmisWaybill();
             emisWaybill.setBillCode(emisWaybillProblemInfo.getMainBillCode());
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index e1e85f073..c8bc31d9e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -126,6 +126,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     @Autowired
     private ISysNoticeService sysNoticeService;
 
+    @Autowired
+    private EmisCommissionDtlMapper emisCommissionDtlMapper;
+
     /**
      * 获取稽核数据
      * @param id
@@ -1468,6 +1471,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 // 修改运单
                 reUpdateWayBill(emisWaybillOld, emisWaybillSave,true);
 
+                if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) {
+                    // 重新计算提成
+                    emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+                }
+                if (!"6".equals(emisWaybillOld.getPaymentType()) && "6".equals(emisWaybillSave.getPaymentType())) {
+                    // 删除提成
+                    emisCommissionDtlMapper.deleteEmisCommissionDtlByBillCode(emisWaybillSave.getBillCode());
+                }
+
                 // 信用额度计算
 //                reCalcUseQuotaCredit(emisWaybillOld,emisWaybillSave);
             }
@@ -3207,7 +3219,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 //            reCalcUseQuotaCredit(null, emisWaybillSave);
 
             // 重新计算提成
-            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+            if (!"6".equals(emisWaybillSave.getPaymentType())) {
+                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+            }
 
         }catch (Exception ex){
             ex.printStackTrace();
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 534e30dd2..ab35e5737 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 emis_settle_invoice_rel rel
                 where a.apply_seq_no=rel.apply_seq_no and
                 rel.del_flag = '0'
-                and rel.bill_no REGEXP REPLACE(#{params.billCode}, '\n', '|')
+                and FIND_IN_SET(rel.bill_no, REPLACE(#{params.billCode}, '\n', ','))
                 )
                 <!--
                 AND apply_seq_no IN (
@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 select 1 from emis_settle_invoice_bill_rel x3
                 where  x3.del_flag = '0'
                 and  a.apply_seq_no=x3.apply_seq_no
-                AND x3.settle_bill_no REGEXP REPLACE(#{params.settleBillNo}, '\n', '|')
+                and FIND_IN_SET(x3.settle_bill_no, REPLACE(#{params.settleBillNo}, '\n', ','))
                 )
             </if>
 
@@ -421,7 +421,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             emis_settle_invoice_rel rel
             where a.apply_seq_no=rel.apply_seq_no and
             rel.del_flag = '0'
-            and rel.bill_no REGEXP REPLACE(#{params.billCode}, '\n', '|')
+            and FIND_IN_SET(rel.bill_no, REPLACE(#{params.billCode}, '\n', ','))
             )
         </if>
 
@@ -431,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             FROM emis_settle_invoice_bill_rel x3
             WHERE x3.del_flag = '0'
             AND a.apply_seq_no = x3.apply_seq_no
-            AND x3.settle_bill_no REGEXP REPLACE(#{params.settleBillNo}, '\n', '|')
+            and FIND_IN_SET(x3.settle_bill_no, REPLACE(#{params.settleBillNo}, '\n', ','))
             )
         </if>
 

From b220c5a40a06361fb3788ed9d115a75c1d7024a6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 5 Jun 2025 14:17:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?demand:=201.=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E7=BB=9F=E8=AE=A1=E6=9F=90=E6=9C=88=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=87=91=E9=A2=9Dbug=E4=BF=AE=E5=A4=8D=20=20?=
 =?UTF-8?q?2.=E6=A0=B9=E6=8D=AE=E5=8D=95=E5=8F=B7=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=8F=90=E6=88=90=E5=A2=9E=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98=E4=BB=B6=E5=8F=8A=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=9B=B8=E5=85=B3=E5=9C=BA=E6=99=AF=20commit?=
 =?UTF-8?q?ter:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisCommissionProfitServiceImpl.java | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
index b0220beb4..ddd2ea7dc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
@@ -314,6 +314,16 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
             // 先删除该运单已经计算的提成
             emisCommissionDtlMapper.deleteEmisCommissionDtlByBillCode(billCode);
 
+            if ("6".equals(waybill.getPaymentType())) {
+                return;
+            }
+            if (waybill.getProblemType() != null) {
+                if (173 == waybill.getProblemType() || 170 == waybill.getProblemType()
+                        || 151 == waybill.getProblemType()) {
+                    return;
+                }
+            }
+
             // 计算每个岗位的提成方案
         /*
             网点客服	1
@@ -382,6 +392,40 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
         try {
             // 获取统计数据
             List<EmisCommissionProfit> listProfit=emisCommissionProfitMapper.selectProfitStatList(empName,billMonth);
+
+            // 如果指定了empName，需要处理该员工在数据库中存在但listProfit中不存在的月份记录
+            if(StringUtils.isNotEmpty(empName)) {
+                // 查询数据库中该员工的所有月份记录
+                EmisCommissionProfit queryParam = new EmisCommissionProfit();
+                queryParam.setEmpName(empName);
+                if(StringUtils.isNotEmpty(billMonth)) {
+                    queryParam.setBillMonth(billMonth);
+                }
+                List<EmisCommissionProfit> existingProfits = emisCommissionProfitMapper.selectEmisCommissionProfitList(queryParam);
+
+                // 遍历现有记录，检查是否在新统计中存在
+                for(EmisCommissionProfit existingProfit : existingProfits) {
+                    boolean found = false;
+                    for(EmisCommissionProfit newProfit : listProfit) {
+                        if(existingProfit.getEmpName().equals(newProfit.getEmpName())
+                                && existingProfit.getBillMonth().equals(newProfit.getBillMonth())) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    // 如果在新统计中不存在，则添加一条金额为0的记录
+                    if(!found) {
+                        EmisCommissionProfit zeroProfit = new EmisCommissionProfit();
+                        zeroProfit.setEmpName(existingProfit.getEmpName());
+                        zeroProfit.setBillMonth(existingProfit.getBillMonth());
+                        zeroProfit.setMoney(BigDecimal.ZERO);
+                        zeroProfit.setMonthMoney(BigDecimal.ZERO);
+                        listProfit.add(zeroProfit);
+                    }
+                }
+            }
+
+            // 更新或插入提成记录
             for (EmisCommissionProfit profitItem:listProfit) {
                 // 查询是否有数据，没有则插入
                 int isExists=emisCommissionProfitMapper.checkUnique(profitItem);