From 40a41e01bc2977680af0afd612df260cc69d98c3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 18 Oct 2025 16:07:14 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F-=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86-=E7=8E=B0?=
 =?UTF-8?q?=E9=87=91=E5=87=BA=E8=B4=A6=E7=A1=AE=E8=AE=A4=EF=BC=9A=E5=BD=93?=
 =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=A4=A7=E4=BA=8E=E7=AD=89=E4=BA=8E=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=8A=A5=E4=BB=B7=E7=9A=84=E6=97=B6=E5=80=99=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=87=AA=E5=8A=A8=E7=A1=AE=E8=AE=A4=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E9=9C=80=E8=B4=A2=E5=8A=A1=E6=89=8B=E5=8A=A8=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../erp/web/emis/EmisSettleSubBillController.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
index 304f1adde..329799e0f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
+++ b/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())
-                                    && !"1".equals(waybill.getBlSpecialQuote())
-                            && !"2".equals(waybill.getPaymentType())
+                            !"2".equals(waybill.getPaymentType())
                             && !"4".equals(waybill.getPaymentType())
                             && !"5".equals(waybill.getPaymentType())
                     ) {