From cbcbcb3cd6e452a896460e2ea87c55d2e54fba9d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 27 May 2024 13:07:04 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=BF=94=E4=BF=AE=E7=8E=87?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/report/BoardReportMapper.xml       | 79 ++++++++++---------
 .../mapper/report/GeneralReportMapper.xml     |  4 +-
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
index 7a9c8c9..995e503 100644
--- a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
@@ -103,46 +103,47 @@
     </select>
 
     <select id="boxFoamingProductionInterface" resultType="java.util.HashMap" parameterType="java.util.HashMap">
-        SELECT VBF.MAINID                                                        EQUIPMENT_CODE,
-               MAX(TP.FIXTUREBOXTYPE)                                            FIXTUREBOXTYPE,
+        SELECT VBF.FIXTURE_CODE                                                 EQUIPMENT_CODE,
+               MAX(TP.FIXTUREBOXTYPE)                                           FIXTUREBOXTYPE,
                CASE
                    WHEN MAX(TP.FIXTUREBOXTYPE) = '0' THEN '暂停生产'
                    WHEN MAX(TP.FIXTURESTATUS) IN (1, 2) THEN '正常生产'
-                   ELSE '暂停生产' END                                               FIXTURESTATUS,
-               TO_NUMBER(BCD.CUSTOM_DATA)                                        TARGET,
-               NVL(MAX(SD.PLAN_SUM), 0)                                          PLAN_SUM,
-               SUM(VBF.ANHOUR + VBF.TWOHOUR + VBF.THREEHOUR + VBF.FOURHOUR + VBF.FIVEHOUR + VBF.SIXHOUR +
-                   VBF.SEVENHOUR +
-                   VBF.EIGHTHOUR +
-                   VBF.NINEHOUR + VBF.TENHOUR + VBF.ELEVENHOUR + VBF.TWELVEHOUR) PRO_SUM,
-               SUM(VBF.ANHOUR)                                                   ANHOUR,
-               SUM(VBF.TWOHOUR)                                                  TWOHOUR,
-               SUM(VBF.THREEHOUR)                                                THREEHOUR,
-               SUM(VBF.FOURHOUR)                                                 FOURHOUR,
-               SUM(VBF.FIVEHOUR)                                                 FIVEHOUR,
-               SUM(VBF.SIXHOUR)                                                  SIXHOUR,
-               SUM(VBF.SEVENHOUR)                                                SEVENHOUR,
-               SUM(VBF.EIGHTHOUR)                                                EIGHTHOUR,
-               SUM(VBF.NINEHOUR)                                                 NINEHOUR,
-               SUM(VBF.TENHOUR)                                                  TENHOUR,
-               SUM(VBF.ELEVENHOUR)                                               ELEVENHOUR,
-               SUM(VBF.TWELVEHOUR)                                               TWELVEHOUR,
-               SUM(VBF.ACTUALVALUE)                                              ACTUALVALUE,
-               TO_CHAR(MAX(VBF.UPDATETIME), 'YYYY-MM-DD HH24:MI:SS')             UPDATETIME
-        FROM VIEW_BOX_FOAMDATA VBF
-                 LEFT JOIN VIEW_BOX_DEVICEINFO BD ON BD.OBJ_ID = VBF.MAINID
+                   ELSE '暂停生产' END                                              FIXTURESTATUS,
+               TO_NUMBER(BCD.CUSTOM_DATA)                                       TARGET,
+               NVL(MAX(SD.PLAN_SUM), 0)                                         PLAN_SUM,
+               NVL(SUM(VBF.AMOUNT), 0)                                          PRO_SUM,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '08' THEN VBF.AMOUNT ELSE 0 END) ANHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '09' THEN VBF.AMOUNT ELSE 0 END) TWOHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '10' THEN VBF.AMOUNT ELSE 0 END) THREEHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '11' THEN VBF.AMOUNT ELSE 0 END) FOURHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '12' THEN VBF.AMOUNT ELSE 0 END) FIVEHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '13' THEN VBF.AMOUNT ELSE 0 END) SIXHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '14' THEN VBF.AMOUNT ELSE 0 END) SEVENHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '15' THEN VBF.AMOUNT ELSE 0 END) EIGHTHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '16' THEN VBF.AMOUNT ELSE 0 END) NINEHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '17' THEN VBF.AMOUNT ELSE 0 END) TENHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '18' THEN VBF.AMOUNT ELSE 0 END) ELEVENHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '19' THEN VBF.AMOUNT ELSE 0 END) TWELVEHOUR,
+               SUM(CASE WHEN VBF.RECORD_HOUR = '20' THEN VBF.AMOUNT ELSE 0 END) ACTUALVALUE
+        FROM (SELECT DF.PRODUCTION_LINE,
+                     DF.FIXTURE_CODE,
+                     DF.LOGIN_TEAM,
+                     TO_CHAR(DF.RECORDTIME, 'HH24') RECORD_HOUR,
+                     NVL(COUNT(*), 0)               AMOUNT
+              FROM C##AUCMA_SCADA.DATA_BOXFOAM_FIXTURECOMPLATE DF
+                       CROSS JOIN (SELECT MIN(START_TIME) START_TIME, MAX(END_TIME) END_TIME, TEAM_NAME
+                                   FROM VIEW_CURRENT_TEAM_TIME
+                                   GROUP BY TEAM_NAME) CT
+              WHERE PRODUCTION_LINE = #{PRODUCT_LINE_CODE}
+                AND DF.LOGIN_TEAM LIKE '%' || CT.TEAM_NAME
+              GROUP BY DF.PRODUCTION_LINE, DF.FIXTURE_CODE, DF.LOGIN_TEAM, TO_CHAR(DF.RECORDTIME, 'HH24')) VBF
                  LEFT JOIN BASE_CUSTOM_DATA BCD ON BCD.CUSTOM_CODE = 'XTFP_TARGET_' || #{PRODUCT_LINE_CODE}
-                 LEFT JOIN (SELECT BF.MAINID, BF.FIXTUREBOXTYPE FIXTUREBOXTYPE, BF.FIXTURESTATUS
-                            FROM VIEW_BOX_FOAMDATA BF
-                                     JOIN
-                                 (
-                                     SELECT MAINID
-                                          , MAX(UPDATETIME) UPDATETIME
-                                     FROM VIEW_BOX_FOAMDATA
-                                     WHERE PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
-                                     GROUP BY MAINID
-                                 ) SV ON SV.MAINID = BF.MAINID AND SV.UPDATETIME = BF.UPDATETIME) TP
-                           ON TP.MAINID = VBF.MAINID
+                 LEFT JOIN (SELECT BF.MAINID,
+                                   BF.FIXTUREBOXTYPE FIXTUREBOXTYPE,
+                                   BF.FIXTURESTATUS,
+                                   BF.PRODUCT_LINE_CODE
+                            FROM VIEW_BOX_FOAMDATA BF) TP
+                           ON TP.MAINID = VBF.FIXTURE_CODE AND TP.PRODUCT_LINE_CODE = VBF.PRODUCTION_LINE
                  LEFT JOIN (SELECT B2.FIXTUREBOXTYPE,
                                    COUNT(*)                              TYPE_SUM,
                                    MAX(PLAN_AMOUNT)                      PLAN_AMOUNT,
@@ -163,9 +164,9 @@
                                           ON F2.BOX_MATERIALNAME LIKE B2.FIXTUREBOXTYPE || '%'
                             WHERE B2.FIXTUREBOXTYPE != 0
                             GROUP BY B2.FIXTUREBOXTYPE) SD ON TP.FIXTUREBOXTYPE = SD.FIXTUREBOXTYPE
-        WHERE VBF.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
-        GROUP BY VBF.MAINID, TO_NUMBER(BCD.CUSTOM_DATA)
-        ORDER BY VBF.MAINID
+        WHERE VBF.PRODUCTION_LINE = #{PRODUCT_LINE_CODE}
+        GROUP BY VBF.FIXTURE_CODE, TO_NUMBER(BCD.CUSTOM_DATA)
+        ORDER BY VBF.FIXTURE_CODE
     </select>
 
     <select id="getCurrentTeamTimeList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index 4646248..212bc3a 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -1031,7 +1031,7 @@
         FROM BASE_CUSTOM_DATA
         WHERE CUSTOM_CODE = 'REPAIR_RATE_' || 'CX_02') TARGET
         )
-        SELECT COLUMN_A ,INSPECTOR_TIME,QUALITY_SUM,OFF_LINE_NUM,REPAIR_RATE,TARGET
+        SELECT COLUMN_A ,INSPECTOR_TIME,NVL(QUALITY_SUM, 0) QUALITY_SUM, NVL(OFF_LINE_NUM, 0) OFF_LINE_NUM,REPAIR_RATE,TARGET
         FROM TABLE (GET_YEAR_WEEK_TIME(${year})) WEE
         LEFT JOIN temp_table A ON A.INSPECTOR_TIME BETWEEN WEE.COLUMN_B AND COLUMN_C
         WHERE INSPECTOR_TIME IS NOT NULL
@@ -1087,7 +1087,7 @@
         FROM BASE_CUSTOM_DATA
         WHERE CUSTOM_CODE = 'REPAIR_RATE_' || 'CX_02') TARGET
         )
-        SELECT COLUMN_A ,INSPECTOR_TIME,QUALITY_SUM,OFF_LINE_NUM,REPAIR_RATE,TARGET
+        SELECT COLUMN_A ,INSPECTOR_TIME,NVL(QUALITY_SUM, 0) QUALITY_SUM, NVL(OFF_LINE_NUM, 0) OFF_LINE_NUM,REPAIR_RATE,TARGET
         FROM TABLE (GET_YEAR_MONTH_TIME(${year})) WEE
         LEFT JOIN temp_table A ON A.INSPECTOR_TIME BETWEEN WEE.COLUMN_B AND COLUMN_C
         WHERE INSPECTOR_TIME IS NOT NULL