From 628c219cfe4aa20f0f2e79e745d37fc74f8bc61d Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Mon, 10 Feb 2025 19:49:01 +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/MesNcProcessingService.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 570efc6..e754a9f 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 @@ -537,16 +537,14 @@ public class MesNcProcessingService implements IMesNcProcessingService { } partInspectionRepository.save(model.getPartInspection()); - if (!headModel) { - if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) { - List moveList = new ArrayList<>(); - for (MesPartModel mesPartModel : mesPartModels) { - MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE, mesPartModel.getPartNo()); - ConvertBean.serviceModelInitialize(move, model.getUserName()); - moveList.add(move); - } - moveRepository.saveAll(moveList); + if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) { + List moveList = new ArrayList<>(); + for (MesPartModel mesPartModel : mesPartModels) { + MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE, mesPartModel.getPartNo()); + ConvertBean.serviceModelInitialize(move, model.getUserName()); + moveList.add(move); } + moveRepository.saveAll(moveList); } else { MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE); ConvertBean.serviceModelInitialize(move, model.getUserName());