From f16f4f630d873a7834e1f088b9cf9c03ad15ddcf Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 31 Jul 2024 11:51:10 +0800 Subject: [PATCH] =?UTF-8?q?MesReportWorkByPreDayJob=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E5=92=8C=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 fc63be5..75b94f1 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 @@ -986,13 +986,14 @@ 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("10")).collect(Collectors.toList()); + List collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("20")).collect(Collectors.toList()); MesShift mesShift= collect.get(0); item.setShiftCode(mesShift.getShiftCode()); - item.setShiftCode(mesShift.getShiftName()); + item.setShiftName(mesShift.getShiftName()); String today = TimeTool.getToday(); - item.setPlanStartTime(today+" "+mesShift.getStartTime() ); - item.setPlanEndTime(today+" "+mesShift.getEndTime() ); + String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)); + item.setPlanStartTime(dayBefore+" "+mesShift.getStartTime()); + item.setPlanEndTime(today+" "+mesShift.getEndTime()); //生成工单号 List orderList=new ArrayList<>();