mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 12:52:07 +08:00
webcad拆单新增部件房名、柜名
This commit is contained in:
+17
-3
@@ -1497,9 +1497,14 @@ public class WebCadOrderImportFactory {
|
|||||||
if (ObjectUtil.isNotNull(componentDO)) {
|
if (ObjectUtil.isNotNull(componentDO)) {
|
||||||
plateComponentId = componentDO.getId();
|
plateComponentId = componentDO.getId();
|
||||||
|
|
||||||
componentDO.setBodyId(orderBodyDO.getId());
|
// 三项都未赋值时,首次绑定所属柜体;后续 block 不覆盖
|
||||||
componentDO.setRoomName(orderBodyDO.getRoomName());
|
if (componentDO.getBodyId() == null
|
||||||
componentDO.setBodyName(orderBodyDO.getName());
|
&& 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);
|
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());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user