From e64f5a89260e30fb010f3333d6f038e237f95f50 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 31 Jul 2024 11:05:55 +0800 Subject: [PATCH] =?UTF-8?q?MesReportWorkByPreDayJob=20=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E4=BB=8E1/2=20=E6=94=B9=E4=B8=BA10/20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java index 63125c3..fc63be5 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java @@ -875,7 +875,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { DdlPreparedPack.getInPackList( Arrays.asList(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue()) ,"reportStatus",ddlPackBean); - List collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("1")).collect(Collectors.toList()); + List collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("10")).collect(Collectors.toList()); String startTime=" 08:00:00"; if(!CollectionUtils.isEmpty(collect)){ MesShift mesShift= collect.get(0); @@ -986,7 +986,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { item.setPartNo(partNo); item.setWorkOrderType(MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()); item.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.N.getValue()); - List collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("1")).collect(Collectors.toList()); + List collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("10")).collect(Collectors.toList()); MesShift mesShift= collect.get(0); item.setShiftCode(mesShift.getShiftCode()); item.setShiftCode(mesShift.getShiftName());