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()); } } }