From 3911ce6313c12950cc1df1056a49a9eba2ba91e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Sun, 12 May 2024 18:35:57 +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 --- .../pcn/apiservice/controller/busi/MesNcProcessingController.java | 3 ++- .../pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java index e731afc..82fd136 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesNcProcessingController.java @@ -56,7 +56,8 @@ public class MesNcProcessingController { } - ncProcessingService.saveNc(serialNumber, person, type, AuthUtil.getOrganizeCode()); + ncProcessingService.saveNc(serialNumber, person, type, "CK01"); +// ncProcessingService.saveNc(serialNumber, person, type, AuthUtil.getOrganizeCode()); return ResultBean.success("查询成功"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); 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 8fdb319..fc06098 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 @@ -127,7 +127,7 @@ public class MesNcProcessingService implements IMesNcProcessingService { zrsum = (rb.getResultList().get(0)).toString(); } - if (type == MesPcnExtEnumUtil.NC_TYPE.REWORK.getValue()) { + if (type == MesPcnExtEnumUtil.NC_TYPE.NORMAL.getValue()) { MesMove move = new MesMove(); move.setMatnr(part.getPartNo()); move.setOrganizeCode(org); @@ -139,14 +139,16 @@ public class MesNcProcessingService implements IMesNcProcessingService { move.setZrsum(zrsum); move.setPostDate(TimeTool.getToday()); move.setPostTime(TimeTool.getTimeShortWithColon()); - ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName()); + ConvertBean.serviceModelInitialize(move, "LML"); +// ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName()); moveRepository.save(move); } defectRecordList.forEach(k -> { k.setNcType(type); k.setPerson(person); - ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); + ConvertBean.serviceModelUpdate(k, "LML"); +// ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); defectRecordRepository.saveAll(defectRecordList);