47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改（扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”-优化）

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<MesEquipmentVariableCfg> 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());
         }