From ff0c5e1f33f207d633ea9c881d859fc6daaae745 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 10 Mar 2026 15:17:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A3=85=E9=85=8D=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0orderIds?= =?UTF-8?q?=E7=9A=84=E8=BF=87=E6=BB=A4=E5=BD=B1=E5=93=8D=EF=BC=9B2?= =?UTF-8?q?=E3=80=81cad=E6=8B=86=E5=8D=95=E9=83=A8=E4=BB=B6=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E5=BC=82=E5=B8=B8=E7=B4=AF=E5=8A=A0=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/assemblylist/AssemblyListServiceImpl.java | 7 ++++++- .../orderImport/factory/WebCadOrderImportAsyncFactory.java | 2 +- .../orderImport/factory/WebCadOrderImportFactory.java | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java index c2ba8ce7b..f60aee6c5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java @@ -79,7 +79,9 @@ public class AssemblyListServiceImpl implements AssemblyListService { } // 查询入参部件 - List componentDOS = orderComponentMapper.selectByIds(componentIds); + List componentDOS = orderComponentMapper.selectList(new LambdaUpdateWrapper() + .in(OrderComponentDO::getId, componentIds) + .in(OrderComponentDO::getOrderId, reqVO.getOrderIds())); if (CollUtil.isEmpty(componentDOS) || componentDOS.size() != componentIds.size()) { throw new ServiceException(ORDER_COMPONENT_NOT_EXIST); } @@ -117,6 +119,9 @@ public class AssemblyListServiceImpl implements AssemblyListService { List topComponentNames = orderComponentTreeRespVOS.stream().map(OrderComponentTreeCompareVO::getName).distinct().toList(); // 根据名称查询组织装配设置 + if (CollUtil.isEmpty(topComponentNames)) { + return orderComponentTreeRespVOS; + } CommonResult> assemblyConfigByComponentNameListResult = assemblyConfigApi.getAssemblyConfigByPartNameList(topComponentNames); if(assemblyConfigByComponentNameListResult.isError()) { throw new ServiceException(ORDER_COMPONENT_ASSEMBLY_CONFIG_QUERY_ERROR); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index c45bad740..3e7663b88 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -1824,7 +1824,7 @@ public class WebCadOrderImportAsyncFactory { reader.startArray(); while (reader.hasNext()) { // 递归子节点 - processComponent(reader, componentId, topId, level); // 子节点在递归中生成组件DO + processComponent(reader, componentId, topId, level + 1); // 子节点在递归中生成组件DO } reader.endArray(); break; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 6f82c03aa..5d35175cb 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -579,9 +579,9 @@ public class WebCadOrderImportFactory { orderComponentDOS.add(componentDO); orderComponentBatchInsertWithinThreshold(orderComponentDOS, false); // 继续处理下级 - if (!componentGroupReqVO.getChildren().isEmpty()) { + if (CollUtil.isNotEmpty(componentGroupReqVO.getChildren())) { for (WebCadDataComponentGroupReqVO children : componentGroupReqVO.getChildren()) { - createAndCacheComponent(children, componentId, topId, ++level); + createAndCacheComponent(children, componentId, topId, level + 1); } } }