From 2d1daf57bc2f608cd8a1b60ea8a10b50efea9810 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 29 Jul 2024 10:16:03 +0800 Subject: [PATCH] =?UTF-8?q?MesReportWorkByPreDayJob=20=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=98=E4=B8=BA=E6=97=B6-=E5=88=86-?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java | 4 ++-- .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java index 71b20bb..4835e52 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java @@ -82,14 +82,14 @@ public class MesReportWorkByPreDayJob extends BaseMesScheduleJob { // if (CollectionUtils.isEmpty(unReportMesProduceSn)) { // continue; // } - LOGGER.info("产线:{}报工mesProductionRecordList:{}", workCenterCode, mesProductionRecordList); + LOGGER.info("产线:{}报工mesProductionRecordList:{}", workCenterCode, mesProductionRecordList.size()); //3.插入生产工单表 List mesWorkOrders = workOrderService.insertMesWorkOrder(mesProductionRecordList, mesShiftList, organizeCode, userName); if (CollectionUtils.isEmpty(mesWorkOrders)) { continue; } - LOGGER.info("产线:{}报工mesWorkOrders:{}", workCenterCode, mesWorkOrders); + LOGGER.info("产线:{}报工mesWorkOrders:{}", workCenterCode, mesWorkOrders.size()); //4.根据产线+物料产生的工单报工 try { for (MesWorkOrder mesWorkOrder : mesWorkOrders) { 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 c93e76c..f6c9723 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 @@ -847,7 +847,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { String startTime=" 08:00:00"; if(!CollectionUtils.isEmpty(collect)){ MesShift mesShift= collect.get(0); - startTime= StringUtil.isEmpty(mesShift.getStartTime())?" 08:00:00":" "+mesShift.getStartTime()+":00"; + startTime= StringUtil.isEmpty(mesShift.getStartTime())?" 08:00:00":" "+mesShift.getStartTime(); } //获取前一天的早班到当天早班的区间的所有加工记录，统计个数 DdlPreparedPack.timeBuilder( @@ -959,8 +959,8 @@ public class MesWorkOrderService implements IMesWorkOrderService { item.setShiftCode(mesShift.getShiftCode()); item.setShiftCode(mesShift.getShiftName()); String today = TimeTool.getToday(); - item.setPlanStartTime(today+" "+mesShift.getStartTime()+":00"); - item.setPlanEndTime(today+" "+mesShift.getEndTime()+":00"); + item.setPlanStartTime(today+" "+mesShift.getStartTime() ); + item.setPlanEndTime(today+" "+mesShift.getEndTime() ); //生成工单号 List orderList=new ArrayList<>();