jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

step

Browse Source
tags/yfai-pcn-ext-v1.0
王杰 12 months ago
parent 77e59a5627
commit b250830f3e
7 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java
Unescape Escape View File

@ -14,11 +14,11 @@ public interface IMesEquipmentLogExtService {
@ApiOperation(value = "根据设备ID 查询设备ID分表所有采集数据") @ApiOperation(value = "根据设备ID 查询设备ID分表所有采集数据")
List<MesEquipmentLog> getEquipmentLogList(String organizeCode, Integer equipId); List<MesEquipmentLog> getEquipmentLogList(String organizeCode, Integer equipId);
@ApiOperation(value = "根据设备ID,是否常变值状态,OPC注册ID集合 查询设备ID分表采集数据") @ApiOperation(value = "根据设备ID,是否常变值状态,设备数据变量ID集合 查询设备ID分表采集数据")
List<MesEquipmentLog> getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List<Long> clientHandleList); List<MesEquipmentLog> getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List<Long> equipVariableIdList);
@ApiOperation(value = "根据设备ID,OPC注册ID集合 修改设备ID分表采集数据的状态") @ApiOperation(value = "根据设备ID,设备数据变量ID集合 修改设备ID分表采集数据的状态")
void updateEquipmentLogList(String organizeCode, Integer equipId, List<Long> clientHandleList); void updateEquipmentLogList(String organizeCode, Integer equipId, List<Long> equipVariableIdList);
@ApiOperation(value = "获取设备数据变量对应的采集数据") @ApiOperation(value = "获取设备数据变量对应的采集数据")
MesEquipLogDispatchContext doHandleEquipmentLogList(MesCellEquipContext cellEquipContext, List<MesEquipmentVariable> equipmentVariableList, List<MesEquipmentVariableCfg> equipmentVariableCfgList); MesEquipLogDispatchContext doHandleEquipmentLogList(MesCellEquipContext cellEquipContext, List<MesEquipmentVariable> equipmentVariableList, List<MesEquipmentVariableCfg> equipmentVariableCfgList);

2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
Unescape Escape View File

@ -580,7 +580,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
move.setFactoryCode(org); move.setFactoryCode(org);
move.setLgort(source); move.setLgort(source);
move.setUmlgo(target); move.setUmlgo(target);
move.setMenge(Double.valueOf(model.getQty())); move.setMenge(model.getQty());
move.setMeins(model.getPart().getUnit()); move.setMeins(model.getPart().getUnit());
move.setZrsum(zrsum); move.setZrsum(zrsum);
move.setPostDate(TimeTool.getToday()); move.setPostDate(TimeTool.getToday());

2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
Unescape Escape View File

@ -465,7 +465,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
move.setFactoryCode(org); move.setFactoryCode(org);
move.setLgort(source); move.setLgort(source);
move.setUmlgo(target); move.setUmlgo(target);
move.setMenge(Double.valueOf(model.getPartInspection().getQty())); move.setMenge(model.getPartInspection().getQty());
move.setMeins(model.getPart().getUnit()); move.setMeins(model.getPart().getUnit());
move.setZrsum(zrsum); move.setZrsum(zrsum);
move.setPostDate(TimeTool.getToday()); move.setPostDate(TimeTool.getToday());

30
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesEquipmentLogExtService.java
Unescape Escape View File

@ -42,23 +42,23 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService {
} }
@Override @Override
public List<MesEquipmentLog> getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List<Long> clientHandleList) { public List<MesEquipmentLog> getEquipmentLogList(String organizeCode, Integer equipId, Integer needNewValue, List<Long> equipVariableIdList) {
if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(clientHandleList)) return null; if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(equipVariableIdList)) return null;
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean); DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean);
if (!CollectionUtils.isEmpty(clientHandleList) && clientHandleList.size() == 1) DdlPreparedPack.getNumEqualPack(clientHandleList.get(0), MesPcnExtConstWords.ID, packBean); if (!CollectionUtils.isEmpty(equipVariableIdList) && equipVariableIdList.size() == 1) DdlPreparedPack.getNumEqualPack(equipVariableIdList.get(0), MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean);
else DdlPreparedPack.getInPackList(clientHandleList, MesPcnExtConstWords.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); 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); return equipmentLogRepository.findByHqlWhere(packBean);
} }
@Override @Override
public void updateEquipmentLogList(String organizeCode, Integer equipId, List<Long> clientHandleList) { public void updateEquipmentLogList(String organizeCode, Integer equipId, List<Long> equipVariableIdList) {
if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(clientHandleList)) return; if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(equipId) || CollectionUtils.isEmpty(equipVariableIdList)) return;
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean); DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean);
if (!CollectionUtils.isEmpty(clientHandleList) && clientHandleList.size() == 1) DdlPreparedPack.getNumEqualPack(clientHandleList.get(0), MesPcnExtConstWords.ID, packBean); if (!CollectionUtils.isEmpty(equipVariableIdList) && equipVariableIdList.size() == 1) DdlPreparedPack.getNumEqualPack(equipVariableIdList.get(0), MesPcnExtConstWords.EQUIP_VARIABLE_ID, packBean);
else DdlPreparedPack.getInPackList(clientHandleList, MesPcnExtConstWords.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); 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<Long, MesEquipmentLog> getEquipmentLog(MesEquipLogDispatchContext equipLogDispatchContext, MesCellEquipContext cellEquipContext, List<MesEquipVariableCfgCollectContext> equipVariableCollectContextList, Integer needNewValue) { private Map<Long, MesEquipmentLog> getEquipmentLog(MesEquipLogDispatchContext equipLogDispatchContext, MesCellEquipContext cellEquipContext, List<MesEquipVariableCfgCollectContext> equipVariableCollectContextList, Integer needNewValue) {
List<MesEquipVariableCfgCollectContext> filterList = equipVariableCollectContextList.stream().filter(o -> (null != o && o.getNeedNewValue().compareTo(needNewValue) == 0)).collect(Collectors.toList()); List<MesEquipVariableCfgCollectContext> filterList = equipVariableCollectContextList.stream().filter(o -> (null != o && o.getNeedNewValue().compareTo(needNewValue) == 0)).collect(Collectors.toList());
if (CollectionUtils.isEmpty(filterList)) return null; if (CollectionUtils.isEmpty(filterList)) return null;
List<MesEquipmentLog> equipmentLogList = getEquipmentLogList(cellEquipContext.getOrganizeCode(), cellEquipContext.getEquipId(), needNewValue, collectClientHandleList(filterList)); List<MesEquipmentLog> equipmentLogList = getEquipmentLogList(cellEquipContext.getOrganizeCode(), cellEquipContext.getEquipId(), needNewValue, collectEquipVariableIdList(filterList));
Optional<MesEquipmentLog> optional = CollectionUtils.isEmpty(equipmentLogList) ? null : equipmentLogList.stream().filter(o -> (null != o && !checkEquipQuality(o.getQuality()))).findFirst(); Optional<MesEquipmentLog> 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()); 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; return null != optional && optional.isPresent() ? true : false;
} }
private List<Long> collectClientHandleList(List<MesEquipVariableCfgCollectContext> equipVariableCollectContextList) { private List<Long> collectEquipVariableIdList(List<MesEquipVariableCfgCollectContext> equipVariableCollectContextList) {
List<Long> clientHandleList = null; List<Long> equipVariableIdList = null;
for (MesEquipVariableCfgCollectContext equipVariableCfgCollectContext : equipVariableCollectContextList) { for (MesEquipVariableCfgCollectContext equipVariableCfgCollectContext : equipVariableCollectContextList) {
if (null == equipVariableCfgCollectContext || CollectionUtils.isEmpty(equipVariableCfgCollectContext.getClientHandleList())) continue; if (null == equipVariableCfgCollectContext || CollectionUtils.isEmpty(equipVariableCfgCollectContext.getEquipVariableIdList())) continue;
if (CollectionUtils.isEmpty(clientHandleList)) clientHandleList = new ArrayList<>(); if (CollectionUtils.isEmpty(equipVariableIdList)) equipVariableIdList = new ArrayList<>();
clientHandleList.addAll(equipVariableCfgCollectContext.getClientHandleList()); 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());
} }
} }

10
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java
Unescape Escape View File

@ -68,16 +68,8 @@ public class MesProductSnCheckStepService extends BaseStepService {
return stepResult; return stepResult;
} }

8
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCfgCollectContext.java
Unescape Escape View File

@ -42,19 +42,19 @@ public class MesEquipVariableCfgCollectContext implements Serializable {
@ApiParam("数据变量集合") @ApiParam("数据变量集合")
private List<MesEquipVariableCollectContext> equipVariableCollectContextList; private List<MesEquipVariableCollectContext> equipVariableCollectContextList;
@ApiParam("数据变量OPC注册ID集合") @ApiParam("设备变量ID集合")
private List<Long> clientHandleList; private List<Long> equipVariableIdList;
public MesEquipVariableCfgCollectContext equipVariableCollectContextList(List<MesEquipmentVariable> equipVariableList) { public MesEquipVariableCfgCollectContext equipVariableCollectContextList(List<MesEquipmentVariable> equipVariableList) {
if (CollectionUtils.isEmpty(equipVariableList)) return this; if (CollectionUtils.isEmpty(equipVariableList)) return this;
this.equipVariableCollectContextList = new ArrayList<>(); this.equipVariableCollectContextList = new ArrayList<>();
this.clientHandleList = new ArrayList<>(); this.equipVariableIdList = new ArrayList<>();
for (MesEquipmentVariable equipmentVariable : equipVariableList) { for (MesEquipmentVariable equipmentVariable : equipVariableList) {
if (null == equipmentVariable) continue; if (null == equipmentVariable) continue;
MesEquipVariableCollectContext equipVariableCollectContext = new MesEquipVariableCollectContext(equipmentVariable.getId()); MesEquipVariableCollectContext equipVariableCollectContext = new MesEquipVariableCollectContext(equipmentVariable.getId());
BeanUtils.copyProperties(equipmentVariable, equipVariableCollectContext); BeanUtils.copyProperties(equipmentVariable, equipVariableCollectContext);
equipVariableCollectContextList.add(equipVariableCollectContext); equipVariableCollectContextList.add(equipVariableCollectContext);
clientHandleList.add(Long.valueOf(equipmentVariable.getClientHandle().toString())); equipVariableIdList.add(equipmentVariable.getId());
} }
return this; return this;
} }

2
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
Unescape Escape View File

@ -54,6 +54,8 @@ public class MesPcnExtConstWords {
public static final String PART_NAME = "partName"; public static final String PART_NAME = "partName";
// 设备代码 // 设备代码
public static final String EQUIPMENT_CODE = "equipmentCode"; public static final String EQUIPMENT_CODE = "equipmentCode";
// 设备数据变量ID
public static final String EQUIP_VARIABLE_ID = "equipVariableId";
// 设备ID // 设备ID
public static final String EQUIP_ID = "equipId"; public static final String EQUIP_ID = "equipId";
// 变量类型 // 变量类型

Write Preview
Loading…
Cancel
Save