From bee1c8e17cb8505b9149a4ca0b8cf311cd7361ac Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 15 May 2025 22:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B646970=E7=A4=BC=E5=98=89?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E6=89=B9=E9=87=8F=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E6=8A=A5=E5=BA=9F=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BB=8E?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=BA=93=E4=BD=8D=E7=A7=BB=E5=88=B0?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=BA=93=E4=BD=8D=EF=BC=8C=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=8D=E5=8A=A8=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 5a3922c..b287ba8 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())){ @@ -928,8 +929,6 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { assemblyList = assemblyList.stream().filter(o->MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue() == o.getAssemblyStatus()).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(assemblyList)){ assemblyList.forEach(t->{ - t.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - t.setDescription(userName + "-" + TimeTool.getNowTime(true) + "-返工解绑软删除"); t.setSystemSyncStatus(CommonEnumUtil.FALSE); t.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue()); ConvertBean.serviceModelUpdate(t, userName);