diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java index 65ad8e4c..1148cba4 100644 --- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java +++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java @@ -1229,9 +1229,12 @@ public class SalesOrderUtils { BigDecimal qty = BigDecimal.ZERO; BigDecimal singlepartgiftmat = BigDecimal.ZERO; for (DynamicObject dynamicObject : value) { - qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); + BigDecimal yemSinglepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); + if (yemSinglepartgiftmat.compareTo(BigDecimal.ZERO) != 0) { + qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); + } if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) { - singlepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); + singlepartgiftmat = yemSinglepartgiftmat ; } } BigDecimal amount = qty.multiply(singlepartgiftmat);