Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

webcad拆单新增部件房名、柜名

Browse Source
This commit is contained in:
gaoqr
2026-07-10 17:30:44 +08:00
parent 34cc1db663
commit 070e1c9594
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+14
View File
@@ -1497,11 +1497,16 @@ public class WebCadOrderImportFactory {
if (ObjectUtil.isNotNull(componentDO)) { if (ObjectUtil.isNotNull(componentDO)) {
plateComponentId = componentDO.getId(); plateComponentId = componentDO.getId();
// 三项都未赋值时，首次绑定所属柜体；后续 block 不覆盖
if (componentDO.getBodyId() == null
&& componentDO.getRoomName() == null
&& componentDO.getBodyName() == null) {
componentDO.setBodyId(orderBodyDO.getId()); componentDO.setBodyId(orderBodyDO.getId());
componentDO.setRoomName(orderBodyDO.getRoomName()); componentDO.setRoomName(orderBodyDO.getRoomName());
componentDO.setBodyName(orderBodyDO.getName()); componentDO.setBodyName(orderBodyDO.getName());
} }
} }
}
List<Integer> groupIds = block.getGroupIds(); List<Integer> groupIds = block.getGroupIds();
if (CollUtil.isNotEmpty(groupIds)) { if (CollUtil.isNotEmpty(groupIds)) {
@@ -1742,6 +1747,15 @@ public class WebCadOrderImportFactory {
OrderComponentDO componentDO = componentGroupMap.get(cadGroupId); OrderComponentDO componentDO = componentGroupMap.get(cadGroupId);
if (ObjectUtil.isNotNull(componentDO)) { if (ObjectUtil.isNotNull(componentDO)) {
partComponentIds.add(componentDO.getId()); 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());
}
} }
} }