From fe8083d9cefdebff062cd3916e71c6f0ad228b52 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 11 Dec 2024 10:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=8E=92=E5=BA=8F=E6=B1=87=E6=8A=A5jo?= =?UTF-8?q?b=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=88=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=95=B0=E9=87=8F=E6=88=90=E5=80=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/schedulejob/MesProductReportJob.java | 2 ++ .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 8 +++----- 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/MesProductReportJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesProductReportJob.java index dbeb440..d503ddf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesProductReportJob.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesProductReportJob.java @@ -42,6 +42,7 @@ public class MesProductReportJob extends BaseMesScheduleJob { for (WmsJobParamModel wmsJobParamModel : wmsJobParamModelList) { //排序汇报 try { + log.info("工厂{}排序报工job --- START --- ", wmsJobParamModel.getOrganizeCode()); long startTime = System.currentTimeMillis(); workOrderService.doMesWorkOrderSortReport(wmsJobParamModel.getOrganizeCode(), wmsJobParamModel.getPageSize(), MesPcnExtConstWords.JOB); long endTime = System.currentTimeMillis(); @@ -51,6 +52,7 @@ public class MesProductReportJob extends BaseMesScheduleJob { } //非排序汇报 try { + log.info("工厂{}非排序报工JOB --- START --- ", wmsJobParamModel.getOrganizeCode()); long startTime = System.currentTimeMillis(); workOrderService.doMesWorkOrderNoSortReport(wmsJobParamModel.getOrganizeCode(), wmsJobParamModel.getPageSize(), MesPcnExtConstWords.JOB); long endTime = System.currentTimeMillis(); 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 d6fcf1b..33d493b 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 @@ -541,9 +541,8 @@ public class MesWorkOrderService implements IMesWorkOrderService { Map propertyMap = new HashMap<>(); - oldMesWorkOrder.setNum(oldMesWorkOrder.getNum() == null ? 1 : oldMesWorkOrder.getNum() + 1); - LOGGER.info("工单报工原数量【{}】", oldMesWorkOrder.getReportedQty()); - oldMesWorkOrder.setReportedQty(MathOperation.add(oldMesWorkOrder.getNum(), oldMesWorkOrder.getReportedQty())); + LOGGER.info("工单【{}]】报工原数量【{}】", oldMesWorkOrder.getWorkOrderNo(), oldMesWorkOrder.getReportedQty()); + oldMesWorkOrder.setReportedQty(MathOperation.add(MesPcnExtConstWords.ONE, oldMesWorkOrder.getReportedQty())); propertyMap.put("reportedQty", oldMesWorkOrder.getReportedQty()); if (StringUtils.isEmpty(productionRecord.getWorkOrderNo())) { oldMesWorkOrder.setCompleteQty(oldMesWorkOrder.getReportedQty()); @@ -584,7 +583,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { return; } - LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty()); + LOGGER.info("工单【{}】报工后数量【{}】", oldMesWorkOrder.getWorkOrderNo(), oldMesWorkOrder.getReportedQty()); ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName); oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date())); propertyMap.put(MesPcnExtConstWords.MODIFY_DATE_TIME, (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date())); @@ -592,7 +591,6 @@ public class MesWorkOrderService implements IMesWorkOrderService { //workOrderExtService.update(oldMesWorkOrder); - LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty()); //查询工作中心 DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);