diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index 160e28ea..17e0fbc5 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -1000,11 +1000,11 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", i); if (YEM.isNotEmpty(materialClass) && YEM.isNotEmpty(productModel)) { if ("Z".equals(materialClass)) { - boolean yemIfgift = (boolean) model.getValue("yem_ifgift"); - if (!yemIfgift) { - DynamicObject products = productModel.getDynamicObject("yem_products"); - if (YEM.isNotEmpty(products)) { - Long id = products.getLong("id"); + DynamicObject products = productModel.getDynamicObject("yem_products"); + if (YEM.isNotEmpty(products)) { + Long id = products.getLong("id"); + boolean yemIfgift = (boolean) model.getValue("yem_ifgift",i); + if (!yemIfgift) { if (map.containsKey(id)) { map.put(id, map.get(id).add((BigDecimal) model.getValue("yem_qty", i))); } else {