From 408911ff1ba335d3dbab129a0a40472f2797f8a1 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 6 Sep 2024 12:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=8B=86=E8=A7=A3=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=91=E5=BD=A2=E8=A3=85=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0id,pid=E5=85=B3=E8=81=94?= 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, 4 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 d1aaff6..b571944 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 @@ -247,7 +247,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } //查询装配树 List assemblyTree = parseArray(mesProductionAssemblies); - recursionAssemblySnTree(assemblyTree, requestModel); + recursionAssemblySnTree(assemblyTree, requestModel,-1); return assemblyTree; } @@ -554,16 +554,17 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } - public void recursionAssemblySnTree(List assemblyTree, MesReworkTaskRequestModel requestModel) { + public void recursionAssemblySnTree(List assemblyTree, MesReworkTaskRequestModel requestModel,long pid) { for (MesProductionAssemblyModel assembly : assemblyTree) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(assembly.getAssemblySn(), "productSn", packBean); DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue(), "assemblyStatus", packBean); List mesProductionAssemblies = mesProductionAssemblyRepository.findByHqlWhere(packBean); + assembly.setPid(pid); if (!CollectionUtils.isEmpty(mesProductionAssemblies)) { assembly.setChildren(parseArray(mesProductionAssemblies)); - recursionAssemblySnTree(assembly.getChildren(), requestModel); + recursionAssemblySnTree(assembly.getChildren(), requestModel, assembly.getId()); } } }