修改 总装

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

@@ -40,6 +40,13 @@ public class FPBroadController {
     @ApiOperation("订单执行、生产统计")
     private String selectOrderExecution() {
         return JSONArray.toJSONString(service.fp_selectOrderExecution());
+
+    }
+  @PostMapping("/selectOrderExecutionPlan")
+    @ApiOperation("订单执行")
+    private String fp_selectOrderExecutionPlan() {
+      return JSONArray.toJSONString(service.fp_selectOrderExecutionPlan());
+
     }
 
     @PostMapping("/selectFpOrderInfo")

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

@@ -26,6 +26,7 @@ public interface BroadDataMapper {
     // 发泡线
     ///////////////////////////////////////////////////////////////////////////
     List<OrderInfo> fp_selectOrderExecution();
+    List<OrderInfo> fp_selectOrderExecutionPlan();
 
     ///////////////////////////////////////////////////////////////////////////
     // 泡前库

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

@@ -37,6 +37,7 @@ public interface IBroadDataService {
     List<QualityInfo> pqk_selectQualityInfo();
 
     List<OrderInfo> fp_selectOrderExecution();
+    List<OrderInfo> fp_selectOrderExecutionPlan();
 
     List<DeviceStation> fp_selectDeviceStation();
 
@@ -75,4 +76,6 @@ public interface IBroadDataService {
     List<BoxOutput>  zz_selectInstoreNumByday();
 
     List<MTKBeen> mtk_sselectQATop3();
+
+
 }

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

@@ -62,6 +62,10 @@ public class BroadDataServiceImpl implements IBroadDataService
     public List<OrderInfo> fp_selectOrderExecution(){
         return mapper.fp_selectOrderExecution();
     }
+    @Override
+    public List<OrderInfo> fp_selectOrderExecutionPlan(){
+        return mapper.fp_selectOrderExecutionPlan();
+    }
 
     @Override
     public BoxOutput selectOutputByTimeDY() {

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

@@ -217,6 +217,33 @@ FROM (select PLAN_NUMBER
         where PRODUCT_QTY > 0
         group by MATERIAL_NAME, plan_number
     </select>
+
+    <select id="fp_selectOrderExecutionPlan" resultType="com.ruoyi.system.domain.OrderInfo">
+        select substr(MATERIAL_NAME,
+                      case
+                          when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
+                          else instr(MATERIAL_NAME, '/', 1, 1) + 1
+                          end,
+                      case
+                          when instr(MATERIAL_NAME, ',', 1, 2) = 0 then Length(MATERIAL_NAME) + 1
+                          else instr(MATERIAL_NAME, ',', 1, 2)
+                          end
+                          -
+                      case
+                          when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
+                          else instr(MATERIAL_NAME, '/', 1, 1) + 1
+                          end)     as name,
+               nvl(plan_number, 0) as plan_number,
+               sum(PRODUCT_QTY)    as actual_number,
+               round( sum(PRODUCT_QTY)/nvl(plan_number, 1)*100,2) as rate
+        from IMOS_PR_FOAMING_MONITOR irfm
+                 left join (
+            select PLAN_QTY plan_number, MATERIAL_NAME as name1
+            from imos_ta_material
+            where DISPLAY_FLAG = 1) plan on plan.name1 = MATERIAL_NAME
+        where PRODUCT_QTY > 0 and plan_number>0
+        group by MATERIAL_NAME, plan_number
+    </select>
     <select id="selectFpOrderInfo" resultType="com.ruoyi.system.domain.BoxOutput">
         select sum(PLAN_QTY) qty, '当班计划' as name
         from imos_ta_material