aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-16 21:15:52 +08:00
parent 14a36bfb97
commit a971e2aa8a
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -481,13 +481,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String[] empNameArr = quoteItem.getEmpName().split(","); String[] empNameArr = quoteItem.getEmpName().split(",");
for(int i=0;i<empNameArr.length;i++) { 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 emisCommissionDtl = new EmisCommissionDtl();
emisCommissionDtl.setBillCode(waybill.getBillCode()); emisCommissionDtl.setBillCode(waybill.getBillCode());
emisCommissionDtl.setFeeType(quoteItem.getFeeType()); emisCommissionDtl.setFeeType(quoteItem.getFeeType());
@ -497,8 +490,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
// emisCommissionDtl.setEmpCode(profitUser.getEmpCode());
// emisCommissionDtl.setEmpCode(profitUser.getEmpCode());
emisCommissionDtl.setEmpName(empNameArr[i]); emisCommissionDtl.setEmpName(empNameArr[i]);
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);
@ -606,10 +597,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
// 插入提成 // 插入提成
if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) { if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
String[] empCodeArr = quoteItem.getEmpCode().split(","); String[] empNameArr = quoteItem.getEmpName().split(",");
for(int i=0;i<empCodeArr.length;i++) { for(int i=0;i<empNameArr.length;i++) {
SysUser empUser=getEmisStaffByCode(empCodeArr[i]);
EmisCommissionDtl emisCommissionDtl = new EmisCommissionDtl(); EmisCommissionDtl emisCommissionDtl = new EmisCommissionDtl();
emisCommissionDtl.setBillCode(waybill.getBillCode()); emisCommissionDtl.setBillCode(waybill.getBillCode());
emisCommissionDtl.setFeeType(quoteItem.getFeeType()); emisCommissionDtl.setFeeType(quoteItem.getFeeType());
@ -619,8 +609,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
emisCommissionDtl.setEmpCode(empUser.getEmpCode()); emisCommissionDtl.setEmpName(empNameArr[i]);
emisCommissionDtl.setEmpName(empUser.getEmpName());
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);
emisCommissionDtl.setQuoteId(exprItem.getQuoteId()); emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
@ -740,7 +729,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
emisCommissionDtl.setEmpName(empUser.getEmpName()); emisCommissionDtl.setEmpName(empUser.getEmpName());
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);
@ -867,7 +855,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
emisCommissionDtl.setEmpName(empUser.getEmpName()); emisCommissionDtl.setEmpName(empUser.getEmpName());
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);
@ -994,8 +981,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
emisCommissionDtl.setEmpCode(empUser.getEmpCode()); emisCommissionDtl.setEmpName(empUser.getEmpName());
emisCommissionDtl.setEmpName(empUser.getEmpCode());
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);
emisCommissionDtl.setQuoteId(exprItem.getQuoteId()); emisCommissionDtl.setQuoteId(exprItem.getQuoteId());
@ -1123,7 +1109,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
emisCommissionDtl.setEmpCode("-1");
emisCommissionDtl.setEmpName(salesmen); emisCommissionDtl.setEmpName(salesmen);
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);
@ -1256,7 +1241,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionDtl.setBillMonth(billMonth); emisCommissionDtl.setBillMonth(billMonth);
emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney)); emisCommissionDtl.setMoney(BigDecimal.valueOf(profitMoney));
emisCommissionDtl.setEmpCode(empUser.getEmpCode());
emisCommissionDtl.setEmpName(empUser.getEmpName()); emisCommissionDtl.setEmpName(empUser.getEmpName());
emisCommissionDtl.setCalcExpr(calcExprStr); emisCommissionDtl.setCalcExpr(calcExprStr);