demand: TMS系统-客户账单管理-现金出账确认：当运费大于等于标准报价的时候系统自动确认，无需财务手动确认

committer: heyu

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java

@@ -1,11 +1,11 @@
 
-/** 
+/**
   * @Project: emis
   * @Title: EmisSettleSubBillController.java
   * @author linfso
   * @date 2024-07-03 18:54:52
   * @Copyright: ShangHai Duta 2022 All rights reserved.
-  * @version v1.0  
+  * @version v1.0
   * @Description: <p> 结算子账单 控制器 </p>
  */
 
@@ -47,7 +47,7 @@ import com.xdadan.erp.emis.service.IEmisSettleSubBillService;
 
 /**
  * 结算子账单Controller
- * 
+ *
  * @author linfso
  * @date 2024-07-03 18:54:52
  */
@@ -189,8 +189,8 @@ public class EmisSettleSubBillController extends EmisBaseController
 
     /**
      * 检查是否重复
-     * 
+     *
-     * @param emisSettleSubBill 
+     * @param emisSettleSubBill
      * @return 数量
      */
     @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:list')")
@@ -469,9 +469,7 @@ public class EmisSettleSubBillController extends EmisBaseController
                      */
                     EmisWaybill waybill=emisBaseService.getWaybillByBillCode(old.getBillNo());
                     if(
-                            !"3".equals(waybill.getCalcFeeType())
+                            !"2".equals(waybill.getPaymentType())
-                                    && !"1".equals(waybill.getBlSpecialQuote())
-                            && !"2".equals(waybill.getPaymentType())
                             && !"4".equals(waybill.getPaymentType())
                             && !"5".equals(waybill.getPaymentType())
                     ) {