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();