From d7587a5bb63f7af5e320b38acb2c1f0616483c34 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 19 Nov 2024 18:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=8F=AD=E6=AC=A1=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/MesProductionNoSortModuleService.java | 30 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java index 7942700..3cde08f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesProdShiftRecordService; +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; @@ -32,10 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.StringJoiner; +import java.util.*; /** * @Description : 展示组件：非排序生产 @@ -63,6 +61,9 @@ public class MesProductionNoSortModuleService extends BaseModuleService { @Autowired private MesFileRepository mesFileRepository; + @Autowired + private IMesShiftService mesShiftService; + @Override public void init(StationRequestBean reqBean) { // 获取工单信息 @@ -83,6 +84,9 @@ public class MesProductionNoSortModuleService extends BaseModuleService { MesPcnException.throwBusiException("请先开班!"); } + //班次开始时间 ，班次结束时间 + getShiftTimeStationKvBean(reqBean, prodShiftDataContext); + // 发送班次班组和工单 StationResultBean resultBean = getStationResultBean(reqBean, moduleContentContext, prodShiftDataContext); this.sendMessage(reqBean, resultBean); @@ -109,6 +113,24 @@ public class MesProductionNoSortModuleService extends BaseModuleService { } + private void getShiftTimeStationKvBean(StationRequestBean reqBean, List prodShiftDataContext) { + List shiftList = mesShiftService.queryMesShift(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode()); + if (CollectionUtils.isEmpty(shiftList)){ + return; + } + Optional shiftCodeOptional = prodShiftDataContext.stream().filter(shift -> MesPcnExtConstWords.SHIFT_CODE.equals(shift.getKey())).findFirst(); + if (!shiftCodeOptional.isPresent()) { + return; + } + Optional shiftOptional = shiftList.stream().filter(t -> t.getShiftCode().equals(shiftCodeOptional.get().getValue())).findFirst(); + if (!shiftOptional.isPresent()) { + return; + } + StationKvBeanUtil.addStationKvBeanList(prodShiftDataContext, + new StationKvBean(MesPcnExtConstWords.START_TIME, "班次开始时间", shiftOptional.get().getStartTime()), + new StationKvBean(MesPcnExtConstWords.END_TIME, "班次结束时间", shiftOptional.get().getEndTime())); + } + private List getShiftRecordStationKvBeans(StationRequestBean reqBean) { // 获取班次信息 redis List prodShiftDataContext = productionCustomContextStepService.getProdShiftDataContext(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());