From f0464df02d4cd4a8449c1d552a5d53e3689a2c13 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Sun, 21 Sep 2025 11:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BB=A3=E7=A0=81=EF=BC=8C1=E6=80=BB?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=8F=98=E5=8C=96=E9=80=BB=E8=BE=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=EF=BC=9B2=E6=9D=90=E6=96=99=E6=80=BB=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/MaterialInBillEditPluginExt.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInBillEditPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInBillEditPluginExt.java index 4ce0b62..380de9a 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInBillEditPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInBillEditPluginExt.java @@ -275,7 +275,7 @@ public class MaterialInBillEditPluginExt extends AbstractEcmaBillPlugin implemen case "measureunit": this.entryMeasureunitChanged((DynamicObject) propValue, curIndex); break; - case "purchaseorder": + case "purchaseorder"://采购订单 this.purchaseOrderChanged((DynamicObject) propValue, curIndex); break; case "transtype": @@ -491,10 +491,10 @@ public class MaterialInBillEditPluginExt extends AbstractEcmaBillPlugin implemen } protected void entrymataxrateChanged(DynamicObject propValue, int i) { - boolean isAdjustamount = this.getModel().getDataEntity().getBoolean("adjustamount"); - boolean isAdjustoftax = this.getModel().getDataEntity().getBoolean("adjustoftax"); - boolean isInputtaxprice = this.getModel().getDataEntity().getBoolean("inputtaxprice"); - boolean isInputtotalprice = this.getModel().getDataEntity().getBoolean("inputtotalprice"); + boolean isAdjustamount = this.getModel().getDataEntity().getBoolean("adjustamount");//微调金额 + boolean isAdjustoftax = this.getModel().getDataEntity().getBoolean("adjustoftax");//微调含税金额 + boolean isInputtaxprice = this.getModel().getDataEntity().getBoolean("inputtaxprice");//录入含税价 + boolean isInputtotalprice = this.getModel().getDataEntity().getBoolean("inputtotalprice");//录入总价 BigDecimal taxrate = new BigDecimal(0); if (propValue != null) { taxrate = BigDecimal.valueOf((long) propValue.getInt("taxrate")); @@ -845,6 +845,7 @@ public class MaterialInBillEditPluginExt extends AbstractEcmaBillPlugin implemen this.getModel().setValue("amount", ftransAmount.add(notaxAmount), curIndex); EntryGrid grid2 = (EntryGrid) this.getControl("entryentity"); BigDecimal sum2 = grid2.getSum("ftransamount"); + this.getModel().setValue("transamount", sum2); } private void transtaxamountChanged(BigDecimal propValue) { @@ -1099,9 +1100,21 @@ public class MaterialInBillEditPluginExt extends AbstractEcmaBillPlugin implemen } private void sumMaAmount() { - EntryGrid grid = (EntryGrid) this.getControl("entryentity"); +/* EntryGrid grid = (EntryGrid) this.getControl("entryentity"); BigDecimal sum = grid.getSum("notaxamount"); - this.getModel().setValue("matamount", sum); + this.getModel().setValue("matamount", sum);*///源码 + //以下为二开修改添加 + BigDecimal sum = BigDecimal.ZERO; + DynamicObjectCollection entryEntityCollection = this.getModel().getDataEntity(true).getDynamicObjectCollection("entryentity");//入库单分录 + for (DynamicObject entryEntity : entryEntityCollection) { + BigDecimal notaxAmount = entryEntity.getBigDecimal("notaxamount");//金额 + if (notaxAmount != null) { + notaxAmount = notaxAmount.setScale(2, RoundingMode.HALF_UP); + sum = sum.add(notaxAmount); + } + } + sum = sum.setScale(2, RoundingMode.HALF_UP); + this.getModel().setValue("matamount", sum);//材料总金额 } private void lotF7Changed(DynamicObject propValue, int curIndex) { @@ -1737,6 +1750,7 @@ public class MaterialInBillEditPluginExt extends AbstractEcmaBillPlugin implemen this.sumMaTaxAmount(); EntryGrid grid = (EntryGrid) this.getControl("entryentity"); BigDecimal sum = grid.getSum("ftransamount"); + this.getModel().setValue("transamount", sum); this.getView().updateView("matamount"); this.getView().updateView("matoftaxamount"); this.getView().updateView("mataxamount"); @@ -1747,6 +1761,7 @@ public class MaterialInBillEditPluginExt extends AbstractEcmaBillPlugin implemen this.getView().updateView("totalamount"); this.getView().updateView("totaloftaxamount"); this.getView().updateView("totaltaxamount"); + this.getView().updateView("transamount"); break; case "unaudit": this.getView().invokeOperation("refresh");