Commit 173b403a94145c818be27097a20a02bff3a8694b
1 parent
99c1c7d0
✨ feat(mes): 添加入库日期和状态筛选功能
在 MES 采购入库单请求中新增入库日期字段,并在数据查询中支持根据入库日期进行筛选。此功能提升了用户在管理入库单时的灵活性和准确性。
Showing
2 changed files
with
10 additions
and
0 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/vo/MesWmItemReceiptPageReqVO.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 MesWmItemReceiptPageReqVO extends PageParam { | @@ -24,6 +29,10 @@ public class MesWmItemReceiptPageReqVO 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[] receiptDate; | ||
| 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/itemreceipt/MesWmItemReceiptMapper.java
| @@ -19,6 +19,7 @@ public interface MesWmItemReceiptMapper extends BaseMapperX<MesWmItemReceiptDO> | @@ -19,6 +19,7 @@ public interface MesWmItemReceiptMapper extends BaseMapperX<MesWmItemReceiptDO> | ||
| 19 | .likeIfPresent(MesWmItemReceiptDO::getName, reqVO.getName()) | 19 | .likeIfPresent(MesWmItemReceiptDO::getName, reqVO.getName()) |
| 20 | .likeIfPresent(MesWmItemReceiptDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) | 20 | .likeIfPresent(MesWmItemReceiptDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) |
| 21 | .eqIfPresent(MesWmItemReceiptDO::getVendorId, reqVO.getVendorId()) | 21 | .eqIfPresent(MesWmItemReceiptDO::getVendorId, reqVO.getVendorId()) |
| 22 | + .betweenIfPresent(MesWmItemReceiptDO::getReceiptDate, reqVO.getReceiptDate()) | ||
| 22 | .eqIfPresent(MesWmItemReceiptDO::getStatus, reqVO.getStatus()) | 23 | .eqIfPresent(MesWmItemReceiptDO::getStatus, reqVO.getStatus()) |
| 23 | .orderByDesc(MesWmItemReceiptDO::getId)); | 24 | .orderByDesc(MesWmItemReceiptDO::getId)); |
| 24 | } | 25 | } |