物料

ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java

@@ -87,6 +87,15 @@ public class KpiController extends BaseController {
         return success(kpiService.getSpaceAnalysis(warehouseId));
     }
 
+    /**
+     * 新增：根据仓库和巷道统计各状态货位数量
+     */
+    @GetMapping("/spaceStatusCounts")
+    public AjaxResult getSpaceStatusCounts(String warehouseId,
+                                           String roadwayId) {
+        return success(kpiService.getSpaceStatusCounts(warehouseId, roadwayId));
+    }
+
     /**
      * 获取货位巷道数据
      *
@@ -97,6 +106,7 @@ public class KpiController extends BaseController {
     public AjaxResult getRoadways(@RequestParam("warehouseId") String warehouseId){
         return success(kpiService.getRoadways(warehouseId));
     }
+
     /**
      * 获取货位排数据
      *

ruoyi-admin/src/main/java/com/ruoyi/kpi/service/KpiService.java

@@ -40,11 +40,12 @@ public interface KpiService {
 
     Map<String, Object> getPlatoons(String warehouseId, String roadwayId);
 
-
     Map<String,Object> getChartData(String warehouseId, String roadwayId, String thePlatoon);
 
     Map<String,Object> getChartMag(String warehouseId, String theColumn, String theFloor, String thePlatoon);
 
-
     AjaxResult getInAnalysisByData(String warehouseId, String startTime, String endTime,String inOut);
+
+    // 新增：根据仓库和巷道统计各状态货位数量
+    Map<String, Object> getSpaceStatusCounts(String warehouseId, String roadwayId);
 }

ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java

@@ -278,7 +278,7 @@ public class KpiServiceImpl implements KpiService
 
             // 为每个巷道添加数量，如果没有数据则为0
             for (String roadwayId : roadwayIds) {
-                statusData.put(MessageUtils.message("kpi.spacePlan.roadway") + roadwayId, entry.getValue().getOrDefault(roadwayId, 0));
+                statusData.put("巷道" + roadwayId, entry.getValue().getOrDefault(roadwayId, 0));
             }
 
             result.add(statusData);
@@ -289,6 +289,34 @@ public class KpiServiceImpl implements KpiService
         return response;
     }
 
+    // 新增：根据仓库和巷道统计各状态货位数量（用于前端饼图）
+    @Override
+    public Map<String, Object> getSpaceStatusCounts(String warehouseId, String roadwayId) {
+        BasCargoSpace query = new BasCargoSpace();
+        query.setWarehouseId(warehouseId);
+        query.setRoadwayId(roadwayId);
+        List<BasCargoSpace> list = basCargoSpaceMapper.selectBasCargoSpaceList(query);
+
+        Map<String, Integer> counts = new HashMap<>();
+        counts.put("1", 0); // 空闲
+        counts.put("2", 0); // 占用
+        counts.put("3", 0); // 入库分配
+        counts.put("4", 0); // 出库分配
+        counts.put("5", 0); // 入库待检
+        counts.put("6", 0); // 出库待检
+
+        for (BasCargoSpace space : list) {
+            String status = space.getStatus();
+            if (status != null && counts.containsKey(status)) {
+                counts.put(status, counts.get(status) + 1);
+            }
+        }
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("data", counts);
+        return res;
+    }
+
     @Override
     public Map<String, Object> getRoadways(String warehouseId){
         Map<String, Object> response = new HashMap<>();
@@ -311,7 +339,7 @@ public class KpiServiceImpl implements KpiService
         for (String roadwayId : roadwaySet) {
             Map<String, String> roadway = new HashMap<>();
             roadway.put("value", roadwayId);
-            roadway.put("label", MessageUtils.message("kpi.spacePlan.roadway") + roadwayId);
+            roadway.put("name",   roadwayId+"巷道");
             roadways.add(roadway);
         }
 

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java

@@ -89,6 +89,16 @@ public class OutStockoutFinish extends BaseEntity
 
     private String remark;
 
+    private String supplierName;
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
     public String getRemark() {
         return remark;
     }