no message

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/MaterialMapper.java

@@ -131,7 +131,8 @@ public interface MaterialMapper {
      * @return
      */
     List<WebsitSalesCategoryVO> existStockCategory(@Param("companyWechatId") String companyWechatId,
-                                                   @Param("websitId") String websitId);
+                                                   @Param("websitId") String websitId,
+                                                   @Param("storageId") String storageId);
 
     /**
      * 根据存在的库存查询商品

mall-server-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitSalesController.java

@@ -181,9 +181,10 @@ public class WebsitSalesController {
     @PostMapping("/exist/stock/category")
     @ApiOperation(value = "网点销售订单-辅材库存分类")
     public ResponseHelper<List<WebsitSalesCategoryVO>> existStockCategory(
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId
+            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
+            @ApiParam(value = "仓库id", required = true) @RequestParam String storageId
     ) throws RemoteServiceException {
-        List<WebsitSalesCategoryVO> list = websitSalesLogic.existStockCategory(websitId);
+        List<WebsitSalesCategoryVO> list = websitSalesLogic.existStockCategory(websitId, storageId);
         return ResponseHelper.success(list);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -554,9 +554,9 @@ public class WebsitSalesLogic {
         order.insert();
     }
 
-    public List<WebsitSalesCategoryVO> existStockCategory(String websitId) {
+    public List<WebsitSalesCategoryVO> existStockCategory(String websitId, String storageId) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        List<WebsitSalesCategoryVO> categoryList = materialMapper.existStockCategory(adminUser.getCompanyWechatId(), websitId);
+        List<WebsitSalesCategoryVO> categoryList = materialMapper.existStockCategory(adminUser.getCompanyWechatId(), websitId, storageId);
         // 分组分类
         Map<String, WebsitSalesCategoryVO> parentMap = categoryList.stream()
                 .collect(Collectors.toMap(WebsitSalesCategoryVO::getParentCategoryId, Function.identity(), (key1, key2) -> key1));

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -198,6 +198,7 @@
                 LEFT JOIN websit_goods_category c ON b.goods_category_id = c.category_id
         WHERE
             a.company_wechat_id = #{companyWechatId}
+            AND a.storage_id = #{storageId}
             AND a.websit_id = #{websitId}
             AND a.goods_type = 'M'
             <!-- AND a.qty > 0 -->