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 64726cd810
commit 873dc4c09f
6 changed files with 112 additions and 35 deletions
Show Stats Download Patch File Download Diff File

11
aucma-report/src/main/java/com/aucma/report/controller/QualityReportController.java
Unescape Escape View File

@ -37,6 +37,17 @@ public class QualityReportController extends BaseController {
return success(list); return success(list);
} }
/**
* 质量缺陷统计分析明细
* @param hashMap
* @return
*/
@GetMapping("/qualityDefectsDetailList")
public AjaxResult qualityDefectsDetailList(@RequestParam(required = false) Map hashMap) {
List<HashMap<String, Object>> list = qualityReportService.qualityDefectsDetailList(hashMap);
return success(list);
}
/** /**
* 少错件报表 * 少错件报表
* @param hashMap * @param hashMap

7
aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
Unescape Escape View File

@ -92,4 +92,11 @@ public interface GeneralReportMapper {
* @return * @return
*/ */
List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap); List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap);
/**
* 质量缺陷统计分析明细
* @param hashMap
* @return
*/
List<HashMap<String, Object>> qualityDefectsDetailList(Map hashMap);
} }

7
aucma-report/src/main/java/com/aucma/report/service/IQualityReportService.java
Unescape Escape View File

@ -55,4 +55,11 @@ public interface IQualityReportService
* @return * @return
*/ */
List<HashMap<String, Object>> pourRecordReportList(Map hashMap); List<HashMap<String, Object>> pourRecordReportList(Map hashMap);
/**
* 质量缺陷统计分析明细
* @param hashMap
* @return
*/
List<HashMap<String, Object>> qualityDefectsDetailList(Map hashMap);
} }

10
aucma-report/src/main/java/com/aucma/report/service/impl/QualityReportServiceImpl.java
Unescape Escape View File

@ -82,4 +82,14 @@ public class QualityReportServiceImpl implements IQualityReportService {
return reportMapper.pourRecordReportList(hashMap); return reportMapper.pourRecordReportList(hashMap);
} }
/**
* 质量缺陷统计分析明细
* @param hashMap
* @return
*/
@Override
public List<HashMap<String, Object>> qualityDefectsDetailList(Map hashMap) {
return reportMapper.qualityDefectsDetailList(hashMap);
}
} }

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

@ -62,10 +62,10 @@
</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 BD.SORT EQUIPMENT_CODE, SELECT VBF.MAINID EQUIPMENT_CODE,
VBF.FIXTUREBOXTYPE, MAX(TP.FIXTUREBOXTYPE) FIXTUREBOXTYPE,
CASE WHEN VBF.FIXTURESTATUS = 1 THEN '正常生产' ELSE '暂停生产' END FIXTURESTATUS, CASE WHEN MAX(VBF.FIXTURESTATUS) = 1 THEN '正常生产' ELSE '暂停生产' END FIXTURESTATUS,
TO_NUMBER(BCD.CUSTOM_DATA) TARGET, TO_NUMBER(BCD.CUSTOM_DATA) TARGET,
(CASE (CASE
WHEN '20:00' > TO_CHAR(SYSDATE, 'HH24:MI') AND TO_CHAR(SYSDATE, 'HH24:MI') >= '08:00' WHEN '20:00' > TO_CHAR(SYSDATE, 'HH24:MI') AND TO_CHAR(SYSDATE, 'HH24:MI') >= '08:00'
THEN round(TO_NUMBER(BCD.CUSTOM_DATA) / 12, 0) * (TO_CHAR(SYSDATE, 'HH24') - 7) THEN round(TO_NUMBER(BCD.CUSTOM_DATA) / 12, 0) * (TO_CHAR(SYSDATE, 'HH24') - 7)
@ -74,27 +74,41 @@
WHEN '08:00' > TO_CHAR(SYSDATE, 'HH24:MI') WHEN '08:00' > TO_CHAR(SYSDATE, 'HH24:MI')
THEN round(TO_NUMBER(BCD.CUSTOM_DATA) / 12, 0) * (TO_CHAR(SYSDATE, 'HH24') + 5) THEN round(TO_NUMBER(BCD.CUSTOM_DATA) / 12, 0) * (TO_CHAR(SYSDATE, 'HH24') + 5)
END END
) PLAN_SUM, ) PLAN_SUM,
VBF.PRODUCTION PRO_SUM, SUM(VBF.ANHOUR + VBF.TWOHOUR + VBF.THREEHOUR + VBF.FOURHOUR + VBF.FIVEHOUR + VBF.SIXHOUR +
VBF.ANHOUR, VBF.SEVENHOUR +
VBF.TWOHOUR, VBF.EIGHTHOUR +
VBF.THREEHOUR, VBF.NINEHOUR + VBF.TENHOUR + VBF.ELEVENHOUR + VBF.TWELVEHOUR) PRO_SUM,
VBF.FOURHOUR, SUM(VBF.ANHOUR) ANHOUR,
VBF.FIVEHOUR, SUM(VBF.TWOHOUR) TWOHOUR,
VBF.SIXHOUR, SUM(VBF.THREEHOUR) THREEHOUR,
VBF.SEVENHOUR, SUM(VBF.FOURHOUR) FOURHOUR,
VBF.EIGHTHOUR, SUM(VBF.FIVEHOUR) FIVEHOUR,
VBF.NINEHOUR, SUM(VBF.SIXHOUR) SIXHOUR,
VBF.TENHOUR, SUM(VBF.SEVENHOUR) SEVENHOUR,
VBF.ELEVENHOUR, SUM(VBF.EIGHTHOUR) EIGHTHOUR,
VBF.TWELVEHOUR, SUM(VBF.NINEHOUR) NINEHOUR,
VBF.ACTUALVALUE, SUM(VBF.TENHOUR) TENHOUR,
TO_CHAR(VBF.UPDATETIME, 'YYYY-MM-DD HH24:MI:SS') UPDATETIME 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 FROM VIEW_BOX_FOAMDATA VBF
LEFT JOIN VIEW_BOX_DEVICEINFO BD ON BD.OBJ_ID = VBF.MAINID LEFT JOIN VIEW_BOX_DEVICEINFO BD ON BD.OBJ_ID = VBF.MAINID
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
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
WHERE VBF.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE} WHERE VBF.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
ORDER BY BD.SORT GROUP BY VBF.MAINID, TO_NUMBER(BCD.CUSTOM_DATA)
ORDER BY VBF.MAINID
</select> </select>
<select id="getCurrentTeamTimeList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="getCurrentTeamTimeList" resultType="java.util.HashMap" parameterType="java.util.HashMap">

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

@ -36,47 +36,75 @@
ORDER BY ORDER_RATE ORDER BY ORDER_RATE
</select> </select>
<select id="productionExecutionReportList" resultType="java.util.HashMap"> <select id="productionExecutionReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_MATERIAL_COMPLETION FROM VIEW_MATERIAL_COMPLETION
</select> </select>
<select id="WIPInquiryReportList" resultType="java.util.HashMap"> <select id="WIPInquiryReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_MATERIAL_COMPLETION FROM VIEW_MATERIAL_COMPLETION
</select> </select>
<select id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap"> <select id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT FY.FACTORY_NAME,
BPP.PRODUCT_LINE_NAME,
BP.PRODUCT_LINE_CODE,
BP.PRODUCT_LINE_NAME STATION_NAME,
COUNT(*) INSPECTION_NUMBER,
SUM(REWORK_NUMBER) REWORK_NUMBER,
ROUND((1 - SUM(REWORK_NUMBER) / COUNT(*)) * 100, 0) || '%' RATE
FROM REPORT_QUALITY_INSPECTION RQI
LEFT JOIN BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = RQI.STATION_CODE
LEFT JOIN BASE_PRODUCTLINE BPP ON BPP.PRODUCT_LINE_CODE = BP.PARENT_ID
LEFT JOIN BASE_FACTORY FY ON FY.FACTORY_CODE = BPP.PLANT_CODE
<where>
<if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''">
AND BPP.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
</if>
<if test="STATION_CODE != null and STATION_CODE != ''">
AND BP.PRODUCT_LINE_CODE = #{STATION_CODE}
</if>
<if test="beginBeginTime != null and beginBeginTime != '' and endBeginTime != null and endBeginTime != ''">
AND TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime}
</if>
</where>
GROUP BY FY.FACTORY_NAME, BPP.PRODUCT_LINE_NAME, BP.PRODUCT_LINE_CODE, BP.PRODUCT_LINE_NAME
ORDER BY PRODUCT_LINE_CODE
</select>
<select id="fewerMistakesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_MATERIAL_COMPLETION FROM VIEW_MATERIAL_COMPLETION
</select> </select>
<select id="fewerMistakesReportList" resultType="java.util.HashMap"> <select id="qualityIssuesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_MATERIAL_COMPLETION FROM VIEW_MATERIAL_COMPLETION
</select> </select>
<select id="qualityIssuesReportList" resultType="java.util.HashMap"> <select id="productTraceabilityReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_MATERIAL_COMPLETION FROM VIEW_MATERIAL_COMPLETION
</select> </select>
<select id="productTraceabilityReportList" resultType="java.util.HashMap"> <select id="ScanOfflineRecordReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT *
FROM VIEW_MATERIAL_COMPLETION
</select>
<select id="ScanOfflineRecordReportList" resultType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_PRODUCT_OFFLINE FROM VIEW_PRODUCT_OFFLINE
</select> </select>
<select id="temperatureRecordReportList" resultType="java.util.HashMap"> <select id="temperatureRecordReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_RECORD_TEMPERATURE FROM VIEW_RECORD_TEMPERATURE
</select> </select>
<select id="pourRecordReportList" resultType="java.util.HashMap"> <select id="pourRecordReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_PERFUSION_RECORD FROM VIEW_PERFUSION_RECORD
</select> </select>
<select id="foamFillingRecordReportList" resultType="java.util.HashMap"> <select id="foamFillingRecordReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT * SELECT *
FROM VIEW_BOX_FOAMDATARECORD FROM VIEW_BOX_LASTSHOTRECORD
ORDER BY CREATE_TIME DESC
</select>
<select id="qualityDefectsDetailList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT *
FROM VIEW_PERFUSION_RECORD
</select> </select>

Write Preview
Loading…
Cancel
Save