change - 在制品查询报表接口

aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java

@@ -37,10 +37,9 @@ public class ProductionReportController extends BaseController {
      * 查询生产执行报表
      */
     @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);
-        return getDataTable(list);
+        return success(list);
     }
 
     /**

aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml

@@ -77,9 +77,44 @@
         ORDER BY B2.PRODUCT_LINE_CODE, VMC.ORDER_CODE, BP.PRODUCT_LINE_CODE
     </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 id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
@@ -163,7 +198,8 @@
 
 
     <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 (
         SELECT RQI.QUALITY_DEFECT_NAME,
         COUNT(*) DEFECT_NUMBER,