From f3a52e3fa89c2ce82fe430d37531b821f97755a1 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 18 Mar 2024 10:54:30 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E7=BC=BA=E9=99=B7=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=8F=96=E6=95=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReportQualityInspectionController.java    | 12 +++
 .../domain/ReportQualityInspection.java       | 19 +++++
 .../IReportQualityInspectionService.java      | 10 +++
 .../RecordQualityMaterialServiceImpl.java     |  2 +-
 .../ReportQualityInspectionServiceImpl.java   | 13 ++++
 .../mapper/report/GeneralReportMapper.xml     | 78 +++++++++++++++----
 .../mapper/report/ProductOffLineMapper.xml    |  2 +-
 .../report/ReportQualityInspectionMapper.xml  |  5 +-
 8 files changed, 121 insertions(+), 20 deletions(-)

diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java b/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java
index 2c22c2d..5f5597b 100644
--- a/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java
+++ b/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java
@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.aucma.common.utils.DateUtils;
+import com.aucma.report.domain.BoxTemperatureHistory;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -98,4 +99,15 @@ public class ReportQualityInspectionController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] objIds) {
         return toAjax(reportQualityInspectionService.deleteReportQualityInspectionByObjIds(objIds));
     }
+
+    /**
+     * 测温数据添加到质检记录
+     * @param temperatureHistory
+     * @return
+     */
+    @PostMapping("/temperatureApi" )
+    public AjaxResult temperatureApi(BoxTemperatureHistory temperatureHistory) {
+        System.out.println(temperatureHistory.toString());
+        return success(null);
+    }
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
index 7da2dbc..9acf003 100644
--- a/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
+++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportQualityInspection.java
@@ -158,6 +158,25 @@ public class ReportQualityInspection extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    private String beginBeginTime;
+    private String endBeginTime;
+
+    public String getBeginBeginTime() {
+        return beginBeginTime;
+    }
+
+    public void setBeginBeginTime(String beginBeginTime) {
+        this.beginBeginTime = beginBeginTime;
+    }
+
+    public String getEndBeginTime() {
+        return endBeginTime;
+    }
+
+    public void setEndBeginTime(String endBeginTime) {
+        this.endBeginTime = endBeginTime;
+    }
+
     public String getOrderCode() {
         return orderCode;
     }
diff --git a/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java b/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java
index 92619d0..ad3f365 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java
@@ -3,6 +3,7 @@ package com.aucma.report.service;
 import java.util.HashMap;
 import java.util.List;
 
+import com.aucma.report.domain.BoxTemperatureHistory;
 import com.aucma.report.domain.ReportQualityInspection;
 
 /**
@@ -67,4 +68,13 @@ public interface IReportQualityInspectionService {
      * @return 质检记录管理集合
      */
     public HashMap<String, Integer> pdaQueryQuantityNumber(String reportQualityInspection);
+
+    /**
+     * 测温数据添加到质检记录
+     *
+     * @param reportQualityInspection 质检记录管理
+     * @return 质检记录管理集合
+     */
+    public int temperatureApi(BoxTemperatureHistory temperatureHistory);
+
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java
index faa1c9d..a9bfa43 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java
@@ -65,7 +65,7 @@ public class RecordQualityMaterialServiceImpl implements IRecordQualityMaterialS
                 throw new ServiceException("此SAP计划未维护!");
             }
             RecordQualityMaterial material = new RecordQualityMaterial();
-            material.setMaterialCode(recordQualityMaterial.getMaterialCode());
+            material.setMaterialCode(baseOrderInfos.get(0).getMaterialCode());
             material.setInfoType(recordQualityMaterial.getInfoType());
             List<RecordQualityMaterial> qualityMaterials = recordQualityMaterialMapper.selectRecordQualityMaterialList(material);
             if (qualityMaterials.size() > 0) {
diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
index 2c51c02..0356dd9 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.aucma.common.utils.StringUtils;
+import com.aucma.report.domain.BoxTemperatureHistory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.aucma.report.mapper.ReportQualityInspectionMapper;
@@ -103,4 +104,16 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect
     }
 
 
+    /**
+     * 测温数据添加到质检记录
+     * @param temperatureHistory 质检记录管理
+     * @return
+     */
+    @Override
+    public int temperatureApi(BoxTemperatureHistory temperatureHistory) {
+
+        return 1;
+    }
+
+
 }
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index 0028fc3..836e91e 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -118,15 +118,24 @@
     </select>
 
     <select id="qualityDefectsStatisticalAnalysisList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+
+        SELECT FACTORY_NAME,
+        PRODUCT_LINE_NAME,
+        STATION_CODE,
+        STATION_NAME,
+        COUNT(*)                                             INSPECTION_NUMBER,
+        SUM(REWORK_NUMBER)                                   REWORK_NUMBER,
+        ROUND((1 - SUM(REWORK_NUMBER) / COUNT(*)) * 100, 0) || '%' RATE
+        FROM (
         SELECT FY.FACTORY_NAME,
         BPP.PRODUCT_LINE_NAME,
-        BP.PRODUCT_LINE_CODE STATION_CODE,
-        BP.PRODUCT_LINE_NAME STATION_NAME,
-        COUNT(*) INSPECTION_NUMBER,
-        SUM(REWORK_NUMBER) REWORK_NUMBER,
-        ROUND((1 - SUM(REWORK_NUMBER) / COUNT(*)) * 100, 0) || '%' RATE
+        BP.PRODUCT_LINE_CODE                                         STATION_CODE,
+        BP.PRODUCT_LINE_NAME                                         STATION_NAME,
+        RQI.BAR_CODE,
+        MAX(CASE WHEN RQI.TREATMENT_MEASURE = '1' THEN 1 ELSE 0 END) REWORK_NUMBER
         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_FACTORY FY ON FY.FACTORY_CODE = BPP.PLANT_CODE
         <where>
@@ -140,8 +149,11 @@
                 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 BP.PRODUCT_LINE_CODE
+        GROUP BY FY.FACTORY_NAME, BPP.PRODUCT_LINE_NAME, BP.PRODUCT_LINE_CODE, BP.PRODUCT_LINE_NAME,
+        RQI.BAR_CODE
+        )
+        GROUP BY FACTORY_NAME, PRODUCT_LINE_NAME, STATION_CODE, STATION_NAME
+        ORDER BY REWORK_NUMBER
     </select>
     <select id="fewerMistakesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT FY.FACTORY_NAME,
@@ -220,21 +232,53 @@
     </select>
 
     <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
-        FROM (
-        SELECT RQI.QUALITY_DEFECT_NAME,
-        COUNT(*) DEFECT_NUMBER,
-        SUM(COUNT(*)) OVER () ALL_DEFECT
-        FROM REPORT_QUALITY_INSPECTION RQI
-        WHERE RQI.TREATMENT_MEASURE = 1
+        WITH TotalDefects AS (
+        SELECT
+        COUNT(*) AS ALL_DEFECT
+        FROM
+        REPORT_QUALITY_INSPECTION RQI
+        WHERE
+        RQI.TREATMENT_MEASURE = 1
         <if test="stationCode != null  and stationCode != ''">
             AND RQI.STATION_CODE = #{stationCode}
         </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>
-        GROUP BY RQI.QUALITY_DEFECT_NAME) SD
+        )
+        SELECT
+        ROW_NUMBER() OVER (ORDER BY RATE) AS SEQ,
+        SD.QUALITY_DEFECT_NAME,
+        SD.DEFECT_NUMBER,
+        RATE
+        FROM (
+        SELECT
+        DA.QUALITY_DEFECT_NAME,
+        COUNT(*) AS DEFECT_NUMBER,
+        ROUND(COUNT(*) / TD.ALL_DEFECT * 100, 0) || '%' AS RATE
+        FROM (
+        SELECT
+        RQI.QUALITY_DEFECT_NAME,
+        RQI.BAR_CODE,
+        RQI.QUALITY_DEFECT_CODE
+        FROM
+        REPORT_QUALITY_INSPECTION RQI
+        WHERE
+        RQI.TREATMENT_MEASURE = 1
+        <if test="stationCode != null  and stationCode != ''">
+            AND RQI.STATION_CODE = #{stationCode}
+        </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>
+        GROUP BY
+        RQI.QUALITY_DEFECT_NAME, RQI.BAR_CODE, RQI.QUALITY_DEFECT_CODE
+        ) DA
+        CROSS JOIN TotalDefects TD
+        GROUP BY
+        DA.QUALITY_DEFECT_NAME, TD.ALL_DEFECT
+        ) SD
+        ORDER BY RATE
     </select>
 
     <select id="productTraceabilityReportList" resultType="ProductTraceabilityReport" parameterType="java.util.HashMap">
diff --git a/aucma-report/src/main/resources/mapper/report/ProductOffLineMapper.xml b/aucma-report/src/main/resources/mapper/report/ProductOffLineMapper.xml
index 5e5dc2c..276623b 100644
--- a/aucma-report/src/main/resources/mapper/report/ProductOffLineMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ProductOffLineMapper.xml
@@ -67,7 +67,7 @@
             </if>
             <if test="productSncode != null  and productSncode != ''">and po.product_sncode = #{productSncode}</if>
             <if test="productOrderNo != null  and productOrderNo != ''">and po.product_order_no like concat(concat('%',
-                #{product_order_no}), '%')</if>
+                #{productOrderNo}), '%')</if>
             <if test="productSaleNo != null  and productSaleNo != ''">and po.product_sale_no = #{productSaleNo}</if>
             <if test="productSaleLineNo != null  and productSaleLineNo != ''">and po.product_sale_line_no =
                 #{productSaleLineNo}
diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
index aa5d45f..b908f58 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
@@ -84,12 +84,15 @@
             <if test="isLowerLine != null  and isLowerLine != ''">and rqi.is_lower_line = #{isLowerLine}</if>
             <if test="groupCode != null  and groupCode != ''">and rqi.group_code = #{groupCode}</if>
             <if test="inspectorCode != null  and inspectorCode != ''">and rqi.inspector_code = #{inspectorCode}</if>
-            <if test="inspectorTime != null ">and rqi.inspector_time = #{inspectorTime}</if>
+            <if test="stationCode != null and stationCode != ''">and rqi.station_code = #{stationCode}</if>
             <if test="reworkNumber != null ">and rqi.rework_number = #{reworkNumber}</if>
             <if test="finishTime != null ">and rqi.finish_time = #{finishTime}</if>
             <if test="isFlag != null ">and rqi.is_flag = #{isFlag}</if>
             <if test="updatedBy != null  and updatedBy != ''">and rqi.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and rqi.updated_time = #{updatedTime}</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>
         order by rqi.inspector_time desc
     </select>