From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
index c720ae8..0738fee 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
@@ -37,8 +37,7 @@
// ========== 瀹㈡埛 ==========
- @Schema(description = "瀹㈡埛 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- @NotNull(message = "瀹㈡埛涓嶈兘涓虹┖")
+ @Schema(description = "瀹㈡埛 ID锛屽彲涓虹┖", example = "10")
private Long clientId;
// ========== 鐗╂枡 ==========
@@ -55,8 +54,7 @@
// ========== 鏁伴噺 ==========
- @Schema(description = "鏈鍑鸿揣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
- @NotNull(message = "鏈鍑鸿揣鏁伴噺涓嶈兘涓虹┖")
+ @Schema(description = "鏈鍑鸿揣鏁伴噺", example = "100")
@DecimalMin(value = "0", message = "鏈鍑鸿揣鏁伴噺涓嶈兘灏忎簬 0")
private BigDecimal outQuantity;
@@ -77,11 +75,11 @@
// ========== 妫�楠� ==========
- @Schema(description = "妫�娴嬬粨鏋�", example = "1")
+ @Schema(description = "妫�娴嬬粨鏋�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "妫�娴嬬粨鏋滀笉鑳戒负绌�")
private Integer checkResult;
- @Schema(description = "鍑鸿揣鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鍑鸿揣鏃ユ湡涓嶈兘涓虹┖")
+ @Schema(description = "鍑鸿揣鏃ユ湡")
private LocalDateTime outDate;
@Schema(description = "妫�娴嬫棩鏈�", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -95,6 +93,23 @@
@Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
+ // ========== 鎶ュ憡琛ㄥご涓庣瀛� ==========
+
+ @Schema(description = "閲囨牱鍦扮偣", example = "缃愬尯")
+ private String samplingLocation;
+
+ @Schema(description = "璇佷功缂栧彿/鍚堟牸璇佸彿", example = "V0028")
+ private String certificateNo;
+
+ @Schema(description = "鎵ц鏍囧噯", example = "GB/T6027")
+ private String executeStandard;
+
+ @Schema(description = "澶嶆牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long auditUserId;
+
+ @Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long approveUserId;
+
@AssertTrue(message = "妫�娴嬫暟閲忓繀椤荤瓑浜庡悎鏍煎搧鏁伴噺涓庝笉鍚堟牸鍝佹暟閲忎箣鍜�")
@JsonIgnore
public boolean isQuantityValid() {
--
Gitblit v1.9.3