From a3fed0967682ef22ee8c53b9dcd3cfe45d1364de Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Fri, 14 Nov 2025 15:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java    | 2 +-
 .../zcdev/pr/plugin/form/OutContractSettleEditPluginExt.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 139c729..bb275de 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
@@ -408,7 +408,7 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement
                     String invoiceTypeIdName = invoiceTypeId.getString("name");
                     if (!invoiceTypeIdName.contains("专")) {
                         this.getModel().setValue("zcgj_invoicetax", BigDecimal.ZERO, rowIndex);
-                        this.getModel().setValue("zcgj_oftaxinvoiceamount", dataEntity.get("zcgj_invoiceamount"), rowIndex);
+                        this.getModel().setValue("zcgj_invoiceamount", dataEntity.get("zcgj_oftaxinvoiceamount"), rowIndex);
                     }
                 }
             }
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 e5a4d25..e7dc7f8 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
@@ -596,9 +596,9 @@ public class OutContractSettleEditPluginExt extends AbstractBillPlugIn implement
                         this.getModel().setValue("oftaxamount", BigDecimal.ZERO, 1);//合同支付项-价税合计
                         this.getModel().setValue("amount", BigDecimal.ZERO, 1);//合同支付项-金额
                         this.getModel().deleteEntryRow("itementry", 1);
-                        return;
                     }
                 }
+                return;
             }
             this.autoFetch();
             this.sumMaterialInAmountToItemEntry();