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

bug575修改

Browse Source
This commit is contained in:
lym
2024-10-21 15:06:29 +08:00
parent 0b0d17b94b
commit a77567bf3c
5 changed files with 126 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
+110 -90
View File
@@ -45,6 +45,9 @@ public class XmlTypeRealize {
final String NOT_ASSIGNED = "未命名"; final String NOT_ASSIGNED = "未命名";
final String NOT_ASSIGNED_CODE = "未命编号"; final String NOT_ASSIGNED_CODE = "未命编号";
final String ROOM_ID = "roomId";
final String BODY_ID = "bodyId";
final String GROUP_ID = "groupId";
@Resource @Resource
private SnowFlakeGenerator snowFlakeGenerator; private SnowFlakeGenerator snowFlakeGenerator;
@@ -96,86 +99,102 @@ public class XmlTypeRealize {
// 房间柜体信息转换 // 房间柜体信息转换
public Map<String, Map<String, OrderBodyDO>> bodyInfoChange(RoomXmlVOS roomXmlVOS, Long orderId, Long organId) { public Map<String, Map<String, OrderBodyDO>> bodyInfoChange(RoomXmlVOS roomXmlVOS, Long orderId, Long organId) {
Map<String, Map<String, OrderBodyDO>> roomInfos = new HashMap<>(); Map<String, Map<String, OrderBodyDO>> roomInfos = new HashMap<>();
if (roomXmlVOS != null && roomXmlVOS.getRoomXmlVOList() != null && roomXmlVOS.getRoomXmlVOList().size() > 0) {
for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) { if (roomXmlVOS == null || roomXmlVOS.getRoomXmlVOList() == null || roomXmlVOS.getRoomXmlVOList().isEmpty()) {
Map<String, OrderBodyDO> bodyInfos = new HashMap<>(); return roomInfos;
Long roomId = (Long) snowFlakeGenerator.nextId(null); }
if (roomXmlVO.getName() == null && roomXmlVO.getCode() == null) {
roomXmlVO.setName(NOT_ASSIGNED); for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) {
roomXmlVO.setCode(NOT_ASSIGNED_CODE); Map<String, OrderBodyDO> bodyInfos = new HashMap<>();
} Long roomId = (Long) snowFlakeGenerator.nextId(null);
if (roomXmlVO.getCode() == null && roomXmlVO.getName() != null){
roomXmlVO.setCode(NOT_ASSIGNED_CODE + roomXmlVO.getName()); setDefaultsForRoomXmlVO(roomXmlVO);
} for (BoxXmlVO boxXmlVO : roomXmlVO.getBoxXmlVOList()) {
if (roomXmlVO.getCode() != null && roomXmlVO.getName() == null){ setDefaultsForBoxXmlVO(boxXmlVO);
roomXmlVO.setCode(NOT_ASSIGNED + roomXmlVO.getCode()); OrderBodyDO orderBodyDO = createOrderBodyDO(boxXmlVO, roomId, orderId, organId, roomXmlVO.getName());
} bodyInfos.put(boxXmlVO.getCode(), orderBodyDO);
for (BoxXmlVO boxXmlVO : roomXmlVO.getBoxXmlVOList()) { }
if (boxXmlVO.getName() == null && boxXmlVO.getCode() == null) { roomInfos.put(roomXmlVO.getCode(), bodyInfos);
boxXmlVO.setName(NOT_ASSIGNED); }
boxXmlVO.setCode(NOT_ASSIGNED_CODE);
} return roomInfos;
if (boxXmlVO.getCode() == null && boxXmlVO.getName() != null){ }
boxXmlVO.setCode(NOT_ASSIGNED_CODE + boxXmlVO.getName());
} private void setDefaultsForRoomXmlVO(RoomXmlVO roomXmlVO) {
if (boxXmlVO.getCode() != null && boxXmlVO.getName() == null){ if (roomXmlVO.getName() == null) {
boxXmlVO.setCode(NOT_ASSIGNED + boxXmlVO.getCode()); roomXmlVO.setName(NOT_ASSIGNED);
} }
OrderBodyDO orderBodyDO = OrderBodyDO.builder() if (roomXmlVO.getCode() == null) {
.id((Long) identifierGenerator.nextId(null)) if (roomXmlVO.getName() == null) {
.organId(organId) roomXmlVO.setCode(NOT_ASSIGNED_CODE);
.orderId(orderId) } else {
.roomId(roomId) roomXmlVO.setCode(NOT_ASSIGNED_CODE + roomXmlVO.getName());
.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);
} }
} }
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) { public Map<String, OrderGroupDO> groupInfoChange(GroupXmlVOS groupXmlVOS, Long orderId, Long organId) {
Map<String, OrderGroupDO> groupInfos = new HashMap<>(); Map<String, OrderGroupDO> groupInfos = new HashMap<>();
if (groupXmlVOS != null && groupXmlVOS.getGroupXmlVOList() != null && groupXmlVOS.getGroupXmlVOList().size() > 0) { if (groupXmlVOS == null || groupXmlVOS.getGroupXmlVOList() == null || groupXmlVOS.getGroupXmlVOList().isEmpty()) {
for (GroupXmlVO groupXmlVO : groupXmlVOS.getGroupXmlVOList()) { return groupInfos;
if (groupXmlVO.getName() == null && groupXmlVO.getCode() == null) { }
groupXmlVO.setName(NOT_ASSIGNED);
groupXmlVO.setCode(NOT_ASSIGNED_CODE); List<GroupXmlVO> groupXmlVOList = groupXmlVOS.getGroupXmlVOList();
} for (GroupXmlVO groupXmlVO : groupXmlVOList) {
if (groupXmlVO.getCode() == null && groupXmlVO.getName() != null){ if (groupXmlVO.getName() == null) {
groupXmlVO.setCode(NOT_ASSIGNED_CODE + " + " + groupXmlVO.getName()); groupXmlVO.setName(NOT_ASSIGNED);
}
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 (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; return groupInfos;
} }
@@ -507,9 +526,9 @@ public class XmlTypeRealize {
groupId = 0L; groupId = 0L;
} }
map.put("roomId", bodyDO.getRoomId()); map.put(ROOM_ID, bodyDO.getRoomId());
map.put("bodyId", bodyId); map.put(BODY_ID, bodyId);
map.put("groupId", groupId); map.put(GROUP_ID, groupId);
return map; return map;
} }
@@ -575,9 +594,9 @@ public class XmlTypeRealize {
.orderId(orderId) .orderId(orderId)
.type(2) .type(2)
.partsId(partsId) .partsId(partsId)
.groupId(idMap.get("groupId")) .groupId(idMap.get(GROUP_ID))
.roomId(idMap.get("roomId")) .roomId(idMap.get(ROOM_ID))
.bodyId(idMap.get("bodyId")) .bodyId(idMap.get(BODY_ID))
.num(partsNum) .num(partsNum)
.build()); .build());
}); });
@@ -644,9 +663,9 @@ public class XmlTypeRealize {
.orderId(orderId) .orderId(orderId)
.type(2) .type(2)
.partsId(partsId) .partsId(partsId)
.groupId(idMap.get("groupId")) .groupId(idMap.get(GROUP_ID))
.roomId(idMap.get("roomId")) .roomId(idMap.get(ROOM_ID))
.bodyId(idMap.get("bodyId")) .bodyId(idMap.get(BODY_ID))
.num(partsNum) .num(partsNum)
.build()); .build());
}); });
@@ -713,9 +732,9 @@ public class XmlTypeRealize {
.orderId(orderId) .orderId(orderId)
.type(2) .type(2)
.partsId(partsId) .partsId(partsId)
.groupId(idMap.get("groupId")) .groupId(idMap.get(GROUP_ID))
.roomId(idMap.get("roomId")) .roomId(idMap.get(ROOM_ID))
.bodyId(idMap.get("bodyId")) .bodyId(idMap.get(BODY_ID))
.num(partsNum) .num(partsNum)
.build()); .build());
}); });
@@ -827,9 +846,9 @@ public class XmlTypeRealize {
.orderId(orderId) .orderId(orderId)
.type(1) .type(1)
.plateId(plateId) .plateId(plateId)
.groupId(idMap.get("groupId")) .groupId(idMap.get(GROUP_ID))
.roomId(idMap.get("roomId")) .roomId(idMap.get(ROOM_ID))
.bodyId(idMap.get("bodyId")) .bodyId(idMap.get(BODY_ID))
.num(1.0) .num(1.0)
.build()); .build());
@@ -1029,9 +1048,9 @@ public class XmlTypeRealize {
.orderId(plateDO.getOrderId()) .orderId(plateDO.getOrderId())
.type(2) .type(2)
.partsId(orderPartsDO.getId()) .partsId(orderPartsDO.getId())
.groupId(idMap.get("groupId")) .groupId(idMap.get(GROUP_ID))
.roomId(idMap.get("roomId")) .roomId(idMap.get(ROOM_ID))
.bodyId(idMap.get("bodyId")) .bodyId(idMap.get(BODY_ID))
.num(count) .num(count)
.build()); .build());
} }
@@ -1291,11 +1310,12 @@ public class XmlTypeRealize {
// 小板备注 // 小板备注
private void addRemark(PlateDO plateDO, PlateDetail plateDetail, BlockXmlVO blockXmlVO) { 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()) { for (RemarkXmlVO remarkXmlVO : blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList()) {
plateDetail.getSideRemark().put(remarkXmlVO.getName(), remarkXmlVO.getInfo()); plateDetail.getSideRemark().put(remarkXmlVO.getName(), remarkXmlVO.getInfo());
} }
plateDO.setRemark(JSONObject.toJSONString(plateDetail.getSideRemark())); plateDO.setRemark(JSON.toJSONString(plateDetail.getSideRemark()));
} }
} }
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java
+7 -3
View File
@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -22,16 +23,19 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
public class RemainPlatePageReqVO extends PageParam { public class RemainPlatePageReqVO extends PageParam {
@Schema(description = "ID", example = "16628") @Schema(description = "ID", example = "16628")
private Long id; @Pattern(regexp = "^[0-9]*$",message = "余料号必须为数字")
private String id;
@Schema(description = "排单 ID", example = "16628") @Schema(description = "排单 ID", example = "16628")
private Long planId; @Pattern(regexp = "^[0-9]*$",message = "排单号必须为数字")
private String planId;
@Schema(description = "组织id", example = "1") @Schema(description = "组织id", example = "1")
private Long organId; private Long organId;
@Schema(description = "初始排单 ID", example = "6628") @Schema(description = "初始排单 ID", example = "6628")
private Long initPlanId; @Pattern(regexp = "^[0-9]*$",message = "初始排单号必须为数字")
private String initPlanId;
@Schema(description = "余料板状态，0未使用，1使用中", example = "0") @Schema(description = "余料板状态，0未使用，1使用中", example = "0")
@ValidCommonStatus @ValidCommonStatus
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
+3 -3
View File
@@ -23,9 +23,9 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) { default PageResult<RemainPlateDO> selectPage(RemainPlatePageReqVO reqVO) {
LambdaQueryWrapperX<RemainPlateDO> wrapper = new LambdaQueryWrapperX<RemainPlateDO>() LambdaQueryWrapperX<RemainPlateDO> wrapper = new LambdaQueryWrapperX<RemainPlateDO>()
.likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null) .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId() : null)
.likeIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null) .likeIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId() : null)
.likeIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId().toString() : null) .likeIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId() : null)
.eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus()) .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus())
.eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId()) .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId())
.eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting()) .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting())
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java
+4
View File
@@ -26,6 +26,10 @@ public class UserPageReqVO extends PageParam {
@Size(max = 30, message = "用户昵称长度不能超过30个字符") @Size(max = 30, message = "用户昵称长度不能超过30个字符")
private String nickname; private String nickname;
@Schema(description = "用户账号")
@Size(max = 30, message = "用户账号长度不能超过30个字符")
private String username;
@Schema(description = "手机号码，模糊匹配", example = "chenfeng") @Schema(description = "手机号码，模糊匹配", example = "chenfeng")
@Mobile @Mobile
@Size(max = 11, message = "手机号码长度不能超过11个字符") @Size(max = 11, message = "手机号码长度不能超过11个字符")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
+2 -1
View File
@@ -77,7 +77,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId()); lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId());
} }
return selectPage(reqVO, lambdaQueryWrapperX return selectPage(reqVO, lambdaQueryWrapperX
.likeIfPresent(AdminUserDO::getUsername, reqVO.getMobile()) .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
.inIfPresent(AdminUserDO::getDeptId, deptIds) .inIfPresent(AdminUserDO::getDeptId, deptIds)