1 接收 aoi 检测结果数据调整。

src/main/java/com/zehong/dao/PCBADevicesMapper.java

@@ -14,6 +14,9 @@ public interface PCBADevicesMapper {
      */
     List<PCBADevices> selectPcbaDeviceInfoByBoardCode(String motherboardCode);
 
+    List<PCBADevices> selectPcbaDeviceInfoByBoardCodeAndPlateType(@Param("motherboardCode") String motherboardCode,
+                                                                     @Param("plateType") String plateType);
+
     List<PCBADevices> selectPcbaDeviceInfoByNbBoradCodeAndTasksNumber(@Param("nbMotherBoardCode") String nbMotherBoardCode,
                                                                       @Param("pcbaProductionTasksNumber") String pcbaProductionTasksNumber);
 

src/main/java/com/zehong/entity/PCBADevices.java

@@ -32,6 +32,7 @@ public class PCBADevices {
 
     private Date createTime;
 
+    private String plateType;
     public Long getPcbaDevicesId() {
         return pcbaDevicesId;
     }
@@ -111,4 +112,12 @@ public class PCBADevices {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getPlateType() {
+        return plateType;
+    }
+
+    public void setPlateType(String plateType) {
+        this.plateType = plateType;
+    }
 }

src/main/java/com/zehong/service/impl/AoiTestResultServiceImpl.java

@@ -45,7 +45,8 @@ public class AoiTestResultServiceImpl implements AoiTestResultService{
             for(Object obj : boardData){
                 JSONObject boardInfo = (JSONObject)obj;
                 String motherboardCode = boardInfo.getString("board_sn");
-                List<PCBADevices> devices = pcbaDevicesMapper.selectPcbaDeviceInfoByBoardCode(motherboardCode);
+                // 2 主板，只能过 主板的
+                List<PCBADevices> devices = pcbaDevicesMapper.selectPcbaDeviceInfoByBoardCodeAndPlateType(motherboardCode,"2");
                 if(!CollectionUtils.isEmpty(devices)){
                     for(PCBADevices device : devices){
                         String finalResult = boardInfo.getString("board_final_result");

src/main/resources/mapper/PCBADevicesMapper.xml

@@ -12,6 +12,7 @@
         <result property="sensorCode"    column="f_sensor_code"    />
         <result property="nbCode"    column="f_nb_code"    />
         <result property="materialInfoId"    column="f_material_info_id"    />
+        <result property="plateType"    column="f_plate_type"    />
     </resultMap>
 
 
@@ -26,6 +27,18 @@
             t_pcba_devices
          WHERE f_motherboard_code = #{ motherboardCode }
     </select>
+    <select id="selectPcbaDeviceInfoByBoardCodeAndPlateType" resultMap="PcbaDevicesResult">
+        SELECT
+          f_pcba_devices_id,
+          f_motherboard_code,
+          f_pcba_production_tasks_number,
+          f_pcba_batch_number,
+          f_aoi_detection_result
+        FROM
+            t_pcba_devices
+         WHERE f_motherboard_code = #{ motherboardCode }
+           AND f_plate_type = #{ plateType }
+    </select>
     <select id="selectPcbaDeviceInfoByNbBoradCodeAndTasksNumber" resultMap="PcbaDevicesResult">
         SELECT
             devices.iot_card_batch_number