From c6c20e07c264c69802cf5e326a728767d763f705 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Mon, 10 Feb 2025 19:36:23 +0800 Subject: [PATCH] =?UTF-8?q?44424=20PCN=EF=BC=9A=E5=B7=A5=E5=8D=95=E5=88=A4?= =?UTF-8?q?=E5=8F=AF=E7=96=91=E7=9A=84=E7=A0=81=EF=BC=8C=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=A3=80=E9=AA=8C=E9=80=9A=E8=BF=87=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=89=AB=E6=8F=8F=E8=A3=85=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E6=97=B6=E6=89=AB=E6=8F=8F=E5=88=A4=E5=8F=AF?= =?UTF-8?q?=E7=96=91=E7=A0=81=EF=BC=8C=E5=B7=A5=E5=8D=95=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E7=96=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesInputDefectRecordService.java | 8 ++++---- .../apiservice/serviceimpl/busi/MesNcProcessingService.java | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) 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 0f0c449..de54f9b 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 @@ -411,7 +411,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService MesMove move = createMove(model, srcLocate, mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo()); moveRepository.save(move); } - } else if (headModel) { + } else { //移库 MesMove move = createMove(model, srcLocate, configService.getCfgValue(org, "LGORT"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); moveRepository.save(move); @@ -441,7 +441,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService MesMove move = createMove(model,locateNo , mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(), mesPartModel.getPartNo()); moveRepository.save(move); } - } else if (headModel) { + } else { MesMove move = createMove(model, getDestLocateNo(model, org), target, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); moveRepository.save(move); } @@ -580,7 +580,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo()); moveRepository.save(move); } - } else if (headModel) { + } else{ MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); moveRepository.save(move); } @@ -693,7 +693,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo()); moveRepository.save(move); } - } else if (headModel) { + } else{ MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); moveRepository.save(move); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java index f8529ec..570efc6 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java @@ -475,7 +475,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { } moveRepository.saveAll(moveList); - } else if (headModel) { + } else { //移库 转正常、放行：8000移至2000 MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE); ConvertBean.serviceModelInitialize(move, model.getUserName()); @@ -594,8 +594,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { sourceValue = refundSource; } - if (!headModel) { - if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) { + if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) { List moveList = new ArrayList<>(); for (MesPartModel mesPartModel : mesPartModels) { @@ -603,9 +602,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { ConvertBean.serviceModelInitialize(move,model.getUserName()); moveList.add(move); } - moveRepository.saveAll(moveList); - - } + moveRepository.saveAll(moveList); } else { MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE); ConvertBean.serviceModelInitialize(move,model.getUserName()); @@ -693,7 +690,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { } moveRepository.saveAll(moveList); - } else if (headModel) { + } else { //移库 转正常、放行：8000移至2000 MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE); ConvertBean.serviceModelInitialize(move, model.getUserName());