update - 质检查询返修数据工位

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
+               QUALITY_DEFECT_NAME,
-        from REPORT_QUALITY_INSPECTION
+               br.PRODUCT_LINE_NAME
-        where BAR_CODE = #{code}
+        from REPORT_QUALITY_INSPECTION rqi
-          and IS_FLAG = 1 and IS_FLAG=1
+                 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>

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;
     }

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">