Merge branch 'develop-green' into develop2

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

@@ -271,6 +271,10 @@ public class promotionItems extends Controller {
                 where.append("or t2.model like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("isonsale") && !"".equals(whereObject.getString("isonsale"))) {
+                where.append(" and (t1.isonsale ='" + whereObject.getString("isonsale") + "') ");
+            }
+
         }
         Long sa_promotionid = content.getLong("sa_promotionid");
         Long sa_promotion_itemgroupid = content.getLong("sa_promotion_itemgroupid");
@@ -302,7 +306,7 @@ 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");
+                "itemno", "itemname","spec","model","standards");
         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_promotion_itemsid = t4.sa_promotion_itemsid and t1.sa_promotion_itemsid = t4.sa_promotion_itemsid and t1.siteid = t4.siteid and t4.pricegrade = 1");
         querySQL.addQueryFields("oldprice1", "ifnull(t4.oldprice, 0)");