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