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