促销方案商品新增更新bug修复

src/custom/restcontroller/webmanage/sale/promotion/SQL/促销方案商品新增.sql

@@ -1,2 +1,2 @@
-insert into sa_promotion_items (siteid, sa_promotion_itemsid,sa_promotionid,sa_promotion_itemgroupid,groupqty,itemid, orderaddqty,orderminqty,islimit,signaturecode)
-values ($siteid$, $sa_promotion_itemsid$,$sa_promotionid$,$sa_promotion_itemgroupid$, $groupqty$, $itemid$, $orderaddqty$, $orderminqty$, $islimit$,$signaturecode$);
+insert into sa_promotion_items (siteid, sa_promotion_itemsid,sa_promotionid,sa_promotion_itemgroupid,groupqty,itemid, orderaddqty,orderminqty,islimit,signaturecode,itemno)
+values ($siteid$, $sa_promotion_itemsid$,$sa_promotionid$,$sa_promotion_itemgroupid$, $groupqty$, $itemid$, $orderaddqty$, $orderminqty$, $islimit$,$signaturecode$,$itemno$);

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

@@ -132,7 +132,7 @@ 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 + "'");
+            Rows itemrows = dbConnect.runSqlQuery("select itemid,orderminqty,orderaddqty,itemno 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="
@@ -145,6 +145,7 @@ 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("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) {