diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendUserDefinedCmdStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendUserDefinedCmdStepService.java index b9e2b97..60c3734 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendUserDefinedCmdStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendUserDefinedCmdStepService.java @@ -67,15 +67,21 @@ public class MesSendUserDefinedCmdStepService extends BaseStepService { List equipmentVariableCfgList = productionProcessContext.getEquipVariableCfgListByVct(); //根据变量类别[用户自定义指令]搜集设备数据变量接口逻辑信息 + String userDefinedEquipVariableCfgCategory = ( + null != stepParamMap && + stepParamMap.isPresent() && + stepParamMap.get().containsKey(MesPcnExtConstWords.USER_DEFINED_EQUIP_VARIABLE_CFG_CATEGORY)) ? + stepParamMap.get().get(MesPcnExtConstWords.USER_DEFINED_EQUIP_VARIABLE_CFG_CATEGORY).getParamValue() : + null; equipmentVariableCfgList = productionProcessContextStepService.collectEquipmentVariableCfgList( - equipmentVariableCfgList, MesPcnExtConstWords.USER_DEFINED_EQUIP_VARIABLE_CFG_CATEGORY); + equipmentVariableCfgList, userDefinedEquipVariableCfgCategory); //当前工位使用的设备 MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip(); //配置错误 抛出异常 if (!productionProcessContextStepService.checkNecessaryEquipmentVariableCfgAndValue(productionProcessContext, - cellEquipContext, equipmentVariableCfgList, MesPcnExtConstWords.USER_DEFINED_EQUIP_VARIABLE_CFG_CATEGORY).getSuccess()) { + cellEquipContext, equipmentVariableCfgList, userDefinedEquipVariableCfgCategory).getSuccess()) { stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage()); }