From 5cb72f5c38575e000b91383a992c5cdf92af9d55 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 22 Aug 2024 17:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A=E6=9C=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 3 ++- .../apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 8 +------- .../pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java | 8 +------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index 20318d2..2905c7c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -256,6 +256,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { mesProduceSnPrintModel.setOrganizeCode(organizeCode); List snList = new ArrayList<>(); sn.setDescription(String.format("源条码：%s",sn.getProductSn())); + sn.setLotNo(TimeTool.getToday()); sn.setProductSn(doGererateSerialNo(mesPart, organizeCode, requestModel.getUserName())); snList.add(sn); mesProduceSnPrintModel.getMesProduceSnList().addAll(snList); @@ -534,7 +535,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { return produceSn; } - private MesMove createMove(String sn, String oldSn, String organizeCode, String userName) { + private MesMove createMove(String oldSn, String sn, String organizeCode, String userName) { MesMove move = new MesMove(); move.setOrganizeCode(organizeCode); move.setFactoryCode(organizeCode); 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 6b82153..70810f9 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 @@ -710,14 +710,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean); - MesPartTypePicture partTypePicture = partTypePictureRepository.getByProperty(packBean); - //若不存在则提示零件类别不存在 - if (null == partTypePicture) { - throw new ImppBusiException(String.format("【%s】物料号对应的【%s】零件类别不存在，请检查数据", part.getPartNo(), part.getPartTypeCode())); - } - - return partTypePicture; + return partTypePictureRepository.getByProperty(packBean); } private List checkLocationConfig(String org) { 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 292f37b..2dd6de6 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 @@ -235,14 +235,8 @@ public class MesNcProcessingService implements IMesNcProcessingService { DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean); - MesPartTypePicture partTypePicture = partTypePictureRepository.getByProperty(packBean); - //若不存在则提示零件类别不存在 - if (StringUtils.isEmpty(partTypePicture)) { - throw new ImppBusiException(String.format("【%s】物料号对应的【%s】零件类别不存在，请检查数据", part.getPartNo(), part.getPartTypeCode())); - } - - return partTypePicture; + return partTypePictureRepository.getByProperty(packBean); } private List checkPartTypeDefect(MesPart part, String org) {