From 4a664466874db3b3fcc4d030a2fb7a97b0de3f00 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Tue, 27 May 2025 14:45:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?47187=20PCN-=E7=94=B5=E5=AD=90=E5=8C=96?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=8B=86=E8=A7=A3=E5=8A=9F=E8=83=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 4 ++-- 1 file changed, 2 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 170272e..4e10644 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 @@ -847,7 +847,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { mesWorkOrderService.doProductReportReversal(mesWorkOrderDb,productVersion, requestModel.getUserName());*/ //移库 requestModel.setSn(produceSnDb.getProductSn()); - doCreateMove(requestModel,locateNo,productVersion.getReceiveInventoryPoint(),mesWorkOrderDb.getErpWorkCenter(),mesWorkOrderDb.getPartNo()); +// doCreateMove(requestModel,locateNo,productVersion.getReceiveInventoryPoint(),mesWorkOrderDb.getErpWorkCenter(),mesWorkOrderDb.getPartNo()); } private MesProductVersion getProductVersion(MesWorkOrder mesWorkOrderDb) { @@ -869,7 +869,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { //对于已勾选报废的子件，对于有零件号的项，产生移库（产线的材料库位->报废库（系统参数配置））。移库数量为报废时的明细数量； if(!StringUtils.isEmpty(assemblyModel.getAssemblyPartNo())){ //移库 - doCreateMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName); +// doCreateMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName); //报废 doCreateScrap(assemblyModel,userName,responsibleParty,organizeCode); } From 6fa7d7dc2c26c42cadb4b6f696a2c7c637480e54 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Tue, 27 May 2025 17:23:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?47187=20PCN-=E7=94=B5=E5=AD=90=E5=8C=96?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=8B=86=E8=A7=A3=E5=8A=9F=E8=83=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=88=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 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 4e10644..0ef5b28 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 @@ -371,10 +371,16 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) { String destLocateNo = getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()); for (MesPartModel mesPartModel : mesPartModels) { - doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId()); + //20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单） + if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ + doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId()); + } } } else { - doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + //20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单） + if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } } } @@ -397,7 +403,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { workCenterCode = mesPartInspection.getWorkCenterCode(); } if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) { - doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + //20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单） + if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } } else { //拆解