From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
index b9e3a62..612d289 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockAdjustReqVO.java
@@ -1,10 +1,16 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
/**
* 搴撳瓨璋冩暣锛堣嚜瀹氫箟鍑哄叆搴擄級Request VO
@@ -29,20 +35,41 @@
@NotNull(message = "搴撲綅ID涓嶈兘涓虹┖")
private Long areaId;
- @Schema(description = "鎵规ID", example = "1")
+ // ========== 鎵规鐩稿叧瀛楁 ==========
+
+ @Schema(description = "鎵规ID锛堥�夋嫨宸叉湁鎵规鏃朵紶鍏ワ級", example = "1")
private Long batchId;
- @Schema(description = "鎵规鍙�", example = "BATCH001")
+ @Schema(description = "鎵规鍙凤紙鏂板缓鎵规鏃朵紶鍏ワ紝绯荤粺鑷姩鍒涘缓鎵规璁板綍锛�", example = "BATCH001")
private String batchCode;
+
+ @Schema(description = "鐢熶骇鏃ユ湡锛堟柊寤烘壒娆℃椂浼犲叆锛�", example = "2025-01-01")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate produceDate;
+
+ @Schema(description = "鏈夋晥鏈燂紙鏂板缓鎵规鏃朵紶鍏ワ級", example = "2026-01-01")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate expireDate;
@Schema(description = "渚涘簲鍟咺D", example = "1")
private Long vendorId;
- @Schema(description = "璋冩暣鏁伴噺锛堟鏁�=鍏ュ簱锛岃礋鏁�=鍑哄簱锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
- @NotNull(message = "璋冩暣鏁伴噺涓嶈兘涓虹┖")
+ @Schema(description = "鐢熶骇鎵瑰彿", example = "LOT001")
+ private String lotNumber;
+
+ @Schema(description = "璐ㄩ噺鐘舵�侊紙0-寰呮楠� 1-鍚堟牸 2-涓嶅悎鏍硷紝鏀寔鏁板瓧鎴栧瓧绗︿覆锛�", example = "1")
+ private Object qualityStatus;
+
+ // ========== 鍏朵粬瀛楁 ==========
+
+ @Schema(description = "鏁伴噺锛堝繀椤诲ぇ浜�0锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
+ @Positive(message = "鏁伴噺蹇呴』澶т簬0")
private BigDecimal quantity;
- @Schema(description = "璋冩暣鍘熷洜", example = "鐩樼偣璋冩暣")
+ @Schema(description = "鍘熷洜", example = "鐩樼偣璋冩暣")
private String reason;
}
\ No newline at end of file
--
Gitblit v1.9.3