u8商品价格列表返回仓库号及存货类别

src/custom/beans/itemclass/ItemClass.java

@@ -114,6 +114,21 @@ public class ItemClass extends BaseClass {
         sqlFactory.addParameter_in("itemid", itemids);
         return controller.dbConnect.runSqlQuery(sqlFactory).toRowsMap("itemid");
     }
+
+    /**
+     * 查询货品的上级分类名称
+     *
+     * @param controller
+     * @param itemids
+     * @return
+     * @throws YosException
+     */
+    public static RowsMap getAllItemUpperClassRowsMap_new(Controller controller, ArrayList<Long> itemids) throws YosException {
+        SQLFactory sqlFactory = new SQLFactory(new ItemClass(), "查询货品的上级营销分类");
+        sqlFactory.addParameter("siteid", controller.siteid);
+        sqlFactory.addParameter_in("itemid", itemids);
+        return controller.dbConnect.runSqlQuery(sqlFactory).toRowsMap("classtype");
+    }
     /**
      * 查询货品的所有分类名称
      *

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

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

src/custom/restcontroller/sale/stockbill/stockbill.java

@@ -127,7 +127,7 @@ public class stockbill extends Controller {
                 return getSucReturnObject().toString();
             }else{
                 System.err.println(jsonObject);
-                return getErrReturnObject().toString();
+                return getErrReturnObject().setErrMsg(jsonObject.getString("msg")).toString();
             }
         }else{
             return getSucReturnObject().toString();

src/custom/restcontroller/webmanage/sale/u8/u8itemprice.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.sale.u8;
 
 import beans.data.BatchDeleteErr;
+import beans.itemclass.ItemClass;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import common.Controller;
@@ -8,9 +9,8 @@ import common.YosException;
 import common.annotation.API;
 import common.annotation.CACHEING;
 import common.annotation.CACHEING_CLEAN;
-import common.data.QuerySQL;
-import common.data.Rows;
-import common.data.SQLFactory;
+import common.data.*;
+import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
 import java.util.ArrayList;
@@ -39,6 +39,7 @@ public class u8itemprice  extends Controller {
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "u8itemprice","*");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.siteid = t2.siteid and t1.itemid = t2.itemid","itemno","itemname","spec","model");
+        querySQL.addJoinTable(JOINTYPE.left, "st_stock", "t3", "t1.siteid = t3.siteid and t1.stockid = t3.stockid","stockno");
         querySQL.setTableAlias("t1");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.u8id", u8id);
@@ -46,6 +47,18 @@ public class u8itemprice  extends Controller {
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
 
+        ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
+        // 存货类别
+        RowsMap itemclassRowsMap = ItemClass.getAllItemUpperClassRowsMap_new(this, ids).get("存货").toRowsMap("itemid");
+        for (Row row : rows) {
+            String[] itemclass = itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows()).toArray("itemclassname");
+            row.put("itemclass", StringUtils.join(itemclass, ","));
+
+            String[] itemclassnum = itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows()).toArray("itemclassnum");
+            row.put("itemclassnum", StringUtils.join(itemclassnum, ","));
+
+        }
+
         return getSucReturnObject().setData(rows).toString();
     }