Commit 99c1c7d0da9eb89f207fd88645a796b7b1dd509b

Authored by YunaiV
1 parent a5c49881

✨ feat(mes): 添加到货通知单的到货日期和状态枚举

新增到货日期字段到 MES 到货通知单请求 VO,并在查询中支持根据到货日期范围筛选。同时,添加到货通知单状态的枚举定义,提升系统的可维护性和可读性。
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/vo/MesWmArrivalNoticePageReqVO.java
@@ -5,6 +5,11 @@ import io.swagger.v3.oas.annotations.media.Schema; @@ -5,6 +5,11 @@ import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data; 5 import lombok.Data;
6 import lombok.EqualsAndHashCode; 6 import lombok.EqualsAndHashCode;
7 import lombok.ToString; 7 import lombok.ToString;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
8 13
9 @Schema(description = "管理后台 - MES 到货通知单分页 Request VO") 14 @Schema(description = "管理后台 - MES 到货通知单分页 Request VO")
10 @Data 15 @Data
@@ -24,6 +29,10 @@ public class MesWmArrivalNoticePageReqVO extends PageParam { @@ -24,6 +29,10 @@ public class MesWmArrivalNoticePageReqVO extends PageParam {
24 @Schema(description = "供应商编号", example = "1") 29 @Schema(description = "供应商编号", example = "1")
25 private Long vendorId; 30 private Long vendorId;
26 31
  32 + @Schema(description = "到货日期")
  33 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  34 + private LocalDateTime[] arrivalDate;
  35 +
27 @Schema(description = "状态", example = "0") 36 @Schema(description = "状态", example = "0")
28 private Integer status; 37 private Integer status;
29 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/arrivalnotice/MesWmArrivalNoticeMapper.java
@@ -19,6 +19,7 @@ public interface MesWmArrivalNoticeMapper extends BaseMapperX<MesWmArrivalNotice @@ -19,6 +19,7 @@ public interface MesWmArrivalNoticeMapper extends BaseMapperX<MesWmArrivalNotice
19 .likeIfPresent(MesWmArrivalNoticeDO::getName, reqVO.getName()) 19 .likeIfPresent(MesWmArrivalNoticeDO::getName, reqVO.getName())
20 .likeIfPresent(MesWmArrivalNoticeDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) 20 .likeIfPresent(MesWmArrivalNoticeDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
21 .eqIfPresent(MesWmArrivalNoticeDO::getVendorId, reqVO.getVendorId()) 21 .eqIfPresent(MesWmArrivalNoticeDO::getVendorId, reqVO.getVendorId())
  22 + .betweenIfPresent(MesWmArrivalNoticeDO::getArrivalDate, reqVO.getArrivalDate())
22 .eqIfPresent(MesWmArrivalNoticeDO::getStatus, reqVO.getStatus()) 23 .eqIfPresent(MesWmArrivalNoticeDO::getStatus, reqVO.getStatus())
23 .orderByDesc(MesWmArrivalNoticeDO::getId)); 24 .orderByDesc(MesWmArrivalNoticeDO::getId));
24 } 25 }