Merge branch 'master' of http://111.61.77.35:9999/gengdidi/zh-mes-device-data-process

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

 package com.zehong.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.zehong.constant.MesDeviceDataConstant;
 import com.zehong.constant.PCBACodeRules;
@@ -123,7 +124,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
      */
     private int addNbAndCardCode(Map<String,Object> analysisResult){
         Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY);
-        if(null != cache){
+        if(null != cache && cache.containsKey("pcbaProductionTasksNumber") && cache.containsKey("materialInfoId")){
             PCBADevices devices = new PCBADevices();
             devices.setMotherboardCode(analysisResult.get("nbCode").toString());
             List<String> codes = (List<String>) analysisResult.get(PCBACodeRules.CARDBATCHCODE.name());
@@ -143,7 +144,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
      */
     private int addMainBoardCodeAndSensorBatchCode(Map<String,Object> analysisResult){
         Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY);
-        if(null != cache){
+        if(null != cache && cache.containsKey("pcbaProductionTasksNumber") && cache.containsKey("materialInfoId")){
             PCBADevices devices = new PCBADevices();
             List<String> mainCodes = (List<String>) analysisResult.get(PCBACodeRules.MAINBOARDCODE.name());
             devices.setMotherboardCode(mainCodes.get(0));