From 091b36894ef3fd05b883bccc2cc621e065a4fad9 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 26 Nov 2024 21:05:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E9=9A=8F=E6=9C=BA=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=8F=8A=E9=85=8D=E4=BB=B6=E5=B7=A5=E5=85=B7=E5=8C=85=EF=BC=8C?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E5=8F=B0=E6=95=B0=E6=A0=B9=E6=8D=AE=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ShippingDetailsFormPlugin.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java index 52ee5583..1cf7cd31 100644 --- a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java +++ b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java @@ -665,7 +665,7 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef for (int i = 0; i < collection.size(); i++) { BigDecimal raprate = collection.get(i).getBigDecimal("yem_raprate"); BigDecimal offeramount = dataEntity.getBigDecimal("yem_offeramount"); - this.getModel().setValue("yem_rapamt", PaymentControlUtil.getAdvancePayment(offeramount, raprate),i); + this.getModel().setValue("yem_rapamt", PaymentControlUtil.getAdvancePayment(offeramount, raprate), i); } // this.getView().invokeOperation("save"); break; @@ -689,7 +689,7 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef // } else { // ies.add(i1); // } - }else { + } else { ies.add(i1); } } @@ -700,6 +700,34 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef this.getView().showMessage("数量不允许低于关联调拨数量;,请重新填写"); this.getModel().setValue("yem_qty", e.getChangeSet()[0].getOldValue()); } + Map map = new HashMap<>(); + DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); + if (yemEsMaterialinfo.size() > 0) { + for (DynamicObject dynamicObject : yemEsMaterialinfo) { + DynamicObject yemProductmodel = dynamicObject.getDynamicObject("yem_productmodel"); + if (yemProductmodel != null) { + long aLong = yemProductmodel.getDynamicObject("yem_products").getLong("id"); +// long aLong = yemProductmodel.getLong("id"); + BigDecimal yemQty = dynamicObject.getBigDecimal("yem_qty"); + if (map.get(aLong).compareTo(BigDecimal.ZERO) == 0) { + map.put(aLong, yemQty); + } else { + map.put(aLong, yemQty.add(map.get(aLong))); + } + } + } + DynamicObjectCollection yemEsSalesorderP = this.getModel().getEntryEntity("yem_es_salesorder_p"); + for (int i = 0; i < yemEsSalesorderP.size(); i++) { + DynamicObject dynamicObject = yemEsSalesorderP.get(i); + DynamicObject yemAccessorytype = dynamicObject.getDynamicObject("yem_accessorytype"); + if (yemAccessorytype != null) { + long aLong = yemAccessorytype.getLong("id"); + if (map.get(aLong).compareTo(BigDecimal.ZERO) != 0) { + this.getModel().setValue("yem_pcstype",map.get(aLong) ,i); + } + } + } + } case "yem_isdismantlecar": extracted(); break;