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