From 611f40d50ea1085665cf9e0ab6ee23c73b92975f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sun, 12 May 2024 18:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=20=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20NC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesDefectRecordService.java | 18 +++++++++--------- .../serviceimpl/busi/MesInputDefectRecordService.java | 12 ++++++++++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesDefectRecordService.java index fa210e1..d551d13 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesDefectRecordService.java @@ -36,15 +36,15 @@ public class MesDefectRecordService implements IMesDefectRecordService { // //校验工单 // MesWorkOrder workOrder = checkQty(recordList); - recordList.forEach(r -> { - r.setId(null); -// r.setOrderId(workOrder.getId()); -// r.setOrderNo(workOrder.getOrderNo()); - r.setOrganizeCode(organizeCode); - //更新工单表报废数量 -// workOrder.setRepairQty(workOrder.getRepairQtyVal() + r.getQty()); - ConvertBean.serviceModelInitialize(r, userName); - }); +// recordList.forEach(r -> { +// r.setId(null); +//// r.setOrderId(workOrder.getId()); +//// r.setOrderNo(workOrder.getOrderNo()); +// r.setOrganizeCode(organizeCode); +// //更新工单表报废数量 +//// workOrder.setRepairQty(workOrder.getRepairQtyVal() + r.getQty()); +// ConvertBean.serviceModelInitialize(r, userName); +// }); defectRecordRepository.saveAll(recordList); // ConvertBean.serviceModelUpdate(workOrder, userName); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index e986279..288e0e0 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -172,6 +172,18 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService DdlPreparedPack.getStringEqualPack(produceSn.getPartNo(), "partNo", packBean); MesPart part = partRepository.getByProperty(packBean); + defectRecordList.forEach(r -> { + r.setId(null); + r.setPartNo(part.getPartNo()); + r.setPartName(part.getPartName()); +//// r.setOrderId(workOrder.getId()); +//// r.setOrderNo(workOrder.getOrderNo()); + r.setOrganizeCode(org); +// //更新工单表报废数量 +//// workOrder.setRepairQty(workOrder.getRepairQtyVal() + r.getQty()); + ConvertBean.serviceModelInitialize(r, AuthUtil.getSessionUser().getUserName()); + }); + //保存数据 defectRecordService.saveDefect(org, AuthUtil.getSessionUser().getUserName(), defectRecordList);