Browse Source

促销方案商品添加起订量和增量添加时修改逻辑

hu 10 months ago
parent
commit
96e4afce4e

+ 8 - 4
src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -148,10 +148,14 @@ public class promotionItems extends Controller {
                 saleFactory.addParameter("itemid", iteminfo.getLong("itemid"));
                 saleFactory.addParameter("itemno", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getString("itemno"));
                 if (itemrowsMap.containsKey(iteminfo.getString("itemid"))) {
-                    saleFactory.addParameter("orderaddqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderaddqty"));
-                    if (itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("packageqty").compareTo(BigDecimal.ZERO) > 0) {
-                        saleFactory.addParameter("orderminqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("packageqty"));
-                    } else {
+                    if(itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderaddqty").compareTo(BigDecimal.ZERO)<=0){
+                        saleFactory.addParameter("orderaddqty", 1);
+                    }else{
+                        saleFactory.addParameter("orderaddqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderaddqty"));
+                    }
+                    if(itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderminqty").compareTo(BigDecimal.ZERO)<=0){
+                        saleFactory.addParameter("orderminqty", 1);
+                    }else{
                         saleFactory.addParameter("orderminqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderminqty"));
                     }