Merge branch 'develop-green' into develop2

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -642,7 +642,7 @@ public class OrderItems extends Controller {
 //        querySQL.addJoinTable(JOINTYPE.left, "plm_itemextend", "t4", "t4.itemid = t1.itemid and t4.siteid = t1.siteid",
 //                "erpitemno", "erpitemname", "material", "prodline", "device", "specalnote");
         querySQL.addJoinTable(JOINTYPE.left, "sa_promotion_items", "t4",
-                "t4.sa_promotion_itemsid = t1.sa_promotion_itemsid and t4.siteid = t1.siteid and t4.sa_promotionid=" + sa_promotionid);
+                "t4.sa_promotion_itemsid = t1.sa_promotion_itemsid and t4.siteid = t1.siteid and t4.sa_promotionid=" + sa_promotionid,"packagetypemx");
 
         querySQL.addQueryFields("candispatchqty", "ifnull(t2.candispatchqty, 0)");
         querySQL.addQueryFields("cansaleqty", "ifnull(t2.cansaleqty, 0)");

src/custom/restcontroller/webmanage/sale/order/PromotionOrder.java

@@ -73,6 +73,11 @@ public class PromotionOrder extends Controller {
                 where.append("or t1.spec like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("packagetypemx") && !"".equals(whereObject.getString("packagetypemx"))) {
+                where.append(" and(");
+                where.append("t3.packagetypemx ='").append(whereObject.getString("packagetypemx")).append("' ");
+                where.append(")");
+            }
         }
         Long sa_orderid = content.getLong("sa_orderid");
 

src/custom/restcontroller/webmanage/sale/order/SQL/促销方案商品列表.sql

@@ -18,6 +18,7 @@ SELECT t1.itemid,
        t3.signaturecode,
        t3.groupqty,
        t3.saledqty,
+       t3.packagetypemx,
        t1.spec,
        t1.standards,
        t1.marketprice,

src/custom/restcontroller/webmanage/sale/order/SQL/订单_详情.sql

@@ -45,6 +45,8 @@ SELECT t1.sa_orderid,
        t1.reviewtype,
        (SELECT promname from sa_promotion WHERE sa_promotionid = t1.sa_promotionid and siteid = t1.siteid) promname,
        (SELECT promnum from sa_promotion WHERE sa_promotionid = t1.sa_promotionid and siteid = t1.siteid) promnum,
+       (SELECT packagetype from sa_promotion WHERE sa_promotionid = t1.sa_promotionid and siteid = t1.siteid) packagetype,
+       (SELECT type from sa_promotion WHERE sa_promotionid = t1.sa_promotionid and siteid = t1.siteid) type,
        t9.subvalues,
        t5.freefreightamount,
        t1.rebateamount,