From f90412f8468078aa859d83a121ec01562f2b7f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 30 May 2024 21:22:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesAssemblyExtService.java | 2 +- .../step/MesMouldRecordGenerateStepService.java | 16 +++++++++++----- .../step/MesProductSnGenerateStepService.java | 11 ++++++++++- .../step/MesProductSnSaveStepService.java | 6 +++++- .../MesProductionReocrdGenerateStepService.java | 22 +++++++++++++++------- .../MesVariableWhenFinishedReadStepService.java | 11 +++++++++-- 6 files changed, 51 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java index a7df311..8d9abb1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java @@ -93,7 +93,7 @@ public class MesAssemblyExtService implements IMesAssemblyExtService { } private List filterProductionAssemblyList(List productionAssemblyList) { - return CollectionUtils.isEmpty(productionAssemblyList) ? null : productionAssemblyList.stream().filter(o -> (null != o && MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_PART_STATUS_20.getValue() != o.getAssemblyStatus())).collect(Collectors.toList()); + return CollectionUtils.isEmpty(productionAssemblyList) ? null : productionAssemblyList.stream().filter(o -> (null != o && MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue() != o.getAssemblyStatus())).collect(Collectors.toList()); } private Map groupProductionAssembly(List productionAssemblyList) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java index 1612fab..81a07cb 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldRecordGenerateStepService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesMouldMultiCavityService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEquipVariableCfgRuleMatchDispatchService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEquipmentLogExtService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCfgCollectContext; @@ -48,6 +49,8 @@ public class MesMouldRecordGenerateStepService extends BaseStepService { @Autowired private IMesMouldMappingCfgRepository mesMouldMappingCfgRepository; + @Autowired + private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService; @Override public StepResult execute(StationRequestBean reqBean) { @@ -56,7 +59,7 @@ public class MesMouldRecordGenerateStepService extends BaseStepService { MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue()); - List mesProduceSns = productionProcessContext.getProduceSnDataList(); + List mesProduceSns = mesProductionDispatchContextStepService.getOutProduceSnDataContext(reqBean); List mesProdMouldRecords = new ArrayList<>(); for (MesProduceSn mesProduceSn : mesProduceSns) { @@ -65,10 +68,13 @@ public class MesMouldRecordGenerateStepService extends BaseStepService { String equipmentCode = mesCellEquipContext.getEquipmentCode(); String mouldNo = ""; - if (productionProcessContext.getFirstMouldNo() != null) { - mouldNo = productionProcessContext.getFirstMouldNo().getEquipVariableValue(); - } else if (productionProcessContext.getFirstMouldNo() == null && productionProcessContext.getMouldNo() != null) { - mouldNo = productionProcessContext.getMouldNo().getEquipVariableValue(); + MesEquipVariableCollectContext mesFirstMouldNoCollectContext = mesProductionDispatchContextStepService.getFirstMouldNoContext(reqBean); + MesEquipVariableCollectContext mesMouldNoCollectContext = mesProductionDispatchContextStepService.getMouldNoContext(reqBean); + + if (mesFirstMouldNoCollectContext != null) { + mouldNo = mesFirstMouldNoCollectContext.getEquipVariableValue(); + } else if (mesFirstMouldNoCollectContext == null && mesMouldNoCollectContext != null) { + mouldNo = mesMouldNoCollectContext.getEquipVariableValue(); } DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(equipmentCode, "equipmentCode", packBean); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java index 939d142..4935a6a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesSnProductionProcessContext; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; @@ -52,6 +54,9 @@ public class MesProductSnGenerateStepService extends BaseStepService { public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT"; + @Autowired + private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService; + @Override public StepResult execute(StationRequestBean reqBean) { @@ -62,8 +67,12 @@ public class MesProductSnGenerateStepService extends BaseStepService { MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue()); MesWorkCell mesWorkCell = productionProcessContext.getWorkCell(); - List mesModelMultiCavities = productionProcessContext.getMouldCavityList(); + + MesEquipVariableCollectContext mesFirstMouldNoCollectContext = mesProductionDispatchContextStepService.getFirstMouldNoContext(reqBean); + + List mesModelMultiCavities = mesProductionDispatchContextStepService.getMouldMultiCavityContext(reqBean); List mesProduceSns = new ArrayList<>(); + // todo 要判空 for (MesMouldMultiCavity modelMultiCavity : mesModelMultiCavities) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(modelMultiCavity.getPartNo(), "partNo", packBean); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnSaveStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnSaveStepService.java index cb568a3..9550dfa 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnSaveStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnSaveStepService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesSnProductionProcessContext; @@ -44,11 +45,14 @@ public class MesProductSnSaveStepService extends BaseStepService { public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT"; + @Autowired + private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService; + @Override public StepResult execute(StationRequestBean reqBean) { MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue()); - List mesProduceSns = productionProcessContext.getProduceSnDataList(); + List mesProduceSns = mesProductionDispatchContextStepService.getOutProduceSnDataContext(reqBean); mesProduceSns.forEach(mesProduceSn -> { mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java index eecb3a1..8705df5 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; @@ -45,6 +47,9 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService { @Autowired private MesProductionRecordRepository mesProductionRecordRepository; + @Autowired + private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService; + public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT"; @@ -52,12 +57,12 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService { public StepResult execute(StationRequestBean reqBean) { MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue()); - List mesProduceSns = productionProcessContext.getProduceSnDataList(); + List mesProduceSns = mesProductionDispatchContextStepService.getOutProduceSnDataContext(reqBean); List mesProductionRecords = new ArrayList<>(); mesProduceSns.forEach(mesProduceSn -> { - MesProductionRecord mesProductionRecord = getMesProductionRecord(productionProcessContext, mesProduceSn); + MesProductionRecord mesProductionRecord = getMesProductionRecord(productionProcessContext, mesProduceSn, reqBean); mesProductionRecords.add(mesProductionRecord); }); @@ -66,7 +71,7 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService { return StepResult.getSuccessComplete(); } - private MesProductionRecord getMesProductionRecord(MesProductionProcessContext productionProcessContext, MesProduceSn mesProduceSn) { + private MesProductionRecord getMesProductionRecord(MesProductionProcessContext productionProcessContext, MesProduceSn mesProduceSn, StationRequestBean reqBean) { MesProductionRecord mesProductionRecord = new MesProductionRecord(); mesProductionRecord.setSerialNumber(mesProduceSn.getSerialNumber()); @@ -80,10 +85,13 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService { mesProductionRecord.setEquipmentName(mesProduceSn.getEquipmentName()); String mouldNo = ""; - if (productionProcessContext.getFirstMouldNo() != null) { - mouldNo = productionProcessContext.getFirstMouldNo().getEquipVariableValue(); - }else if (productionProcessContext.getFirstMouldNo() == null && productionProcessContext.getMouldNo() != null){ - mouldNo = productionProcessContext.getMouldNo().getEquipVariableValue(); + MesEquipVariableCollectContext mesFirstMouldNoCollectContext = mesProductionDispatchContextStepService.getFirstMouldNoContext(reqBean); + MesEquipVariableCollectContext mesMouldNoCollectContext = mesProductionDispatchContextStepService.getMouldNoContext(reqBean); + + if (mesFirstMouldNoCollectContext != null) { + mouldNo = mesFirstMouldNoCollectContext.getEquipVariableValue(); + } else if (mesFirstMouldNoCollectContext == null && mesMouldNoCollectContext != null) { + mouldNo = mesMouldNoCollectContext.getEquipVariableValue(); } mesProductionRecord.setMouldNo(mouldNo); // todo diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesVariableWhenFinishedReadStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesVariableWhenFinishedReadStepService.java index 6c66b9b..2e26c5e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesVariableWhenFinishedReadStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesVariableWhenFinishedReadStepService.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base.MesEquipmentExtService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.equiplog.MesEquipmentLogExtService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesSnProductionProcessContext; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; @@ -59,7 +61,8 @@ public class MesVariableWhenFinishedReadStepService extends BaseStepService { private MesEquipmentLogDetailRepository mesEquipmentLogDetailRepository; - + @Autowired + private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService; public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT"; @@ -88,7 +91,11 @@ public class MesVariableWhenFinishedReadStepService extends BaseStepService { curCellEquip.setQuality(MesExtEnumUtil.EQUIP_LOG_QUALITY.defaultQuality()); Optional optional = CollectionUtils.isEmpty(equipmentLogList) ? null : equipmentLogList.stream().filter(o -> (null != o && !mesEquipmentLogExtService.checkEquipQuality(o.getQuality()))).findFirst(); if (null != optional && optional.isPresent()) curCellEquip.setQuality(optional.get().getQuality()); - productionProcessContextStepService.sendEquipQualityMessage(reqBean, curCellEquip); + + MesEquipVariableCollectContext mesFirstMouldNoCollectContext = mesProductionDispatchContextStepService.getFirstMouldNoContext(reqBean); + + mesProductionDispatchContextStepService.sendEquipQualityMessage(reqBean, curCellEquip); + MesSnProductionProcessContext mesSnProductionProcessContext = (MesSnProductionProcessContext) productionProcessContext; for (MesEquipmentLog mesEquipmentLog : equipmentLogList) {