From ca9f94430379b7020dc75abe4ef88e99189ed046 Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Thu, 13 Nov 2025 13:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=B1=87=E6=80=BB=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
index 82bba8c..0de40d2 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
@@ -866,8 +866,9 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement
     private void mergeExpenseSummaryEntriesByExpenseItemAndRate(DynamicObjectCollection expenseSummaryCollection) {
         // 获取是否合并结算的设置
         Boolean combinedSettlement = (Boolean) this.getModel().getValue("zcgj_combinedsettlemen");//物资及运费同时结算
+        Boolean zcgj_notraninvoice = (Boolean) this.getModel().getValue("zcgj_notraninvoice");//无运费发票
 
-        if (combinedSettlement != null && combinedSettlement) {
+        if (combinedSettlement != null && combinedSettlement && !zcgj_notraninvoice) {
             // 如果zcgj_combinedsettlemen为true，允许运费行和非运费行合并
             mergeAllEntriesByExpenseItemAndRate(expenseSummaryCollection);
         } else {