From a57f3e7cb5c8890313f3f3a508c79f5f60a93aec Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Thu, 26 Jun 2025 10:37:23 +0800 Subject: [PATCH] =?UTF-8?q?47191=20DM202504290012=20=E9=BE=99=E5=85=B4?= =?UTF-8?q?=E5=B7=A5=E5=8E=82CKPT=E7=BA=BF=E6=8E=92=E5=BA=8F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8B=86=E5=8D=95=E9=9C=80=E6=B1=82-EDI=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=88=E6=89=AB=E6=8F=8F=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E6=96=B0=E5=A2=9E=E2=80=9C=E6=A0=A1=E9=AA=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=9C=AB=E5=8D=95=E2=80=9D=E3=80=81=E2=80=9C=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=94=A8=E6=88=B7=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E8=87=B3PLC=E7=82=B9=E4=BD=8D=E2=80=9D-=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesSendUserDefinedCmdStepService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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()); }