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

src/custom/beans/itemclass/SQL/查询货品的营销分类.sql

@@ -1,4 +1,4 @@
-SELECT t1.itemid, t2.itemclassname,t2.itemclassfullname,t1.classtype,t2.itemclassid
+SELECT t1.itemid, t2.itemclassname,t2.itemclassfullname,t1.classtype,t2.itemclassid,t2.itemclassnum
 from sa_itemsaleclass t1
          INNER JOIN plm_itemclass t2 ON t2.itemclassid = t1.itemclassid and t2.siteid = t1.siteid
 WHERE t1.itemid IN $itemid$

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

@@ -655,6 +655,9 @@ public class Item extends Controller {
                 "itemclassname");
         querySQL.addJoinTable(JOINTYPE.left, "sys_department", "t16", "t16.departmentid = t1.departmentid AND t16.siteid = t1.siteid",
                 "depno","depname");
+        querySQL.addJoinTable(JOINTYPE.left, "st_stock", "t17", "t17.stockno = t1.stockno AND t17.siteid = t1.siteid",
+                "stockname");
+
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         return querySQL;