|
|
@@ -16,6 +16,7 @@ import common.data.SQLFactory;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import restcontroller.R;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
public class promotionItems extends Controller {
|
|
|
@@ -138,7 +139,12 @@ public class promotionItems extends Controller {
|
|
|
saleFactory.addParameter("itemid", iteminfo.getLong("itemid"));
|
|
|
if(itemrowsMap.containsKey(iteminfo.getString("itemid"))){
|
|
|
saleFactory.addParameter("orderaddqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderaddqty"));
|
|
|
- saleFactory.addParameter("orderminqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderminqty"));
|
|
|
+ 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 {
|
|
|
+ saleFactory.addParameter("orderminqty", itemrowsMap.get(iteminfo.getString("itemid")).get(0).getBigDecimal("orderminqty"));
|
|
|
+ }
|
|
|
+
|
|
|
}else {
|
|
|
saleFactory.addParameter("orderaddqty", 1);
|
|
|
saleFactory.addParameter("orderminqty", 1);
|