yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 返修率报表

Browse Source
master
yinq 2 years ago
parent b909cecff2
commit cbcbcb3cd6
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File

71
aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
Unescape Escape View File

@ -103,7 +103,7 @@
</select> </select>
<select id="boxFoamingProductionInterface" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="boxFoamingProductionInterface" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT VBF.MAINID EQUIPMENT_CODE, SELECT VBF.FIXTURE_CODE EQUIPMENT_CODE,
MAX(TP.FIXTUREBOXTYPE) FIXTUREBOXTYPE, MAX(TP.FIXTUREBOXTYPE) FIXTUREBOXTYPE,
CASE CASE
WHEN MAX(TP.FIXTUREBOXTYPE) = '0' THEN '暂停生产' WHEN MAX(TP.FIXTUREBOXTYPE) = '0' THEN '暂停生产'
@ -111,38 +111,39 @@
ELSE '暂停生产' END FIXTURESTATUS, ELSE '暂停生产' END FIXTURESTATUS,
TO_NUMBER(BCD.CUSTOM_DATA) TARGET, TO_NUMBER(BCD.CUSTOM_DATA) TARGET,
NVL(MAX(SD.PLAN_SUM), 0) PLAN_SUM, NVL(MAX(SD.PLAN_SUM), 0) PLAN_SUM,
SUM(VBF.ANHOUR + VBF.TWOHOUR + VBF.THREEHOUR + VBF.FOURHOUR + VBF.FIVEHOUR + VBF.SIXHOUR + NVL(SUM(VBF.AMOUNT), 0) PRO_SUM,
VBF.SEVENHOUR + SUM(CASE WHEN VBF.RECORD_HOUR = '08' THEN VBF.AMOUNT ELSE 0 END) ANHOUR,
VBF.EIGHTHOUR + SUM(CASE WHEN VBF.RECORD_HOUR = '09' THEN VBF.AMOUNT ELSE 0 END) TWOHOUR,
VBF.NINEHOUR + VBF.TENHOUR + VBF.ELEVENHOUR + VBF.TWELVEHOUR) PRO_SUM, SUM(CASE WHEN VBF.RECORD_HOUR = '10' THEN VBF.AMOUNT ELSE 0 END) THREEHOUR,
SUM(VBF.ANHOUR) ANHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '11' THEN VBF.AMOUNT ELSE 0 END) FOURHOUR,
SUM(VBF.TWOHOUR) TWOHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '12' THEN VBF.AMOUNT ELSE 0 END) FIVEHOUR,
SUM(VBF.THREEHOUR) THREEHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '13' THEN VBF.AMOUNT ELSE 0 END) SIXHOUR,
SUM(VBF.FOURHOUR) FOURHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '14' THEN VBF.AMOUNT ELSE 0 END) SEVENHOUR,
SUM(VBF.FIVEHOUR) FIVEHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '15' THEN VBF.AMOUNT ELSE 0 END) EIGHTHOUR,
SUM(VBF.SIXHOUR) SIXHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '16' THEN VBF.AMOUNT ELSE 0 END) NINEHOUR,
SUM(VBF.SEVENHOUR) SEVENHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '17' THEN VBF.AMOUNT ELSE 0 END) TENHOUR,
SUM(VBF.EIGHTHOUR) EIGHTHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '18' THEN VBF.AMOUNT ELSE 0 END) ELEVENHOUR,
SUM(VBF.NINEHOUR) NINEHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '19' THEN VBF.AMOUNT ELSE 0 END) TWELVEHOUR,
SUM(VBF.TENHOUR) TENHOUR, SUM(CASE WHEN VBF.RECORD_HOUR = '20' THEN VBF.AMOUNT ELSE 0 END) ACTUALVALUE
SUM(VBF.ELEVENHOUR) ELEVENHOUR, FROM (SELECT DF.PRODUCTION_LINE,
SUM(VBF.TWELVEHOUR) TWELVEHOUR, DF.FIXTURE_CODE,
SUM(VBF.ACTUALVALUE) ACTUALVALUE, DF.LOGIN_TEAM,
TO_CHAR(MAX(VBF.UPDATETIME), 'YYYY-MM-DD HH24:MI:SS') UPDATETIME TO_CHAR(DF.RECORDTIME, 'HH24') RECORD_HOUR,
FROM VIEW_BOX_FOAMDATA VBF NVL(COUNT(*), 0) AMOUNT
LEFT JOIN VIEW_BOX_DEVICEINFO BD ON BD.OBJ_ID = VBF.MAINID 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 BASE_CUSTOM_DATA BCD ON BCD.CUSTOM_CODE = 'XTFP_TARGET_' || #{PRODUCT_LINE_CODE}
LEFT JOIN (SELECT BF.MAINID, BF.FIXTUREBOXTYPE FIXTUREBOXTYPE, BF.FIXTURESTATUS LEFT JOIN (SELECT BF.MAINID,
FROM VIEW_BOX_FOAMDATA BF BF.FIXTUREBOXTYPE FIXTUREBOXTYPE,
JOIN BF.FIXTURESTATUS,
( BF.PRODUCT_LINE_CODE
SELECT MAINID FROM VIEW_BOX_FOAMDATA BF) TP
, MAX(UPDATETIME) UPDATETIME ON TP.MAINID = VBF.FIXTURE_CODE AND TP.PRODUCT_LINE_CODE = VBF.PRODUCTION_LINE
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 B2.FIXTUREBOXTYPE, LEFT JOIN (SELECT B2.FIXTUREBOXTYPE,
COUNT(*) TYPE_SUM, COUNT(*) TYPE_SUM,
MAX(PLAN_AMOUNT) PLAN_AMOUNT, MAX(PLAN_AMOUNT) PLAN_AMOUNT,
@ -163,9 +164,9 @@
ON F2.BOX_MATERIALNAME LIKE B2.FIXTUREBOXTYPE || '%' ON F2.BOX_MATERIALNAME LIKE B2.FIXTUREBOXTYPE || '%'
WHERE B2.FIXTUREBOXTYPE != 0 WHERE B2.FIXTUREBOXTYPE != 0
GROUP BY B2.FIXTUREBOXTYPE) SD ON TP.FIXTUREBOXTYPE = SD.FIXTUREBOXTYPE GROUP BY B2.FIXTUREBOXTYPE) SD ON TP.FIXTUREBOXTYPE = SD.FIXTUREBOXTYPE
WHERE VBF.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE} WHERE VBF.PRODUCTION_LINE = #{PRODUCT_LINE_CODE}
GROUP BY VBF.MAINID, TO_NUMBER(BCD.CUSTOM_DATA) GROUP BY VBF.FIXTURE_CODE, TO_NUMBER(BCD.CUSTOM_DATA)
ORDER BY VBF.MAINID ORDER BY VBF.FIXTURE_CODE
</select> </select>
<select id="getCurrentTeamTimeList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="getCurrentTeamTimeList" resultType="java.util.HashMap" parameterType="java.util.HashMap">

4
aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
Unescape Escape View File

@ -1031,7 +1031,7 @@
FROM BASE_CUSTOM_DATA FROM BASE_CUSTOM_DATA
WHERE CUSTOM_CODE = 'REPAIR_RATE_' || 'CX_02') TARGET 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 FROM TABLE (GET_YEAR_WEEK_TIME(${year})) WEE
LEFT JOIN temp_table A ON A.INSPECTOR_TIME BETWEEN WEE.COLUMN_B AND COLUMN_C LEFT JOIN temp_table A ON A.INSPECTOR_TIME BETWEEN WEE.COLUMN_B AND COLUMN_C
WHERE INSPECTOR_TIME IS NOT NULL WHERE INSPECTOR_TIME IS NOT NULL
@ -1087,7 +1087,7 @@
FROM BASE_CUSTOM_DATA FROM BASE_CUSTOM_DATA
WHERE CUSTOM_CODE = 'REPAIR_RATE_' || 'CX_02') TARGET 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 FROM TABLE (GET_YEAR_MONTH_TIME(${year})) WEE
LEFT JOIN temp_table A ON A.INSPECTOR_TIME BETWEEN WEE.COLUMN_B AND COLUMN_C LEFT JOIN temp_table A ON A.INSPECTOR_TIME BETWEEN WEE.COLUMN_B AND COLUMN_C
WHERE INSPECTOR_TIME IS NOT NULL WHERE INSPECTOR_TIME IS NOT NULL

Write Preview
Loading…
Cancel
Save