自动喷胶问题修复

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepServ
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -76,7 +77,13 @@ public class MesGlueSprayedAmountStepService extends BaseStepService {
         //当前工位使用的设备
         MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
         Map<Long, String> equipVariableIds = getEquipmentVariable(organizeCode, cellEquipContext.getEquipId());
+        if (CollectionUtils.isEmpty(equipVariableIds)) {
+            stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("设备ID[%s]未匹配到设备变量参数,请检查数据!", cellEquipContext.getEquipId()));
+        }
         List<MesEquipVariableCollectContext> variableContexts = equipmentLogExtService.getEquipmentLogCollectList(organizeCode, cellEquipContext.getEquipId(), MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.FALSE.getValue(), MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PROCESS_FINISH.getValue(), new ArrayList<>(equipVariableIds.keySet()));
+        if (CollectionUtils.isEmpty(variableContexts)) {
+            stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("设备ID[%s]未获取到设备数据,请检查数据!", cellEquipContext.getEquipId()));
+        }
         Map<String, String> variableMap = new HashMap<>();
         for (MesEquipVariableCollectContext context : variableContexts) {
             String variableParamType = equipVariableIds.get(context.getEquipVariableId());
@@ -97,6 +104,7 @@ public class MesGlueSprayedAmountStepService extends BaseStepService {
             boolean flag = false;
 
             MesEquipmentVariableParamLog paramLog = new MesEquipmentVariableParamLog();
+            paramLog.setOrganizeCode(reqBean.getOrganizeCode());
             paramLog.setPartNo(prodRuleContext.getOutPartNo());
             MesPart mesPart = mesPartRDao.getByProperty(new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.PART_NO},
                     new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), prodRuleContext.getOutPartNo()});
@@ -132,6 +140,7 @@ public class MesGlueSprayedAmountStepService extends BaseStepService {
                 }
             }
             paramLog.setParamValue(JSONUtil.toJsonStr(variableMap));
+            ConvertBean.serviceModelInitialize(paramLog, reqBean.getUserInfo());
             equipVarParamLogRDao.insert(paramLog);
         }
 
@@ -144,6 +153,8 @@ public class MesGlueSprayedAmountStepService extends BaseStepService {
         if (equipId != null) {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
             DdlPreparedPack.getNumEqualPack(equipId, "equipId", packBean);
+            DdlPreparedPack.getIsNotNull("equipVariableId", packBean);
+            DdlPreparedPack.getIsNotNull("paramType", packBean);
             List<MesEquipmentVariableParam> variableParams = equipVarParamRDao.findByHqlWhere(packBean);
             for (MesEquipmentVariableParam param : variableParams) {
                 result.put(param.getEquipVariableId().longValue(), param.getParamType());