md

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -1140,9 +1140,14 @@ public class EmisBaseService {
              emisSettleSubBill.setSalesmen(dt.getSalesmen());
              emisSettleSubBill.setBlSpecialQuote(dt.getBlSpecialQuote());
 
-             // 设置初始账单未确认
+             // 新费用
+             newTotalFee = emisSettleSubBill.getBillFee();
+
+             // 若果新费用和老费用不相同，需要走审核流程：设置初始账单未确认
+             if(oldTotalFee.compareTo(newTotalFee)!=0) {
                  emisSettleSubBill.setBlConfirmSite("0");
                  emisSettleSubBill.setBlConfirmCenter("0");
+             }
 
              if(isNewBill){
                  emisSettleSubBillMapper.insertEmisSettleSubBill(emisSettleSubBill);
@@ -1155,9 +1160,6 @@ public class EmisBaseService {
 
              }
 
-             // 新费用
-             newTotalFee = emisSettleSubBill.getBillFee();
-
              // 如果是一口价，自动生成一条运费明细，其他则根据实际来计算
              // 生成费用明细
              if(dt.getCalcFeeType().equals("3")) {

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java

@@ -210,8 +210,6 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
 
         emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave);
 
-
-
         // 审核通过
         return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply);
 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -2641,6 +2641,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         // 运单修改需要重新出账
         try {
+            // 判断是否需要重新出账
+
             redoGenerateBill(emisWaybillSave.getBillCode());
         }catch (Exception ex){
             ex.printStackTrace();