Commit ee45fbd1 authored by wanghao's avatar wanghao

1 pcba 扫码获取任务单号 非空判断

parent d11f06ba
package com.zehong.service.impl; package com.zehong.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.zehong.constant.MesDeviceDataConstant; import com.zehong.constant.MesDeviceDataConstant;
import com.zehong.constant.PCBACodeRules; import com.zehong.constant.PCBACodeRules;
...@@ -123,7 +124,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{ ...@@ -123,7 +124,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
*/ */
private int addNbAndCardCode(Map<String,Object> analysisResult){ private int addNbAndCardCode(Map<String,Object> analysisResult){
Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY); 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(); PCBADevices devices = new PCBADevices();
devices.setMotherboardCode(analysisResult.get("nbCode").toString()); devices.setMotherboardCode(analysisResult.get("nbCode").toString());
List<String> codes = (List<String>) analysisResult.get(PCBACodeRules.CARDBATCHCODE.name()); List<String> codes = (List<String>) analysisResult.get(PCBACodeRules.CARDBATCHCODE.name());
...@@ -143,7 +144,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{ ...@@ -143,7 +144,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
*/ */
private int addMainBoardCodeAndSensorBatchCode(Map<String,Object> analysisResult){ private int addMainBoardCodeAndSensorBatchCode(Map<String,Object> analysisResult){
Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY); 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(); PCBADevices devices = new PCBADevices();
List<String> mainCodes = (List<String>) analysisResult.get(PCBACodeRules.MAINBOARDCODE.name()); List<String> mainCodes = (List<String>) analysisResult.get(PCBACodeRules.MAINBOARDCODE.name());
devices.setMotherboardCode(mainCodes.get(0)); devices.setMotherboardCode(mainCodes.get(0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment