设备加工参数 查询点位数据判空

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService.java

@@ -94,6 +94,8 @@ public class MesSendEquipParamsCmdStepService extends BaseStepService {
         //设备加工参数信息集合根据数据变量ID分组
         Map<Long, MesEquipmentVariable> evMap = CollectionUtils.isEmpty(equipmentVariableList) ? null : equipmentVariableList.stream().filter(o -> null != o).collect(Collectors.toMap(MesEquipmentVariable::getId, o -> o));
 
+        if (CollectionUtils.isEmpty(evMap)) return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), "发送设备加工参数:当前加工规则未匹配到设备变量数据信息,跳过发送!");
+
         //当前工位使用的设备
         MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService2.java

@@ -94,6 +94,8 @@ public class MesSendEquipParamsCmdStepService2 extends BaseStepService {
         //设备加工参数信息集合根据数据变量ID分组
         Map<Long, MesEquipmentVariable> evMap = CollectionUtils.isEmpty(equipmentVariableList) ? null : equipmentVariableList.stream().filter(o -> null != o).collect(Collectors.toMap(MesEquipmentVariable::getId, o -> o));
 
+        if (CollectionUtils.isEmpty(evMap)) return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), "发送设备加工参数:当前加工规则未匹配到设备变量数据信息,跳过发送!");
+
         //当前工位使用的设备
         MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java

@@ -317,8 +317,6 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
         //生产过程上下文对象赋值设备数据变量信息
         if (null != equipmentVariableDbList) productionProcessContext.equipVariableJson(equipmentVariableDbList);
 
-
-
         return productionProcessContext;
 
     }