Merge remote-tracking branch 'origin/develop-green' into develop-green

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -479,6 +479,13 @@ public class Item extends Controller {
                 where.append(" select 1 from plm_item_tradefield t3 where t3.siteid=t1.siteid and t3.itemid=t1.itemid and t3.tradefield='").append(whereObject.getString("tradefield")).append("' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("itemclass") && !whereObject.getString("itemclass").isEmpty()) {
+                String itemclass=whereObject.getString("itemclass");
+
+                where.append(" and t1.itemid in (");
+                where.append(" SELECT t1.itemid FROM sa_itemsaleclass t1 INNER JOIN plm_itemclass t2 ON t2.itemclassid=t1.itemclassid AND t2.siteid=t1.siteid WHERE t2.itemclassname LIKE '%"+itemclass+"%' ");
+                where.append(")");
+            }
 
         }