From 049a0f1b6ffdc09684008c24ba973ee416796fc3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 28 Feb 2026 23:02:35 +0800 Subject: [PATCH] ✨ feat(mes): 添加退料单质检标识及相关字段校验 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java | 12 ------------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java | 3 ++- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java index 240e96c..c27eca8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java @@ -4,11 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - MES 生产退料单分页 Request VO") @Data @@ -30,11 +25,4 @@ public class MesWmReturnIssuePageReqVO extends PageParam { @Schema(description = "退料类型", example = "1") private Integer type; - @Schema(description = "状态", example = "0") - private Integer status; - - @Schema(description = "退料日期范围") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] returnDate; - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java index 344e08b..93e7cbd 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java @@ -30,7 +30,8 @@ public class MesWmReturnIssueLineSaveReqVO { @Schema(description = "批次 ID", example = "1") private Long batchId; - @Schema(description = "是否需要质检", example = "false") + @Schema(description = "是否需要质检", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") + @NotNull(message = "是否需要质检不能为空") private Boolean qcFlag; @Schema(description = "备注", example = "备注") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java index 1d0116e..0dd3365 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java @@ -20,8 +20,6 @@ public interface MesWmReturnIssueMapper extends BaseMapperX .eqIfPresent(MesWmReturnIssueDO::getWorkstationId, reqVO.getWorkstationId()) .eqIfPresent(MesWmReturnIssueDO::getWorkOrderId, reqVO.getWorkOrderId()) .eqIfPresent(MesWmReturnIssueDO::getType, reqVO.getType()) - .eqIfPresent(MesWmReturnIssueDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(MesWmReturnIssueDO::getReturnDate, reqVO.getReturnDate()) .orderByDesc(MesWmReturnIssueDO::getId)); } -- libgit2 0.21.4