change - 电检数据二线

aucma-report/src/main/java/com/aucma/report/mapper/ReportQualityInspectionMapper.java

@@ -69,9 +69,16 @@ public interface ReportQualityInspectionMapper
     public HashMap<String, Integer> pdaQueryQuantityNumber(String stationCode);
 
     /**
-     * 箱体码查电检数据
+     * 箱体码查电检数据 二线
      * @param barcode
      * @return
      */
     ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode);
+
+    /**
+     * 箱体码查电检数据 一线
+     * @param barcode
+     * @return
+     */
+    ReportQualityInspection selectOneReportQualityInspectionByBarcode(String barcode);
 }

aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java

@@ -3,7 +3,6 @@ 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;
 
 /**
@@ -72,9 +71,10 @@ public interface IReportQualityInspectionService {
     /**
      * 箱体码查电检数据
      * @param barcode
+     * @param productLineCode
      * @return
      */
-    public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode);
+    public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode, String productLineCode);
 
     /**
      * 检验前一工位是否已完成质检

aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java

@@ -190,7 +190,7 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI
                     detailList.add(testData);
                 }
             }
-            this.insertQualityInspectionByElectrical(inspection, detailList);
+            this.insertQualityInspectionByElectrical(inspection, detailList, productLineCode);
         } catch (Exception e) {
             logger.error("解析电检数据接口数据:" + paramMap.toString() + ";异常：" + e);
         }
@@ -201,16 +201,16 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI
 
     /**
      * 电检结果存入质检数据
-     *
      *  @param inspectionInfo
      * @param detailList
+     * @param productLineCode
      */
-    private void insertQualityInspectionByElectrical(RecordElectricalInspection inspectionInfo, ArrayList<DetailElectricalinspection> detailList) {
+    private void insertQualityInspectionByElectrical(RecordElectricalInspection inspectionInfo, ArrayList<DetailElectricalinspection> detailList, String productLineCode) {
         if (StringUtils.isNull(inspectionInfo.getBarcode()) || StringUtils.isNull(detailList)) {
             return;
         }
         String barcode = inspectionInfo.getBarcode();
-        ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(barcode);
+        ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(barcode, productLineCode);
         if (StringUtils.isNull(qualityInspection)) {
             return;
         }

aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java

@@ -1,13 +1,11 @@
 package com.aucma.report.service.impl;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
 import com.aucma.base.domain.BaseProductLine;
 import com.aucma.base.service.IBaseProductLineService;
 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;
@@ -114,11 +112,16 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect
     /**
      * 箱体码查电检数据
      * @param barcode
+     * @param productLineCode
      * @return
      */
     @Override
-    public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode) {
+    public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode, String productLineCode) {
+        if (productLineCode.equals("CX_02")){
             return reportQualityInspectionMapper.selectReportQualityInspectionByBarcode(barcode);
+        } else {
+            return reportQualityInspectionMapper.selectOneReportQualityInspectionByBarcode(barcode);
+        }
     }
 
     /**

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

@@ -225,4 +225,22 @@
         WHERE PB.MATERIAL_BARCODE = #{barcode}
     </select>
 
+    <select id="selectOneReportQualityInspectionByBarcode" parameterType="String"
+            resultMap="ReportQualityInspectionResult">
+        SELECT PB.MATERIAL_BARCODE BAR_CODE,
+               PB.ORDER_CODE,
+               ML.MATERIAL_NAME,
+               PS.PROCESS_CODE     PROCESS_CODE,
+               'ZLJY-11'           GROUP_CODE,
+               'djcj'              INSPECTOR_CODE,
+               '2105'              STATION_CODE,
+               SYSDATE             INSPECTOR_TIME,
+               0                   REWORK_NUMBER,
+               1                   IS_FLAG
+        FROM C##AUCMA_SCADA.PRINT_BARCODE PB
+                 JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE
+                 JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2105%'
+        WHERE PB.MATERIAL_BARCODE = #{barcode}
+    </select>
+
 </mapper>