From 06bfac538f6b423019470796d0bd2c701490e423 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 26 Nov 2024 18:39:28 +0800 Subject: [PATCH] =?UTF-8?q?43890=20=E5=B7=A5=E5=8D=95=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8-=E8=AF=95=E5=88=B6?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=EF=BC=8C=E6=B1=87=E6=8A=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90"=E6=97=A0=E9=9C=80=E6=B1=87?= =?UTF-8?q?=E6=8A=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 8 ++++---- 1 file changed, 4 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 76931dc..d52fc73 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 @@ -441,10 +441,6 @@ public class MesWorkOrderService implements IMesWorkOrderService { try { LOGGER.info("此次报工的条码【{}】,工单【{}】", productionRecord.getProductSn(), productionRecord.getWorkOrderNo()); List oldMesWorkOrders = getMesWorkOrders(productionRecord, organizeCode); - if (CollectionUtils.isEmpty(oldMesWorkOrders)) { - updateProductionRecord(organizeCode, userName, productionRecord.getId()); - return; - } // 工单加工记录报表-试制工单，汇报状态修改成"无需汇报" if (Objects.equals(productionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue())) { LOGGER.warn("报工条码:{}工单为试制单，更新成无需报工", productionRecord.getProductSn()); @@ -454,6 +450,10 @@ public class MesWorkOrderService implements IMesWorkOrderService { new Object[]{userName, TimeTool.getNowTime(true), productionRecord.getReportStatus()}, ddlPackBean); return; } + if (CollectionUtils.isEmpty(oldMesWorkOrders)) { + updateProductionRecord(organizeCode, userName, productionRecord.getId()); + return; + } report(productionRecord, organizeCode, userName, oldMesWorkOrders); } catch (Exception e) { String msg = e.getMessage();