手动

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/WorkpieceService.java

@@ -31,7 +31,7 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
 
     public Map getInfoByPoint(String pointId);
 
-    public List<ProductionresourcePosition> getAllStockInfo();
+    public List<Map> getAllStockInfo();
 
     //执行非订单物品
     public String execute(Map map);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/WorkpieceServiceImpl.java

@@ -122,13 +122,39 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     }
 
     @Override
-    public List<ProductionresourcePosition> getAllStockInfo() {
+    public List<Map> getAllStockInfo() {
         BaseContextHandler.setTenant("0000");
         Map map = new HashMap();
         map.put("fullFlag","1");
-        List<ProductionresourcePosition> jbwBList = productionresourcePositionMapper.getPPList(map);
-//        String pointIds = jbwBList.stream().map(e -> e.getPointId()).collect(Collectors.joining("/"));
-        return jbwBList;
+        List<ProductionresourcePosition> list = productionresourcePositionMapper.getPPList(map);
+        Map<String, List<ProductionresourcePosition>> pointMap = list.stream().collect(groupingBy(ProductionresourcePosition::getPointId));
+
+        List<Map>returnList = new ArrayList<>();
+        for(String key:pointMap.keySet()){
+            Map returnMap = new HashMap();
+            List<ProductionresourcePosition> subList = pointMap.get(key);
+            if(CollectionUtil.isEmpty(subList)){
+                continue;
+            }
+            ProductionresourcePosition position0 = subList.get(0);
+            returnMap.put("pointId",key);
+            returnMap.put("lockStatus",position0.getLockStatus());
+            List<Map>l = new ArrayList<>();
+            for(ProductionresourcePosition p:subList){
+                if(p.getGoodsId()!=null){
+                    Map m = new HashMap();
+                    m.put("goodsId",p.getGoodsId());
+                    m.put("category",p.getCategory());
+                    l.add(m);
+                }
+            }
+            if(CollectionUtil.isNotEmpty(l)){
+                returnMap.put("goodsList",l);
+            }
+            returnList.add(returnMap);
+        }
+
+        return returnList;
 
     }
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/WorkpieceController.java

@@ -134,8 +134,8 @@ public class WorkpieceController extends SuperController<WorkpieceService, Long,
 
     @ApiOperation(value = "获取所有有库位的点位", notes = "获取所有有库位的点位")
     @PostMapping("/handMode/getAllStockInfo")
-    public R<List<ProductionresourcePosition>>  getAllStockInfo() {
-        List<ProductionresourcePosition>list  = baseService.getAllStockInfo();
+    public R<List<Map>>  getAllStockInfo() {
+        List<Map>list  = baseService.getAllStockInfo();
         return success(list);
     }