扫码结果根据主板码更新nb码

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

@@ -25,4 +25,11 @@ public interface PCBADevicesMapper {
      * @return
      */
     int insertPcbaDevices(PCBADevices devices);
+
+    /**
+     * 根据主板码更新设备信息
+     * @param devices
+     * @return
+     */
+    int updatePcbaDeviceInfoByMotherBoardCode(PCBADevices devices);
 }

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

@@ -95,7 +95,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
         }
         //主板码 + NB码
         if(analysisResult.containsKey(PCBACodeRules.MAINBOARDCODE.name()) && analysisResult.containsKey("nbCode")){
-            return updateMainBoardCodeAndNb(analysisResult);
+            return updateNbCodeByMainBoardCode(analysisResult);
         }
         return 0;
     }
@@ -147,18 +147,12 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
      * @param analysisResult
      * @return
      */
-    public int updateMainBoardCodeAndNb(Map<String,Object> analysisResult){
-        Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY);
-        if(null != cache){
-            PCBADevices devices = new PCBADevices();
-            List<String> mainCodes = (List<String>) analysisResult.get(PCBACodeRules.MAINBOARDCODE.name());
-            devices.setMotherboardCode(mainCodes.get(0));
-            devices.setNbCode(analysisResult.get("nbCode").toString());
-            devices.setPcbaBatchNumber(cache.get("pcbaProductionTasksNumber").toString());
-            devices.setMaterialInfoId((Long)cache.get("materialInfoId"));
-            devices.setCreateTime(new Date());
-            return pcbaDevicesMapper.insertPcbaDevices(devices);
-        }
-        return 0;
+    public int updateNbCodeByMainBoardCode(Map<String,Object> analysisResult){
+        PCBADevices devices = new PCBADevices();
+        List<String> mainCodes = (List<String>) analysisResult.get(PCBACodeRules.MAINBOARDCODE.name());
+        devices.setMotherboardCode(mainCodes.get(0));
+        devices.setNbCode(analysisResult.get("nbCode").toString());
+        devices.setCreateTime(new Date());
+        return pcbaDevicesMapper.updatePcbaDeviceInfoByMotherBoardCode(devices);
     }
 }

src/main/resources/mapper/PCBADevicesMapper.xml

@@ -68,4 +68,18 @@
         </trim>
     </insert>
 
+    <update id="updatePcbaDeviceInfoByMotherBoardCode" parameterType="PcbaDevices">
+        update t_pcba_devices
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="pcbaProductionTasksNumber != null">f_pcba_production_tasks_number = #{pcbaProductionTasksNumber},</if>
+            <if test="pcbaBatchNumber != null">f_pcba_batch_number = #{pcbaBatchNumber},</if>
+            <if test="aoiDetectionResult != null">f_aoi_detection_result = #{aoiDetectionResult},</if>
+            <if test="sensorCode != null">f_sensor_code = #{sensorCode},</if>
+            <if test="nbCode != null">f_nb_code = #{nbCode},</if>
+            <if test="iotCardBatchNumber != null">iot_card_batch_number = #{iotCardBatchNumber},</if>
+            <if test="materialInfoId != null">f_material_info_id,</if>
+        </trim>
+        where f_motherboard_code = #{motherboardCode}
+    </update>
+
 </mapper>