diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
index bf6c470ce..46f5c890e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
@@ -88,7 +88,7 @@ public class EmisCommissionProfitController extends BaseController
                 for (int i = 0; i < billCodeSortList.length; i++) {
                     String subBillCode = billCodeSortList[i];
                     try {
-                        emisCommissionProfitService.reCalcProfitByBillCode(subBillCode);
+                        emisCommissionProfitService.reCalcProfitByBillCode(subBillCode,null);
                     } catch (Exception ex) {
                         return AjaxResult.error("计算失败-单号:[" + subBillCode + "]");
                     }
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 1222ed904..dc71f7d65 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -804,9 +804,9 @@ public class EmisCommonController extends EmisBaseController
      * @return
      */
     @GetMapping("/reCalcEmpProfitByBillCode")
-    public AjaxResult reCalcEmpProfitByBillCode(String billCode){
+    public AjaxResult reCalcEmpProfitByBillCode(String billCode,Integer postType){
         try{
-            emisCommissionProfitService.reCalcProfitByBillCode(billCode);
+            emisCommissionProfitService.reCalcProfitByBillCode(billCode,postType);
         }
         catch (Exception ex){
             ex.printStackTrace();
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 da7574095..59a0d41e4 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
@@ -5234,7 +5234,7 @@ public class EmisBaseService {
                     emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode());
                 }
                 // 重新计算提成
-                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null);
             }
         }
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
index a22e0a94b..c78681b5a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
@@ -47,7 +47,7 @@ public interface IEmisCommissionProfitService
      * @param billCode
      * @return
      */
-    public void reCalcProfitByBillCode(String billCode);
+    public void reCalcProfitByBillCode(String billCode,Integer postType);
 
 
     /**
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 c053c74bf..7f3d286e8 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
@@ -180,7 +180,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
             // 计算运单提成
             for (EmisWaybill waybill : dataList) {
                 try {
-                    reCalcProfitByBillCode(waybill.getBillCode());
+                    reCalcProfitByBillCode(waybill.getBillCode(),null);
                 }catch (Exception ex){
                     ex.printStackTrace();
                 }
@@ -310,7 +310,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
      */
     @Override
     @Transactional
-    public void reCalcProfitByBillCode(String billCode)
+    public void reCalcProfitByBillCode(String billCode,Integer postType)
     {
         String lockKey="reCalcProfitByBillCode"+billCode;
         // 加锁查询
@@ -889,7 +889,12 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
 
         String billMonth= DateUtils.parseDateToStr(DateUtils.YYYY_MM,waybill.getSendDate());
 
-        SysUser empUser = getEmisStaffByCode(waybill.getOperateEmployeeCode());
+        SysUser empUser = getEmisStaffByCode(waybill.getOperateEmployeeCode().trim());
+
+        if(empUser==null){
+            return;
+        }
+
         EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType());
 
         EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
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 4e927c315..f8a1f271e 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
@@ -387,7 +387,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
 
         if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) {
             // 重新计算提成
-            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null);
         }
         if (!"6".equals(emisWaybillOld.getPaymentType()) && "6".equals(emisWaybillSave.getPaymentType())) {
             // 删除提成
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 f28bb5650..5aa890813 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
@@ -127,7 +127,7 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
             EmisWaybill waybill = getWaybillByBillCode(emisWaybillProblemInfo.getBillCode());
             if (!"6".equals(waybill.getPaymentType())) {
                 // 重新计算提成
-                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode());
+                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode(),null);
             }
 
             // 删除运单的问题件记录
@@ -175,7 +175,7 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
         EmisWaybill waybill = getWaybillByBillCode(emisWaybillProblemInfo.getBillCode());
         if (!"6".equals(waybill.getPaymentType())) {
             // 重新计算提成
-            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode());
+            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillProblemInfo.getBillCode(),null);
         }
 
         // 删除运单的问题件记录
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 2f7445acc..1a1fc12ff 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
@@ -1518,7 +1518,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
                 if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) {
                     // 重新计算提成
-                    emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+                    emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null);
                 }
                 if (!"6".equals(emisWaybillOld.getPaymentType()) && "6".equals(emisWaybillSave.getPaymentType())) {
                     // 删除提成
@@ -3279,7 +3279,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             // 重新计算提成
             if (!"6".equals(emisWaybillSave.getPaymentType()) && !"1".equals(emisWaybillSave.getBlVirtual())) {
-                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+                emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null);
             }
 
         }catch (Exception ex){
@@ -3714,7 +3714,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             redoGenerateBill(emisWaybillSave.getBillCode(),isForce);
 
             // 重新计算提成
-            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode());
+            emisCommissionProfitService.reCalcProfitByBillCode(emisWaybillSave.getBillCode(),null);
 
             // 设置需要重新计算成本
             emisWaybillMapper.cancelHasDoCostFee(emisWaybillSave.getBillCode());