From 550a4463dbebeda0f860a1eafb5b32f72ec8c6a3 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 26 Nov 2024 21:13:25 +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 | 10 +++------- 1 file changed, 3 insertions(+), 7 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 1cf7cd31..1fe85d05 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 @@ -702,18 +702,14 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef } Map map = new HashMap<>(); DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); - if (yemEsMaterialinfo.size() > 0) { + 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"); - if (map.get(aLong).compareTo(BigDecimal.ZERO) == 0) { - map.put(aLong, yemQty); - } else { - map.put(aLong, yemQty.add(map.get(aLong))); - } + map.merge(aLong, yemQty, (a, b) -> b.add(a)); } } DynamicObjectCollection yemEsSalesorderP = this.getModel().getEntryEntity("yem_es_salesorder_p"); @@ -723,7 +719,7 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef 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); + this.getModel().setValue("yem_pcstype", map.get(aLong), i); } } }