From 3aafce36285f1a14f8d67d117039e68f5ec3734f Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Fri, 7 Nov 2025 14:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E5=87=BA=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=BB=93=E7=AE=97=E4=B8=AD=E6=8C=89=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=BF=90=E8=B4=B9=E7=BB=93=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/OutContractSettleEditPluginExt.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
index 16c78b2..e2d7b4e 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java
@@ -584,14 +584,16 @@ public class OutContractSettleEditPluginExt extends AbstractBillPlugIn implement
             }
             boolean issettlebymatin = (boolean) this.getModel().getValue("issettlebymatin");//按入库单结算
             boolean zcgj_transset = (boolean) changeData.getNewValue();//按入库运费结算新值
-            DynamicObject transSettleItem1 = this.getModel().getEntryRowEntity("itementry", 1);
-            DynamicObject payItem1 = transSettleItem1.getDynamicObject("payitem");//合同支付项-名称
-            boolean hasSettleTrans1 = "YFJS".equals(payItem1.getString("number"));
-            if (!issettlebymatin && !zcgj_transset && hasSettleTrans1) {
-                this.getModel().setValue("oftaxamount", BigDecimal.ZERO, 1);//合同支付项-价税合计
-                this.getModel().setValue("amount", BigDecimal.ZERO, 1);//合同支付项-金额
-                this.getModel().deleteEntryRow("itementry", 1);
-                return;
+            if (!issettlebymatin && !zcgj_transset) {
+                DynamicObject transSettleItem1 = this.getModel().getEntryRowEntity("itementry", 1);
+                DynamicObject payItem1 = transSettleItem1.getDynamicObject("payitem");//合同支付项-名称
+                boolean hasSettleTrans1 = "YFJS".equals(payItem1.getString("number"));
+                if (hasSettleTrans1) {
+                    this.getModel().setValue("oftaxamount", BigDecimal.ZERO, 1);//合同支付项-价税合计
+                    this.getModel().setValue("amount", BigDecimal.ZERO, 1);//合同支付项-金额
+                    this.getModel().deleteEntryRow("itementry", 1);
+                    return;
+                }
             }
             this.autoFetch();
             this.sumMaterialInAmountToItemEntry();