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

committer: heyu
2025-10-18 16:07:14 +08:00 · 2025-10-18 16:07:14 +08:00 · 40a41e01bc
commit 40a41e01bc
parent 8cf07a7d2a
1 changed files with 6 additions and 8 deletions
--- 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
@ -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())
                    ) {