From 2a0cb8222a3d9ee09f113a738ccc769ba7865135 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 15 May 2025 19:06:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?46970=20=E7=A4=BC=E5=98=89=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E6=89=B9=E9=87=8F=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BB=8E=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=BA=93=E4=BD=8D=E7=A7=BB=E5=88=B0=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=BA=93=E4=BD=8D=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=B8=8D?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 2c09905..f76ac77 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 @@ -396,8 +396,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { if (mesPartInspection != null) { workCenterCode = mesPartInspection.getWorkCenterCode(); } - doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesReworkTask.getPartNo(), mesPartInspection.getId()); - + if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) { + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } else { //拆解 if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ From d7e500586090595d560b7e373f78b805ebdc460b Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Sat, 17 May 2025 18:13:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?46981=20=E7=94=B5=E5=AD=90=E5=8C=96?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=20NC=E5=88=A4=E5=AE=9A=20=E8=99=9A=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=B8=8D=E5=8F=AF=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e65b1ca..e4c81dc 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 @@ -1073,6 +1073,14 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService throw new ImppBusiException(String.format("【%s】此条码对应【%s】物料号未维护零件类型，请检查数据", produceSn.getProductSn(), produceSn.getPartNo())); } + //20250517-46981 电子化检验 NC判定 虚结构不可录入 + DdlPackBean productVersionPackBean = DdlPackBean.getDdlPackBean(org); + DdlPreparedPack.getStringEqualPack("虚零件", "description", productVersionPackBean); + DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", productVersionPackBean); + int count = productVersionRepository.findByHqlWhereCount(productVersionPackBean); + if (count > 0) { + throw new ImppBusiException(String.format("【%s】此条码对应【%s】物料号为虚零件，请检查数据", produceSn.getProductSn(), produceSn.getPartNo())); + } return part; }