diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java index ff6750c5f..d1974d117 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java @@ -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> bodyInfoChange(RoomXmlVOS roomXmlVOS, Long orderId, Long organId) { - Map> roomInfos = new HashMap<>(); - if (roomXmlVOS != null && roomXmlVOS.getRoomXmlVOList() != null && roomXmlVOS.getRoomXmlVOList().size() > 0) { - for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) { - Map 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 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 groupInfoChange(GroupXmlVOS groupXmlVOS, Long orderId, Long organId) { Map 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 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())); } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java index 3cbff90dc..8aa298021 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.cf.imes.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.math.BigDecimal; 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 { @Schema(description = "ID", example = "16628") - private Long id; + @Pattern(regexp = "^[0-9]*$",message = "余料号必须为数字") + private String id; @Schema(description = "排单 ID", example = "16628") - private Long planId; + @Pattern(regexp = "^[0-9]*$",message = "排单号必须为数字") + private String planId; @Schema(description = "组织id", example = "1") private Long organId; @Schema(description = "初始排单 ID", example = "6628") - private Long initPlanId; + @Pattern(regexp = "^[0-9]*$",message = "初始排单号必须为数字") + private String initPlanId; @Schema(description = "余料板状态，0未使用，1使用中", example = "0") @ValidCommonStatus diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java index 8e231deae..412d099eb 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java @@ -23,9 +23,9 @@ public interface RemainPlateMapper extends BaseMapperX { default PageResult selectPage(RemainPlatePageReqVO reqVO) { LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX() - .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null) - .likeIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null) - .likeIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId().toString() : null) + .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId() : null) + .likeIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId() : null) + .likeIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId() : null) .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus()) .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId()) .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java index b2894f8ab..826cd19f9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -26,6 +26,10 @@ public class UserPageReqVO extends PageParam { @Size(max = 30, message = "用户昵称长度不能超过30个字符") private String nickname; + @Schema(description = "用户账号") + @Size(max = 30, message = "用户账号长度不能超过30个字符") + private String username; + @Schema(description = "手机号码，模糊匹配", example = "chenfeng") @Mobile @Size(max = 11, message = "手机号码长度不能超过11个字符") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java index 8adbe4513..730b35d56 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java @@ -77,7 +77,8 @@ public interface AdminUserMapper extends BaseMapperX { lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId()); } return selectPage(reqVO, lambdaQueryWrapperX - .likeIfPresent(AdminUserDO::getUsername, reqVO.getMobile()) + .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername()) + .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile()) .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(AdminUserDO::getDeptId, deptIds)