From 070e1c959405509a7c51588aeb3a75fe71aaf340 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 10 Jul 2026 17:30:44 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=88=BF=E5=90=8D=E3=80=81=E6=9F=9C=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/WebCadOrderImportFactory.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) 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 e06918ac5..48047490a 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 @@ -1497,9 +1497,14 @@ public class WebCadOrderImportFactory { if (ObjectUtil.isNotNull(componentDO)) { plateComponentId = componentDO.getId(); - componentDO.setBodyId(orderBodyDO.getId()); - componentDO.setRoomName(orderBodyDO.getRoomName()); - componentDO.setBodyName(orderBodyDO.getName()); + // 三项都未赋值时，首次绑定所属柜体；后续 block 不覆盖 + if (componentDO.getBodyId() == null + && componentDO.getRoomName() == null + && componentDO.getBodyName() == null) { + componentDO.setBodyId(orderBodyDO.getId()); + componentDO.setRoomName(orderBodyDO.getRoomName()); + componentDO.setBodyName(orderBodyDO.getName()); + } } } @@ -1742,6 +1747,15 @@ public class WebCadOrderImportFactory { OrderComponentDO componentDO = componentGroupMap.get(cadGroupId); if (ObjectUtil.isNotNull(componentDO)) { partComponentIds.add(componentDO.getId()); + + // 三项都未赋值时，首次绑定所属柜体；后续 block 不覆盖 + if (componentDO.getBodyId() == null + && componentDO.getRoomName() == null + && componentDO.getBodyName() == null) { + componentDO.setBodyId(orderBodyDO.getId()); + componentDO.setRoomName(orderBodyDO.getRoomName()); + componentDO.setBodyName(orderBodyDO.getName()); + } } }