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<Long, BigDecimal> 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);
                             }
                         }
                     }