Przeglądaj źródła

促销方案商品查询(经销商)不需要组名查询

hu 2 lat temu
rodzic
commit
01bd6a58f5

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

@@ -22,4 +22,4 @@ FROM
 	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
-	where t1.siteid=$siteid$ and t1.sa_promotionid=$sa_promotionid$  and t1.sa_promotion_itemgroupid = $sa_promotion_itemgroupid$ and $where$  and t5.pricegrade = (SELECT grade FROM sys_enterprise WHERE sys_enterpriseid = $sys_enterpriseid$ and siteid = $siteid$ )
+	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$ )

+ 2 - 2
src/custom/restcontroller/sale/promotion/promotion.java

@@ -90,11 +90,11 @@ public class promotion extends Controller {
             }
         }
         Long sa_promotionid = content.getLong("sa_promotionid");
-        Long sa_promotion_itemgroupid = content.getLong("sa_promotion_itemgroupid");
+//        Long sa_promotion_itemgroupid = content.getLong("sa_promotion_itemgroupid");
         SQLFactory sqlFactory = new SQLFactory(this, "促销方案商品查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("sa_promotionid", sa_promotionid);
-        sqlFactory.addParameter("sa_promotion_itemgroupid", sa_promotion_itemgroupid);
+//        sqlFactory.addParameter("sa_promotion_itemgroupid", sa_promotion_itemgroupid);
         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);