From fd521f73cc4ee05ed426c71a9e2e1b62b76ff0ca Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 27 Nov 2024 18:37:58 +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 | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 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 f2491f9b..6d2f6726 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 @@ -694,30 +694,30 @@ 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.isEmpty()) { -// 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"); -// map.merge(aLong, yemQty, (a, b) -> b.add(a)); -// } -// } -// 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) != null) { -// this.getModel().setValue("yem_pcstype", map.get(aLong), i); -// } -// } -// } -// } + Map map = new HashMap<>(); + DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); + if (!yemEsMaterialinfo.isEmpty()) { + 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"); + map.merge(aLong, yemQty, (a, b) -> b.add(a)); + } + } + 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) != null) { + this.getModel().setValue("yem_pcstype", map.get(aLong), i); + } + } + } + } case "yem_isdismantlecar": extracted(); break;