mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-13 21:32:07 +08:00
bug575修改
This commit is contained in:
+110
-90
@@ -45,6 +45,9 @@ public class XmlTypeRealize {
|
||||
|
||||
final String NOT_ASSIGNED = "未命名";
|
||||
final String NOT_ASSIGNED_CODE = "未命编号";
|
||||
final String ROOM_ID = "roomId";
|
||||
final String BODY_ID = "bodyId";
|
||||
final String GROUP_ID = "groupId";
|
||||
|
||||
@Resource
|
||||
private SnowFlakeGenerator snowFlakeGenerator;
|
||||
@@ -96,86 +99,102 @@ public class XmlTypeRealize {
|
||||
|
||||
// 房间柜体信息转换
|
||||
public Map<String, Map<String, OrderBodyDO>> bodyInfoChange(RoomXmlVOS roomXmlVOS, Long orderId, Long organId) {
|
||||
|
||||
Map<String, Map<String, OrderBodyDO>> roomInfos = new HashMap<>();
|
||||
if (roomXmlVOS != null && roomXmlVOS.getRoomXmlVOList() != null && roomXmlVOS.getRoomXmlVOList().size() > 0) {
|
||||
|
||||
for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) {
|
||||
Map<String, OrderBodyDO> bodyInfos = new HashMap<>();
|
||||
Long roomId = (Long) snowFlakeGenerator.nextId(null);
|
||||
if (roomXmlVO.getName() == null && roomXmlVO.getCode() == null) {
|
||||
roomXmlVO.setName(NOT_ASSIGNED);
|
||||
roomXmlVO.setCode(NOT_ASSIGNED_CODE);
|
||||
}
|
||||
if (roomXmlVO.getCode() == null && roomXmlVO.getName() != null){
|
||||
roomXmlVO.setCode(NOT_ASSIGNED_CODE + roomXmlVO.getName());
|
||||
}
|
||||
if (roomXmlVO.getCode() != null && roomXmlVO.getName() == null){
|
||||
roomXmlVO.setCode(NOT_ASSIGNED + roomXmlVO.getCode());
|
||||
}
|
||||
for (BoxXmlVO boxXmlVO : roomXmlVO.getBoxXmlVOList()) {
|
||||
if (boxXmlVO.getName() == null && boxXmlVO.getCode() == null) {
|
||||
boxXmlVO.setName(NOT_ASSIGNED);
|
||||
boxXmlVO.setCode(NOT_ASSIGNED_CODE);
|
||||
}
|
||||
if (boxXmlVO.getCode() == null && boxXmlVO.getName() != null){
|
||||
boxXmlVO.setCode(NOT_ASSIGNED_CODE + boxXmlVO.getName());
|
||||
}
|
||||
if (boxXmlVO.getCode() != null && boxXmlVO.getName() == null){
|
||||
boxXmlVO.setCode(NOT_ASSIGNED + boxXmlVO.getCode());
|
||||
}
|
||||
OrderBodyDO orderBodyDO = OrderBodyDO.builder()
|
||||
.id((Long) identifierGenerator.nextId(null))
|
||||
.organId(organId)
|
||||
.orderId(orderId)
|
||||
.roomId(roomId)
|
||||
.roomName(roomXmlVO.getName())
|
||||
.name(boxXmlVO.getName())
|
||||
.width(Double.parseDouble(boxXmlVO.getWidth()))
|
||||
.height(Double.parseDouble(boxXmlVO.getHeight()))
|
||||
.depth(Double.parseDouble(boxXmlVO.getLength()))
|
||||
.plateNum(0)
|
||||
.unregularNum(0)
|
||||
.build();
|
||||
bodyInfos.put(boxXmlVO.getCode(), orderBodyDO);
|
||||
}
|
||||
roomInfos.put(roomXmlVO.getCode(), bodyInfos);
|
||||
if (roomXmlVOS == null || roomXmlVOS.getRoomXmlVOList() == null || roomXmlVOS.getRoomXmlVOList().isEmpty()) {
|
||||
return roomInfos;
|
||||
}
|
||||
|
||||
for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) {
|
||||
Map<String, OrderBodyDO> bodyInfos = new HashMap<>();
|
||||
Long roomId = (Long) snowFlakeGenerator.nextId(null);
|
||||
|
||||
setDefaultsForRoomXmlVO(roomXmlVO);
|
||||
for (BoxXmlVO boxXmlVO : roomXmlVO.getBoxXmlVOList()) {
|
||||
setDefaultsForBoxXmlVO(boxXmlVO);
|
||||
OrderBodyDO orderBodyDO = createOrderBodyDO(boxXmlVO, roomId, orderId, organId, roomXmlVO.getName());
|
||||
bodyInfos.put(boxXmlVO.getCode(), orderBodyDO);
|
||||
}
|
||||
roomInfos.put(roomXmlVO.getCode(), bodyInfos);
|
||||
}
|
||||
|
||||
return roomInfos;
|
||||
}
|
||||
|
||||
private void setDefaultsForRoomXmlVO(RoomXmlVO roomXmlVO) {
|
||||
if (roomXmlVO.getName() == null) {
|
||||
roomXmlVO.setName(NOT_ASSIGNED);
|
||||
}
|
||||
if (roomXmlVO.getCode() == null) {
|
||||
if (roomXmlVO.getName() == null) {
|
||||
roomXmlVO.setCode(NOT_ASSIGNED_CODE);
|
||||
} else {
|
||||
roomXmlVO.setCode(NOT_ASSIGNED_CODE + roomXmlVO.getName());
|
||||
}
|
||||
}
|
||||
return roomInfos;
|
||||
}
|
||||
|
||||
private void setDefaultsForBoxXmlVO(BoxXmlVO boxXmlVO) {
|
||||
if (boxXmlVO.getName() == null) {
|
||||
boxXmlVO.setName(NOT_ASSIGNED);
|
||||
}
|
||||
if (boxXmlVO.getCode() == null) {
|
||||
if (boxXmlVO.getName() == null) {
|
||||
boxXmlVO.setCode(NOT_ASSIGNED_CODE);
|
||||
} else {
|
||||
boxXmlVO.setCode(NOT_ASSIGNED_CODE + boxXmlVO.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private OrderBodyDO createOrderBodyDO(BoxXmlVO boxXmlVO, Long roomId, Long orderId, Long organId, String roomName) {
|
||||
return OrderBodyDO.builder()
|
||||
.id((Long) identifierGenerator.nextId(null))
|
||||
.organId(organId)
|
||||
.orderId(orderId)
|
||||
.roomId(roomId)
|
||||
.roomName(roomName) // 假设 BoxXmlVO 中有 roomName 字段
|
||||
.name(boxXmlVO.getName())
|
||||
.width(Double.parseDouble(boxXmlVO.getWidth()))
|
||||
.height(Double.parseDouble(boxXmlVO.getHeight()))
|
||||
.depth(Double.parseDouble(boxXmlVO.getLength()))
|
||||
.plateNum(0)
|
||||
.unregularNum(0)
|
||||
.build();
|
||||
}
|
||||
|
||||
// 加工组信息转换
|
||||
public Map<String, OrderGroupDO> groupInfoChange(GroupXmlVOS groupXmlVOS, Long orderId, Long organId) {
|
||||
Map<String, OrderGroupDO> groupInfos = new HashMap<>();
|
||||
if (groupXmlVOS != null && groupXmlVOS.getGroupXmlVOList() != null && groupXmlVOS.getGroupXmlVOList().size() > 0) {
|
||||
for (GroupXmlVO groupXmlVO : groupXmlVOS.getGroupXmlVOList()) {
|
||||
if (groupXmlVO.getName() == null && groupXmlVO.getCode() == null) {
|
||||
groupXmlVO.setName(NOT_ASSIGNED);
|
||||
groupXmlVO.setCode(NOT_ASSIGNED_CODE);
|
||||
}
|
||||
if (groupXmlVO.getCode() == null && groupXmlVO.getName() != null){
|
||||
groupXmlVO.setCode(NOT_ASSIGNED_CODE + " + " + groupXmlVO.getName());
|
||||
}
|
||||
if (groupXmlVO.getCode() != null && groupXmlVO.getName() == null){
|
||||
groupXmlVO.setCode(NOT_ASSIGNED + " + " + groupXmlVO.getCode());
|
||||
}
|
||||
OrderGroupDO groupDO = OrderGroupDO.builder()
|
||||
.id((Long) identifierGenerator.nextId(null))
|
||||
.organId(organId)
|
||||
.orderId(orderId)
|
||||
.bodyId(0L)
|
||||
.groupTypeId(0L)
|
||||
.groupTypeId(0L)
|
||||
.name(groupXmlVO.getName())
|
||||
.height(Double.parseDouble(groupXmlVO.getHeight()))
|
||||
.width(Double.parseDouble(groupXmlVO.getWidth()))
|
||||
.depth(Double.parseDouble(groupXmlVO.getLength()))
|
||||
.plateNum(0)
|
||||
.unregularNum(0)
|
||||
.build();
|
||||
groupInfos.put(groupXmlVO.getCode(), groupDO);
|
||||
if (groupXmlVOS == null || groupXmlVOS.getGroupXmlVOList() == null || groupXmlVOS.getGroupXmlVOList().isEmpty()) {
|
||||
return groupInfos;
|
||||
}
|
||||
|
||||
List<GroupXmlVO> groupXmlVOList = groupXmlVOS.getGroupXmlVOList();
|
||||
for (GroupXmlVO groupXmlVO : groupXmlVOList) {
|
||||
if (groupXmlVO.getName() == null) {
|
||||
groupXmlVO.setName(NOT_ASSIGNED);
|
||||
}
|
||||
if (groupXmlVO.getCode() == null) {
|
||||
groupXmlVO.setCode(groupXmlVO.getName() == null ? NOT_ASSIGNED_CODE : (NOT_ASSIGNED_CODE + " + " + groupXmlVO.getName()));
|
||||
} else if (groupXmlVO.getName() == null) {
|
||||
groupXmlVO.setCode(NOT_ASSIGNED + " + " + groupXmlVO.getCode());
|
||||
}
|
||||
OrderGroupDO groupDO = OrderGroupDO.builder()
|
||||
.id((Long) identifierGenerator.nextId(null))
|
||||
.organId(organId)
|
||||
.orderId(orderId)
|
||||
.bodyId(0L)
|
||||
.groupTypeId(0L)
|
||||
.groupTypeId(0L)
|
||||
.name(groupXmlVO.getName())
|
||||
.height(Double.parseDouble(groupXmlVO.getHeight()))
|
||||
.width(Double.parseDouble(groupXmlVO.getWidth()))
|
||||
.depth(Double.parseDouble(groupXmlVO.getLength()))
|
||||
.plateNum(0)
|
||||
.unregularNum(0)
|
||||
.build();
|
||||
groupInfos.put(groupXmlVO.getCode(), groupDO);
|
||||
}
|
||||
return groupInfos;
|
||||
}
|
||||
@@ -507,9 +526,9 @@ public class XmlTypeRealize {
|
||||
groupId = 0L;
|
||||
}
|
||||
|
||||
map.put("roomId", bodyDO.getRoomId());
|
||||
map.put("bodyId", bodyId);
|
||||
map.put("groupId", groupId);
|
||||
map.put(ROOM_ID, bodyDO.getRoomId());
|
||||
map.put(BODY_ID, bodyId);
|
||||
map.put(GROUP_ID, groupId);
|
||||
return map;
|
||||
}
|
||||
|
||||
@@ -575,9 +594,9 @@ public class XmlTypeRealize {
|
||||
.orderId(orderId)
|
||||
.type(2)
|
||||
.partsId(partsId)
|
||||
.groupId(idMap.get("groupId"))
|
||||
.roomId(idMap.get("roomId"))
|
||||
.bodyId(idMap.get("bodyId"))
|
||||
.groupId(idMap.get(GROUP_ID))
|
||||
.roomId(idMap.get(ROOM_ID))
|
||||
.bodyId(idMap.get(BODY_ID))
|
||||
.num(partsNum)
|
||||
.build());
|
||||
});
|
||||
@@ -644,9 +663,9 @@ public class XmlTypeRealize {
|
||||
.orderId(orderId)
|
||||
.type(2)
|
||||
.partsId(partsId)
|
||||
.groupId(idMap.get("groupId"))
|
||||
.roomId(idMap.get("roomId"))
|
||||
.bodyId(idMap.get("bodyId"))
|
||||
.groupId(idMap.get(GROUP_ID))
|
||||
.roomId(idMap.get(ROOM_ID))
|
||||
.bodyId(idMap.get(BODY_ID))
|
||||
.num(partsNum)
|
||||
.build());
|
||||
});
|
||||
@@ -713,9 +732,9 @@ public class XmlTypeRealize {
|
||||
.orderId(orderId)
|
||||
.type(2)
|
||||
.partsId(partsId)
|
||||
.groupId(idMap.get("groupId"))
|
||||
.roomId(idMap.get("roomId"))
|
||||
.bodyId(idMap.get("bodyId"))
|
||||
.groupId(idMap.get(GROUP_ID))
|
||||
.roomId(idMap.get(ROOM_ID))
|
||||
.bodyId(idMap.get(BODY_ID))
|
||||
.num(partsNum)
|
||||
.build());
|
||||
});
|
||||
@@ -827,9 +846,9 @@ public class XmlTypeRealize {
|
||||
.orderId(orderId)
|
||||
.type(1)
|
||||
.plateId(plateId)
|
||||
.groupId(idMap.get("groupId"))
|
||||
.roomId(idMap.get("roomId"))
|
||||
.bodyId(idMap.get("bodyId"))
|
||||
.groupId(idMap.get(GROUP_ID))
|
||||
.roomId(idMap.get(ROOM_ID))
|
||||
.bodyId(idMap.get(BODY_ID))
|
||||
.num(1.0)
|
||||
.build());
|
||||
|
||||
@@ -1029,9 +1048,9 @@ public class XmlTypeRealize {
|
||||
.orderId(plateDO.getOrderId())
|
||||
.type(2)
|
||||
.partsId(orderPartsDO.getId())
|
||||
.groupId(idMap.get("groupId"))
|
||||
.roomId(idMap.get("roomId"))
|
||||
.bodyId(idMap.get("bodyId"))
|
||||
.groupId(idMap.get(GROUP_ID))
|
||||
.roomId(idMap.get(ROOM_ID))
|
||||
.bodyId(idMap.get(BODY_ID))
|
||||
.num(count)
|
||||
.build());
|
||||
}
|
||||
@@ -1291,11 +1310,12 @@ public class XmlTypeRealize {
|
||||
|
||||
// 小板备注
|
||||
private void addRemark(PlateDO plateDO, PlateDetail plateDetail, BlockXmlVO blockXmlVO) {
|
||||
if (blockXmlVO.getRemarkXmlVOS() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList().size() > 0) {
|
||||
if (blockXmlVO.getRemarkXmlVOS() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList() != null
|
||||
&& !blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList().isEmpty()) {
|
||||
for (RemarkXmlVO remarkXmlVO : blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList()) {
|
||||
plateDetail.getSideRemark().put(remarkXmlVO.getName(), remarkXmlVO.getInfo());
|
||||
}
|
||||
plateDO.setRemark(JSONObject.toJSONString(plateDetail.getSideRemark()));
|
||||
plateDO.setRemark(JSON.toJSONString(plateDetail.getSideRemark()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user