Browse Source

Merge branch 'develop-green' into develop2

hu 1 year ago
parent
commit
262ae09d57
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/custom/restcontroller/webmanage/sale/promotion/promotion.java

+ 1 - 1
src/custom/restcontroller/webmanage/sale/promotion/promotion.java

@@ -530,7 +530,7 @@ public class promotion extends Controller {
         Long sa_promotionid = content.getLong("sa_promotionid");
 
         Rows rows = dbConnect
-                .runSqlQuery("select sa_promotionid,status,promnum,promname,type,associationaccountclassid,associationamount from sa_promotion where sa_promotionid ='"
+                .runSqlQuery("select sa_promotionid,status,promnum,promname,type,associationaccountclassid,associationamount,packagetype from sa_promotion where sa_promotionid ='"
                         + sa_promotionid + "' and  siteid='" + siteid + "'");
         Rows rowsdetails = dbConnect
                 .runSqlQuery("select t2.itemno,t2.itemname,ifnull(t1.orderminqty,0) orderminqty, ifnull(t1.orderaddqty,0) orderaddqty from sa_promotion_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.sa_promotionid ='"