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

change - 在制品查询报表接口

Browse Source
master
yinq 11 months ago
parent bbec4e6d27
commit 92ecfb386f
2 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File

5
aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
Unescape Escape View File

@ -37,10 +37,9 @@ public class ProductionReportController extends BaseController {
* 查询生产执行报表 * 查询生产执行报表
*/ */
@GetMapping("/productionExecutionReportList") @GetMapping("/productionExecutionReportList")
public TableDataInfo productionExecutionReportList(@RequestParam(required = false) Map hashMap) { public AjaxResult productionExecutionReportList(@RequestParam(required = false) Map hashMap) {
startPage();
List<HashMap<String, Object>> list = productionReportService.productionExecutionReportList(hashMap); List<HashMap<String, Object>> list = productionReportService.productionExecutionReportList(hashMap);
return getDataTable(list); return success(list);
} }
/** /**

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

@ -44,9 +44,9 @@
BP.PRODUCT_LINE_NAME STATION_NAME, BP.PRODUCT_LINE_NAME STATION_NAME,
VMC.MATERIAL_CODE, VMC.MATERIAL_CODE,
BM.MATERIAL_NAME, BM.MATERIAL_NAME,
BO.MATERIAL_CODE PRODUCT_CODE, BO.MATERIAL_CODE PRODUCT_CODE,
BO.MATERIAL_NAME PRODUCT_NAME, BO.MATERIAL_NAME PRODUCT_NAME,
COUNT(*) COMP_AMOUNT COUNT(*) COMP_AMOUNT
FROM VIEW_MATERIAL_COMPLETION VMC FROM VIEW_MATERIAL_COMPLETION VMC
LEFT JOIN BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = VMC.STATION_NAME LEFT JOIN BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = VMC.STATION_NAME
LEFT JOIN BASE_PRODUCTLINE B2 ON B2.PRODUCT_LINE_CODE = BP.PARENT_ID LEFT JOIN BASE_PRODUCTLINE B2 ON B2.PRODUCT_LINE_CODE = BP.PARENT_ID
@ -77,9 +77,44 @@
ORDER BY B2.PRODUCT_LINE_CODE, VMC.ORDER_CODE, BP.PRODUCT_LINE_CODE ORDER BY B2.PRODUCT_LINE_CODE, VMC.ORDER_CODE, BP.PRODUCT_LINE_CODE
</select> </select>
<select id="WIPInquiryReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="WIPInquiryReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">SELECT
SELECT * B2.PRODUCT_LINE_CODE,
FROM VIEW_MATERIAL_COMPLETION B2.PRODUCT_LINE_NAME,
VMC.ORDER_CODE,
VMC.MATERIAL_CODE,
BM.MATERIAL_NAME,
BO.MATERIAL_CODE PRODUCT_CODE,
BO.MATERIAL_NAME PRODUCT_NAME,
COUNT(*) COMP_AMOUNT
FROM VIEW_MATERIAL_COMPLETION VMC
LEFT JOIN BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = VMC.STATION_NAME
LEFT JOIN BASE_PRODUCTLINE B2 ON B2.PRODUCT_LINE_CODE = BP.PARENT_ID
LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = VMC.ORDER_CODE AND BO.ORDER_AMOUNT > BO.COMPLETE_AMOUNT
LEFT JOIN BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = VMC.MATERIAL_CODE
<where>
VMC.IS_DOWN_LINE = 0
<if test="productLineCode != null and productLineCode != ''">
AND VMC.PRODUCT_LINE_CODE = #{productLineCode}
</if>
<if test="beginStationCode != null and beginStationCode != ''">
AND BP.EXECUTION_SORT >= #{beginStationCode}
</if>
<if test="endStationCode != null and endStationCode != ''">
AND #{endStationCode} >= BP.EXECUTION_SORT
</if>
<if test="ORDER_CODE != null and ORDER_CODE != ''">
and VMC.ORDER_CODE = #{ORDER_CODE}
</if>
<if test="PRODUCT_CODE != null and PRODUCT_CODE != ''">
and BO.MATERIAL_CODE like concat(#{PRODUCT_CODE}, '%')
</if>
<if test="PRODUCT_NAME != null and PRODUCT_NAME != ''">
and BO.MATERIAL_NAME like concat(concat('%', #{PRODUCT_NAME}), '%')
</if>
</where>
GROUP BY B2.PRODUCT_LINE_CODE, B2.PRODUCT_LINE_NAME, VMC.ORDER_CODE, VMC.MATERIAL_CODE, BM.MATERIAL_NAME,
BO.MATERIAL_CODE, BO.MATERIAL_NAME
ORDER BY B2.PRODUCT_LINE_CODE, VMC.ORDER_CODE
</select> </select>
<select id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
@ -110,18 +145,18 @@
</select> </select>
<select id="fewerMistakesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="fewerMistakesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT FY.FACTORY_NAME, SELECT FY.FACTORY_NAME,
BPP.PRODUCT_LINE_NAME, BPP.PRODUCT_LINE_NAME,
TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD') INSPECTOR_TIME, TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD') INSPECTOR_TIME,
RQI.STATION_CODE, RQI.STATION_CODE,
BP.PRODUCT_LINE_NAME STATION_NAME, BP.PRODUCT_LINE_NAME STATION_NAME,
GET_MATERIAL_TYPE(RQI.MATERIAL_NAME) MATERIAL_MODEL, GET_MATERIAL_TYPE(RQI.MATERIAL_NAME) MATERIAL_MODEL,
RQI.QUALITY_DEFECT_CODE, RQI.QUALITY_DEFECT_CODE,
RQI.QUALITY_DEFECT_NAME, RQI.QUALITY_DEFECT_NAME,
COUNT(*) DEFECT_NUMBER COUNT(*) DEFECT_NUMBER
FROM REPORT_QUALITY_INSPECTION RQI FROM REPORT_QUALITY_INSPECTION RQI
LEFT JOIN BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = RQI.STATION_CODE 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_PRODUCTLINE BPP ON BPP.PRODUCT_LINE_CODE = BP.PARENT_ID
LEFT JOIN BASE_FACTORY FY ON FY.FACTORY_CODE = BPP.PLANT_CODE LEFT JOIN BASE_FACTORY FY ON FY.FACTORY_CODE = BPP.PLANT_CODE
WHERE RQI.TREATMENT_MEASURE = 1 WHERE RQI.TREATMENT_MEASURE = 1
<if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''"> <if test="PRODUCT_LINE_CODE != null and PRODUCT_LINE_CODE != ''">
AND BPP.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE} AND BPP.PRODUCT_LINE_CODE = #{PRODUCT_LINE_CODE}
@ -136,8 +171,8 @@
AND TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD') BETWEEN #{beginBeginTime} AND #{endBeginTime} AND TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD') BETWEEN #{beginBeginTime} AND #{endBeginTime}
</if> </if>
GROUP BY FY.FACTORY_NAME, BPP.PRODUCT_LINE_NAME, TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD'), GROUP BY FY.FACTORY_NAME, BPP.PRODUCT_LINE_NAME, TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD'),
RQI.STATION_CODE, BP.PRODUCT_LINE_NAME, GET_MATERIAL_TYPE(RQI.MATERIAL_NAME), RQI.STATION_CODE, BP.PRODUCT_LINE_NAME, GET_MATERIAL_TYPE(RQI.MATERIAL_NAME),
RQI.QUALITY_DEFECT_CODE, RQI.QUALITY_DEFECT_NAME RQI.QUALITY_DEFECT_CODE, RQI.QUALITY_DEFECT_NAME
ORDER BY INSPECTOR_TIME DESC ORDER BY INSPECTOR_TIME DESC
</select> </select>
<select id="qualityIssuesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="qualityIssuesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
@ -163,10 +198,11 @@
<select id="qualityDefectsDetailList" resultType="java.util.HashMap" parameterType="java.util.HashMap"> <select id="qualityDefectsDetailList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT ROWNUM SEQ, SD.QUALITY_DEFECT_NAME, SD.DEFECT_NUMBER, ROUND(DEFECT_NUMBER / ALL_DEFECT * 100, 0) || '%' RATE SELECT ROWNUM SEQ, SD.QUALITY_DEFECT_NAME, SD.DEFECT_NUMBER, ROUND(DEFECT_NUMBER / ALL_DEFECT * 100, 0) || '%'
RATE
FROM ( FROM (
SELECT RQI.QUALITY_DEFECT_NAME, SELECT RQI.QUALITY_DEFECT_NAME,
COUNT(*) DEFECT_NUMBER, COUNT(*) DEFECT_NUMBER,
SUM(COUNT(*)) OVER () ALL_DEFECT SUM(COUNT(*)) OVER () ALL_DEFECT
FROM REPORT_QUALITY_INSPECTION RQI FROM REPORT_QUALITY_INSPECTION RQI
WHERE RQI.TREATMENT_MEASURE = 1 WHERE RQI.TREATMENT_MEASURE = 1

Write Preview
Loading…
Cancel
Save