From 51f979c745b9a6ae2734f622df260d5c0a11d276 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 3 Dec 2025 17:55:52 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E4=B8=9A=E5=8A=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E8=B4=A6=E5=8D=95=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/web/emis/EmisSettleSubBillController.java | 5 ++++- 1 file changed, 4 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 329799e0f..74e46fb23 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 @@ -467,7 +467,10 @@ public class EmisSettleSubBillController extends EmisBaseController bug:1688 调整为现金保留自动确认,月结调整为不自动确认 */ - EmisWaybill waybill=emisBaseService.getWaybillByBillCode(old.getBillNo()); + EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo()); + if (waybill.getRealFee() == null) { + return AjaxResult.success("确认成功"); + } if( !"2".equals(waybill.getPaymentType()) && !"4".equals(waybill.getPaymentType())