From b250830f3e988056dd3d07cf3f7d393044b31367 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 6 Jun 2024 16:15:27 +0800 Subject: [PATCH] step --- .../pcn/api/busi/IMesEquipmentLogExtService.java | 8 +++--- .../busi/MesInputDefectRecordService.java | 2 +- .../serviceimpl/busi/MesNcProcessingService.java | 2 +- .../equiplog/MesEquipmentLogExtService.java | 30 +++++++++++----------- .../step/MesProductSnCheckStepService.java | 10 +------- .../context/MesEquipVariableCfgCollectContext.java | 8 +++--- .../ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 ++ 7 files changed, 28 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java index 6b6a20b..1a2c550 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java @@ -14,11 +14,11 @@ public interface IMesEquipmentLogExtService { @ApiOperation(value = "根据设备ID 查询设备ID分表所有采集数据") List getEquipmentLogList(String organizeCode, Integer equipId); - @ApiOperation(value = "根据设备ID,是否常变值状态,OPC注册ID集合 查询设备ID分表采集数据") - List getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List clientHandleList); + @ApiOperation(value = "根据设备ID,是否常变值状态,设备数据变量ID集合 查询设备ID分表采集数据") + List getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List equipVariableIdList); - @ApiOperation(value = "根据设备ID,OPC注册ID集合 修改设备ID分表采集数据的状态") - void updateEquipmentLogList(String organizeCode, Integer equipId, List clientHandleList); + @ApiOperation(value = "根据设备ID,设备数据变量ID集合 修改设备ID分表采集数据的状态") + void updateEquipmentLogList(String organizeCode, Integer equipId, List equipVariableIdList); @ApiOperation(value = "获取设备数据变量对应的采集数据") MesEquipLogDispatchContext doHandleEquipmentLogList(MesCellEquipContext cellEquipContext, List equipmentVariableList, List equipmentVariableCfgList); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index 6c7f27e..bd1b0e9 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -580,7 +580,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService move.setFactoryCode(org); move.setLgort(source); move.setUmlgo(target); - move.setMenge(Double.valueOf(model.getQty())); + move.setMenge(model.getQty()); move.setMeins(model.getPart().getUnit()); move.setZrsum(zrsum); move.setPostDate(TimeTool.getToday()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index e93c571..56a03dd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -465,7 +465,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { move.setFactoryCode(org); move.setLgort(source); move.setUmlgo(target); - move.setMenge(Double.valueOf(model.getPartInspection().getQty())); + move.setMenge(model.getPartInspection().getQty()); move.setMeins(model.getPart().getUnit()); move.setZrsum(zrsum); move.setPostDate(TimeTool.getToday()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java index b61971c..3cb2a2c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java @@ -42,23 +42,23 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService { } @Override - public List getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List clientHandleList) { - if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(clientHandleList)) return null; + public List getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List equipVariableIdList) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(equipVariableIdList)) return null; DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean); - if (!CollectionUtils.isEmpty(clientHandleList) && clientHandleList.size() == 1) DdlPreparedPack.getNumEqualPack(clientHandleList.get(0), MesPcnExtConstWords.ID, packBean); - else DdlPreparedPack.getInPackList(clientHandleList, MesPcnExtConstWords.ID, packBean); + if (!CollectionUtils.isEmpty(equipVariableIdList) && equipVariableIdList.size() == 1) DdlPreparedPack.getNumEqualPack(equipVariableIdList.get(0), MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean); + else DdlPreparedPack.getInPackList(equipVariableIdList, MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean); if (!StringUtils.isEmpty(needNewValue) && MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getValue() == needNewValue) DdlPreparedPack.getNegativeNumEqualPack(MesPcnExtConstWords.ZERO, MesPcnExtConstWords.EQUIP_VARIABLE_STATUS, packBean); return equipmentLogRepository.findByHqlWhere(packBean); } @Override - public void updateEquipmentLogList(String organizeCode, Integer equipId, List clientHandleList) { - if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(clientHandleList)) return; + public void updateEquipmentLogList(String organizeCode, Integer equipId, List equipVariableIdList) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(equipVariableIdList)) return; DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean); - if (!CollectionUtils.isEmpty(clientHandleList) && clientHandleList.size() == 1) DdlPreparedPack.getNumEqualPack(clientHandleList.get(0), MesPcnExtConstWords.ID, packBean); - else DdlPreparedPack.getInPackList(clientHandleList, MesPcnExtConstWords.ID, packBean); + if (!CollectionUtils.isEmpty(equipVariableIdList) && equipVariableIdList.size() == 1) DdlPreparedPack.getNumEqualPack(equipVariableIdList.get(0), MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean); + else DdlPreparedPack.getInPackList(equipVariableIdList, MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean); equipmentLogRepository.updateByProperties(new String[]{MesPcnExtConstWords.EQUIP_VARIABLE_STATUS}, new Object[]{MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getValue()}, packBean); } @@ -135,7 +135,7 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService { private Map getEquipmentLog(MesEquipLogDispatchContext equipLogDispatchContext, MesCellEquipContext cellEquipContext, List equipVariableCollectContextList, Integer needNewValue) { List filterList = equipVariableCollectContextList.stream().filter(o -> (null != o && o.getNeedNewValue().compareTo(needNewValue) == 0)).collect(Collectors.toList()); if (CollectionUtils.isEmpty(filterList)) return null; - List equipmentLogList = getEquipmentLogList(cellEquipContext.getOrganizeCode(), cellEquipContext.getEquipId(), needNewValue, collectClientHandleList(filterList)); + List equipmentLogList = getEquipmentLogList(cellEquipContext.getOrganizeCode(), cellEquipContext.getEquipId(), needNewValue, collectEquipVariableIdList(filterList)); Optional optional = CollectionUtils.isEmpty(equipmentLogList) ? null : equipmentLogList.stream().filter(o -> (null != o && !checkEquipQuality(o.getQuality()))).findFirst(); if (null != optional && optional.isPresent()) cellEquipContext.setQuality(optional.get().getQuality()); @@ -150,14 +150,14 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService { return null != optional && optional.isPresent() ? true : false; } - private List collectClientHandleList(List equipVariableCollectContextList) { - List clientHandleList = null; + private List collectEquipVariableIdList(List equipVariableCollectContextList) { + List equipVariableIdList = null; for (MesEquipVariableCfgCollectContext equipVariableCfgCollectContext : equipVariableCollectContextList) { - if (null == equipVariableCfgCollectContext || CollectionUtils.isEmpty(equipVariableCfgCollectContext.getClientHandleList())) continue; - if (CollectionUtils.isEmpty(clientHandleList)) clientHandleList = new ArrayList<>(); - clientHandleList.addAll(equipVariableCfgCollectContext.getClientHandleList()); + if (null == equipVariableCfgCollectContext || CollectionUtils.isEmpty(equipVariableCfgCollectContext.getEquipVariableIdList())) continue; + if (CollectionUtils.isEmpty(equipVariableIdList)) equipVariableIdList = new ArrayList<>(); + equipVariableIdList.addAll(equipVariableCfgCollectContext.getEquipVariableIdList()); } - return CollectionUtils.isEmpty(clientHandleList) ? null : clientHandleList.stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList()); + return CollectionUtils.isEmpty(equipVariableIdList) ? null : equipVariableIdList.stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList()); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java index 608a2c2..4f0ca04 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java @@ -68,16 +68,8 @@ public class MesProductSnCheckStepService extends BaseStepService { - - - - - - - - - return stepResult; + } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCfgCollectContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCfgCollectContext.java index 32ab7bd..57dd3e2 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCfgCollectContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCfgCollectContext.java @@ -42,19 +42,19 @@ public class MesEquipVariableCfgCollectContext implements Serializable { @ApiParam("数据变量集合") private List equipVariableCollectContextList; - @ApiParam("数据变量OPC注册ID集合") - private List clientHandleList; + @ApiParam("设备变量ID集合") + private List equipVariableIdList; public MesEquipVariableCfgCollectContext equipVariableCollectContextList(List equipVariableList) { if (CollectionUtils.isEmpty(equipVariableList)) return this; this.equipVariableCollectContextList = new ArrayList<>(); - this.clientHandleList = new ArrayList<>(); + this.equipVariableIdList = new ArrayList<>(); for (MesEquipmentVariable equipmentVariable : equipVariableList) { if (null == equipmentVariable) continue; MesEquipVariableCollectContext equipVariableCollectContext = new MesEquipVariableCollectContext(equipmentVariable.getId()); BeanUtils.copyProperties(equipmentVariable, equipVariableCollectContext); equipVariableCollectContextList.add(equipVariableCollectContext); - clientHandleList.add(Long.valueOf(equipmentVariable.getClientHandle().toString())); + equipVariableIdList.add(equipmentVariable.getId()); } return this; } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 563bee1..b82103e 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -54,6 +54,8 @@ public class MesPcnExtConstWords { public static final String PART_NAME = "partName"; // 设备代码 public static final String EQUIPMENT_CODE = "equipmentCode"; + // 设备数据变量ID + public static final String EQUIP_VARIABLE_ID = "equipVariableId"; // 设备ID public static final String EQUIP_ID = "equipId"; // 变量类型