From a971e2aa8a7c5438b0433a899368854f58cb8b50 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 16 Mar 2025 21:15:52 +0800
Subject: [PATCH] md

---
 .../impl/EmisCommissionProfitServiceImpl.java | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

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 882dde745..b0220beb4 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
@@ -481,13 +481,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             String[] empNameArr = quoteItem.getEmpName().split(",");
                             for(int i=0;i<empNameArr.length;i++) {
 
-                                // 必须是运单对应站点人员才可以参与
-//                                SysUser profitUser = getEmisStaffByCode(empCodeArr[i]);
-//                                if(!waybill.getSendSiteCode().equals(profitUser.getOwnerSiteCode())){
-//                                    continue;
-//                                }
-
-
                                 EmisCommissionDtl emisCommissionDtl = new EmisCommissionDtl();
                                 emisCommissionDtl.setBillCode(waybill.getBillCode());
                                 emisCommissionDtl.setFeeType(quoteItem.getFeeType());
@@ -497,8 +490,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                                 emisCommissionDtl.setBillMonth(billMonth);
                                 emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-//                                emisCommissionDtl.setEmpCode(profitUser.getEmpCode());
-//                                emisCommissionDtl.setEmpCode(profitUser.getEmpCode());
                                 emisCommissionDtl.setEmpName(empNameArr[i]);
 
                                 emisCommissionDtl.setCalcExpr(calcExprStr);
@@ -606,10 +597,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                         // 插入提成
                         if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
 
-                            String[] empCodeArr = quoteItem.getEmpCode().split(",");
-                            for(int i=0;i<empCodeArr.length;i++) {
+                            String[] empNameArr = quoteItem.getEmpName().split(",");
+                            for(int i=0;i<empNameArr.length;i++) {
 
-                                SysUser empUser=getEmisStaffByCode(empCodeArr[i]);
                                 EmisCommissionDtl emisCommissionDtl = new EmisCommissionDtl();
                                 emisCommissionDtl.setBillCode(waybill.getBillCode());
                                 emisCommissionDtl.setFeeType(quoteItem.getFeeType());
@@ -619,8 +609,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                                 emisCommissionDtl.setBillMonth(billMonth);
                                 emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-                                emisCommissionDtl.setEmpCode(empUser.getEmpCode());
-                                emisCommissionDtl.setEmpName(empUser.getEmpName());
+                                emisCommissionDtl.setEmpName(empNameArr[i]);
 
                                 emisCommissionDtl.setCalcExpr(calcExprStr);
                                 emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
@@ -740,7 +729,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             emisCommissionDtl.setBillMonth(billMonth);
                             emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-                            emisCommissionDtl.setEmpCode(empUser.getEmpCode());
                             emisCommissionDtl.setEmpName(empUser.getEmpName());
 
                             emisCommissionDtl.setCalcExpr(calcExprStr);
@@ -867,7 +855,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             emisCommissionDtl.setBillMonth(billMonth);
                             emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-                            emisCommissionDtl.setEmpCode(empUser.getEmpCode());
                             emisCommissionDtl.setEmpName(empUser.getEmpName());
 
                             emisCommissionDtl.setCalcExpr(calcExprStr);
@@ -994,8 +981,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                             emisCommissionDtl.setBillMonth(billMonth);
                             emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-                            emisCommissionDtl.setEmpCode(empUser.getEmpCode());
-                            emisCommissionDtl.setEmpName(empUser.getEmpCode());
+                            emisCommissionDtl.setEmpName(empUser.getEmpName());
 
                             emisCommissionDtl.setCalcExpr(calcExprStr);
                             emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
@@ -1123,7 +1109,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                                 emisCommissionDtl.setBillMonth(billMonth);
                                 emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-                                emisCommissionDtl.setEmpCode("-1");
                                 emisCommissionDtl.setEmpName(salesmen);
 
                                 emisCommissionDtl.setCalcExpr(calcExprStr);
@@ -1256,7 +1241,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                                 emisCommissionDtl.setBillMonth(billMonth);
                                 emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
 
-                                emisCommissionDtl.setEmpCode(empUser.getEmpCode());
                                 emisCommissionDtl.setEmpName(empUser.getEmpName());
 
                                 emisCommissionDtl.setCalcExpr(calcExprStr);