From 03245370b43ae9aa98a7c1574fe929ae43d78b13 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 20 Jul 2022 15:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/BroadDataMapper.xml         | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 0081079..10d7b14 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -182,22 +182,27 @@
 
     <select id="fp_selectOrderExecution" 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,
-       sum(PRODUCT_QTY) as actual_number
-from IMOS_PR_FOAMING_MONITOR
-group by 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
+        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
+        group by MATERIAL_NAME, plan_number
     </select>
     <select id="selectFpOrderInfo" resultType="com.ruoyi.system.domain.BoxOutput">
         select sum(PLAN_QTY) qty, '当班计划' as name
@@ -333,7 +338,7 @@ group by MATERIAL_NAME
                case
                    when PRODUCT_STATUS = 0 then '未生产'
                    else '生产中' end                            as status,
-               CURRENTPLAN_QTY                               as plan_number,
+               nvl(plan_number, 0)                           as plan_number,
                PRODUCT_QTY                                   as qty,
                round(PRODUCT_QTY / CURRENTPLAN_QTY * 100, 2) as rate,
                HOUR_QTY1                                     as h1,
@@ -348,7 +353,17 @@ group by MATERIAL_NAME
                HOUR_QTY10                                       h10,
                HOUR_QTY11                                       h11,
                HOUR_QTY12                                       h12
-        from IMOS_PR_FOAMING_MONITOR
+        from IMOS_PR_FOAMING_MONITOR ipr
+                 left join (
+            select round(PLAN_QTY / num, 0) as plan_number, itm.MATERIAL_NAME AS NAME
+            from imos_ta_material itm
+                     left join (select count(1) as num, MATERIAL_NAME
+                                from IMOS_PR_FOAMING_MONITOR
+                                group by MATERIAL_NAME) cou
+                               on cou.MATERIAL_NAME = itm.MATERIAL_NAME
+            where DISPLAY_FLAG = 1
+        ) ta
+                           on ta.name = ipr.MATERIAL_NAME
         order by to_number(STATION_NO)
     </select>