From 33122acb2a3acee32d3e21bedcea0a1d56b572b0 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Thu, 4 Jan 2024 10:49:16 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B4=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=BF=94=E4=BF=AE=E6=95=B0=E6=8D=AE=E5=B7=A5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/PdaBindingMapper.xml   | 12 +++++++-----
 .../aucma/report/domain/ReportQualityInspection.java | 10 +++++++++-
 .../mapper/report/ReportQualityInspectionMapper.xml  |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
index eea4f06..a62c6d2 100644
--- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
+++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
@@ -49,14 +49,16 @@
           and IS_FLAG is null
     </select>
     <select id="checkSelectRepairInfo" resultMap="com.aucma.report.mapper.ReportQualityInspectionMapper.ReportQualityInspectionResult">
-        select OBJ_ID,
+        select rqi.OBJ_ID,
                MATERIAL_NAME,
                TEST_ITEM_CODE as STATION_CODE,
                QUALITY_DEFECT_CODE,
-               QUALITY_DEFECT_NAME
-        from REPORT_QUALITY_INSPECTION
-        where BAR_CODE = #{code}
-          and IS_FLAG = 1 and IS_FLAG=1
+               QUALITY_DEFECT_NAME,
+               br.PRODUCT_LINE_NAME
+        from REPORT_QUALITY_INSPECTION rqi
+                 left join BASE_PRODUCTLINE br on rqi.STATION_CODE=br.PRODUCT_LINE_CODE
+        where BAR_CODE =#{code}
+          and rqi.IS_FLAG = 1 and rqi.IS_FLAG=1 and TREATMENT_MEASURE=1
     </select>
 
 </mapper>
\ No newline at end of file
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 cf0a2db..979ccad 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
@@ -122,7 +122,7 @@ public class ReportQualityInspection extends BaseEntity {
     //新增字段
     private String stationCode;
     private int submitQualtyId;
-
+    private String productLineName;//pda 工位名称
     /**
      * 更新时间
      */
@@ -226,6 +226,14 @@ public class ReportQualityInspection extends BaseEntity {
         return isLowerLine;
     }
 
+    public String getProductLineName() {
+        return productLineName;
+    }
+
+    public void setProductLineName(String productLineName) {
+        this.productLineName = productLineName;
+    }
+
     public void setGroupCode(String groupCode) {
         this.groupCode = groupCode;
     }
diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
index cba1c54..6ab23af 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
@@ -25,6 +25,7 @@
         <result property="updatedTime" column="updated_time"/>
         <result property="stationCode" column="STATION_CODE"/>
         <result property="submitQualtyId" column="SUBMINT_QUALTY_ID"/>
+        <result property="productLineName" column="PRODUCT_LINE_NAME"/>
     </resultMap>
 
     <sql id="selectReportQualityInspectionVo">