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 7f3d286e8..3274e5b5f 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 @@ -349,34 +349,33 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements 单证员 8 */ - // 根据不同岗位计算 - for (int postTypeIndex = 1; postTypeIndex <= 8; postTypeIndex++) { + if(postType!=null ){ // 1.网点客服 - if (postTypeIndex == ProfitPostType.SITE_KEFU_EMP.typeCode) { + if (postType == ProfitPostType.SITE_KEFU_EMP.typeCode) { calcSiteFefuProfit(waybill); } // 2.快件单证 - else if (postTypeIndex == ProfitPostType.KJDZ_EMP.typeCode) { + else if (postType == ProfitPostType.KJDZ_EMP.typeCode) { calcKjdzProfit(waybill); } // 3.取件员 - else if (postTypeIndex == ProfitPostType.TAKE_EMP.typeCode) { + else if (postType == ProfitPostType.TAKE_EMP.typeCode) { calcTakeProfit(waybill); } // 4.网点操作员 - else if (postTypeIndex == ProfitPostType.SITE_OP_EMP.typeCode) { + else if (postType == ProfitPostType.SITE_OP_EMP.typeCode) { calcOpProfit(waybill); } // 5.派件员 - else if (postTypeIndex == ProfitPostType.DISPATCH_EMP.typeCode) { + else if (postType == ProfitPostType.DISPATCH_EMP.typeCode) { calcDispatchProfit(waybill); } // 6.销售联系人 - else if (postTypeIndex == ProfitPostType.SALES_EMP.typeCode) { + else if (postType == ProfitPostType.SALES_EMP.typeCode) { calcSalesProfit(waybill); } // 7.中转操作员 - else if (postTypeIndex == ProfitPostType.MID_OP_EMP.typeCode) { + else if (postType == ProfitPostType.MID_OP_EMP.typeCode) { calcMidOpProfit(waybill); } // 8.陆运海运单证员,按柜计算,不按单计算 @@ -384,6 +383,43 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements } } + else { + // 根据不同岗位计算 + for (int postTypeIndex = 1; postTypeIndex <= 8; postTypeIndex++) { + // 1.网点客服 + if (postTypeIndex == ProfitPostType.SITE_KEFU_EMP.typeCode) { + calcSiteFefuProfit(waybill); + } + // 2.快件单证 + else if (postTypeIndex == ProfitPostType.KJDZ_EMP.typeCode) { + calcKjdzProfit(waybill); + } + // 3.取件员 + else if (postTypeIndex == ProfitPostType.TAKE_EMP.typeCode) { + calcTakeProfit(waybill); + } + // 4.网点操作员 + else if (postTypeIndex == ProfitPostType.SITE_OP_EMP.typeCode) { + calcOpProfit(waybill); + } + // 5.派件员 + else if (postTypeIndex == ProfitPostType.DISPATCH_EMP.typeCode) { + calcDispatchProfit(waybill); + } + // 6.销售联系人 + else if (postTypeIndex == ProfitPostType.SALES_EMP.typeCode) { + calcSalesProfit(waybill); + } + // 7.中转操作员 + else if (postTypeIndex == ProfitPostType.MID_OP_EMP.typeCode) { + calcMidOpProfit(waybill); + } + // 8.陆运海运单证员,按柜计算,不按单计算 + else if (postTypeIndex == ProfitPostType.DZ_EMP.typeCode) { + + } + } + } // 运单打上已计算提成标记 emisWaybillMapper.updateHasDoProfit(waybill.getBillCode());