From eaf74a54054cb20f6ae89e03952037dbd532a48d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 3 Jul 2025 11:07:19 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisSettleSubBillController.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 90d3110bf..f090503ff 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
@@ -441,9 +441,17 @@ public class EmisSettleSubBillController extends EmisBaseController
                         bug:1610
                         现金账单确认/月结账单确认：应收运费大于等于标准报价，业务确认完帐单后，现金账单确认/月结账单确认界面系统自动确认；
                         非特殊报价和一口价， 财务也自动确认
+                        bug:1688
+                        调整为现金保留自动确认,月结调整为不自动确认
                      */
                     EmisWaybill waybill=emisBaseService.getWaybillByBillCode(old.getBillNo());
-                    if( !"3".equals(waybill.getCalcFeeType()) && !"1".equals(waybill.getBlSpecialQuote()) ) {
+                    if(
+                            !"3".equals(waybill.getCalcFeeType())
+                                    && !"1".equals(waybill.getBlSpecialQuote())
+                            && !"2".equals(waybill.getPaymentType())
+                            && !"4".equals(waybill.getPaymentType())
+                            && !"5".equals(waybill.getPaymentType())
+                    ) {
                         if (waybill.getFreight().compareTo(waybill.getRealFee()) >= 0) {
 
                             EmisSettleSubBill updSubBillByCenter = new EmisSettleSubBill();