促销方案bug修复

src/custom/restcontroller/sale/promotion/SQL/促销方案商品查询.sql

@@ -27,5 +27,5 @@ FROM
 	sa_promotion_items t1
 	left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid
 	left join plm_unit t3 on t2.unitid=t3.unitid and t2.siteid=t3.siteid
-	 LEFT JOIN sa_promotion_itemprice t5 ON t5.itemid = t1.itemid and t5.siteid = t1.siteid and  t1.sa_promotionid=t5.sa_promotionid
+	 LEFT JOIN sa_promotion_itemprice t5 ON t5.sa_promotion_itemsid = t1.sa_promotion_itemsid and t5.siteid = t1.siteid and  t1.sa_promotionid=t5.sa_promotionid
 	where  t1.siteid=$siteid$ and t1.sa_promotionid=$sa_promotionid$  and $where$  and t5.pricegrade = (SELECT grade FROM sys_enterprise WHERE sys_enterpriseid = $sys_enterpriseid$ and siteid = $siteid$ )

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

@@ -240,28 +240,28 @@ public class promotionItems extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid = t2.itemid and t1.siteid = t2.siteid",
                 "itemno", "itemname","spec","model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t2.unitid = t3.unitid and t2.siteid = t3.siteid", "unitname");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t4", "t1.sa_promotionid = t4.sa_promotionid and t1.itemid = t4.itemid and t1.siteid = t4.siteid and t4.pricegrade = 1");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t4", "t1.sa_promotion_itemsid = t4.sa_promotion_itemsid and t1.itemid = t4.itemid and t1.siteid = t4.siteid and t4.pricegrade = 1");
         querySQL.addQueryFields("oldprice1", "ifnull(t4.oldprice, 0)");
         querySQL.addQueryFields("price1", "ifnull(t4.price, 0)");
         querySQL.addQueryFields("sa_promotion_itempriceid1", "ifnull(t4.sa_promotion_itempriceid, 0)");
 
-        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t5", "t1.sa_promotionid = t5.sa_promotionid and t1.itemid = t5.itemid and t1.siteid = t5.siteid and t5.pricegrade = 2");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t5", "t1.sa_promotion_itemsid = t5.sa_promotion_itemsid and t1.itemid = t5.itemid and t1.siteid = t5.siteid and t5.pricegrade = 2");
         querySQL.addQueryFields("oldprice2", "ifnull(t5.oldprice, 0)");
         querySQL.addQueryFields("price2", "ifnull(t5.price, 0)");
         querySQL.addQueryFields("sa_promotion_itempriceid2", "ifnull(t5.sa_promotion_itempriceid, 0)");
 
 
-        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t6", "t1.sa_promotionid = t6.sa_promotionid and t1.itemid = t6.itemid and t1.siteid = t6.siteid and t6.pricegrade = 3");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t6", "t1.sa_promotion_itemsid = t6.sa_promotion_itemsid and t1.itemid = t6.itemid and t1.siteid = t6.siteid and t6.pricegrade = 3");
         querySQL.addQueryFields("oldprice3", "ifnull(t6.oldprice, 0)");
         querySQL.addQueryFields("price3", "ifnull(t6.price, 0)");
         querySQL.addQueryFields("sa_promotion_itempriceid3", "ifnull(t6.sa_promotion_itempriceid, 0)");
 
-        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t7", "t1.sa_promotionid = t7.sa_promotionid and t1.itemid = t7.itemid and t1.siteid = t7.siteid and t7.pricegrade = 4");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t7", "t1.sa_promotion_itemsid = t7.sa_promotion_itemsid and t1.itemid = t7.itemid and t1.siteid = t7.siteid and t7.pricegrade = 4");
         querySQL.addQueryFields("oldprice4", "ifnull(t7.oldprice, 0)");
         querySQL.addQueryFields("price4", "ifnull(t7.price, 0)");
         querySQL.addQueryFields("sa_promotion_itempriceid4", "ifnull(t7.sa_promotion_itempriceid, 0)");
 
-        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t8", "t1.sa_promotionid = t8.sa_promotionid and t1.itemid = t8.itemid and t1.siteid = t8.siteid and t8.pricegrade = 5");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_itemprice", "t8", "t1.sa_promotion_itemsid = t8.sa_promotion_itemsid and t1.itemid = t8.itemid and t1.siteid = t8.siteid and t8.pricegrade = 5");
         querySQL.addQueryFields("oldprice5", "ifnull(t8.oldprice, 0)");
         querySQL.addQueryFields("price5", "ifnull(t8.price, 0)");
         querySQL.addQueryFields("sa_promotion_itempriceid5", "ifnull(t8.sa_promotion_itempriceid, 0)");