修改 展示看板

ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.IBroadDataService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -44,6 +45,11 @@ public class BoxBroadController {
 
         return JSONObject.toJSONString(new EchartsDTO(xAxisInfo, seriesInfo));
     }
+    @PostMapping("/selectStockOccupancy")
+    @ApiOperation("库存占有率")
+    public String selectStockOccupancy(){
+        return JSONArray.toJSONString(service.xk_selectStockOccupancy());
+    }
 
 
     @PostMapping("/selectOutputByType")

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java

@@ -42,6 +42,8 @@ public interface BroadDataMapper {
     List<DeviceStation> fp_selectDeviceStation();
     List<FPStationHourInfo> fp_selectStationHourInfo();
 
+    List<OrderInfo> xk_selectStockOccupancy();
+
 
     ///////////////////////////////////////////////////////////////////////////
     // 6

ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java

@@ -41,4 +41,6 @@ public interface IBroadDataService {
     List<DeviceStation> fp_selectDeviceStation();
 
     List<FPStationHourInfo> fp_selectStationHourInfo();
+
+    List<OrderInfo> xk_selectStockOccupancy();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java

@@ -48,9 +48,10 @@ public class BroadDataServiceImpl implements IBroadDataService
         return mapper.selectOutputByTime();
     }
 
-
-
-
+    @Override
+    public List<OrderInfo> xk_selectStockOccupancy() {
+        return mapper.xk_selectStockOccupancy();
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     // 发泡线

ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml

@@ -84,6 +84,13 @@
         group by MATERIAL_NAME
     </select>
 
+    <select id="xk_selectStockOccupancy" resultType="com.ruoyi.system.domain.OrderInfo">
+        select round(count(STORE_BIN) / 3.3, 2) as rate, Store_Code as name
+        from IMOS_LO_BIN_DETIAL losd
+        where Store_Code in ('S001', 'S002')
+          and MATERIAL_STATE = '1'
+        group by Store_Code
+    </select>
     <select id="getUHullPlanInfo" resultType="com.ruoyi.system.domain.OrderInfo">
         select PLAN_NO                            as plan_code,
                substr(MATERIAL_NAME,6,Length(MATERIAL_NAME))  as name,