促销方案查询商品起订量及增量从商品添加

src/custom/restcontroller/webmanage/sale/dispatch/SQL/经销商合作企业查询.sql

@@ -4,6 +4,7 @@ select t1.sys_enterpriseid,
        t3.address,
        t3.province,
        t3.city,
+       t3.phonenumber,
        t3.county,
        t4.agentnum
 from sa_order t1
@@ -20,4 +21,5 @@ group by t1.sys_enterpriseid,
          t3.province,
          t3.city,
          t3.county,
+         t3.phonenumber,
          t4.agentnum

src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -88,6 +88,8 @@ public class promotionItems extends Controller {
         long[] sa_promotion_itemsid = createTableID("sa_promotion_items", iteminfos.size());
         for (Object obj : iteminfos) {
             JSONObject iteminfo = (JSONObject) obj;
+            Rows itemrows = dbConnect.runSqlQuery("select itemid,orderminqty,orderaddqty from plm_item where siteid='"+siteid+"'");
+            RowsMap itemrowsMap = itemrows.toRowsMap("itemid");
             if (iteminfo.getLong("sa_promotion_itemsid") <= 0 || dbConnect
                     .runSqlQuery("select sa_promotion_itemsid from sa_promotion_items where sa_promotion_itemsid="
                             + iteminfo.getLong("sa_promotion_itemsid"))
@@ -99,8 +101,13 @@ public class promotionItems extends Controller {
                 saleFactory.addParameter("sa_promotion_itemgroupid", sa_promotion_itemgroupid);
                 saleFactory.addParameter("groupqty", iteminfo.getLong("groupqty"));
                 saleFactory.addParameter("itemid", iteminfo.getLong("itemid"));
-                saleFactory.addParameter("orderaddqty", iteminfo.getBigDecimal("orderaddqty"));
-                saleFactory.addParameter("orderminqty", iteminfo.getBigDecimal("orderminqty"));
+                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"));
+                }else {
+                    saleFactory.addParameter("orderaddqty", 1);
+                    saleFactory.addParameter("orderminqty", 1);
+                }
                 saleFactory.addParameter("islimit", iteminfo.getLong("islimit"));
                 sqlList.add(saleFactory.getSQL());
                 Rows rows = itempricerowsMap.get(iteminfo.getLong("itemid"));