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/ipqc/vo/MesQcIpqcSaveReqVO.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java
index 8ada36b..8214c1d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java
@@ -42,25 +42,14 @@
@Schema(description = "鏉ユ簮鍗曟嵁琛� ID", example = "300")
private Long sourceLineId;
- // ========== 鐢熶骇鍏宠仈 ==========
-
- @Schema(description = "鐢熶骇宸ュ崟 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- @NotNull(message = "鐢熶骇宸ュ崟涓嶈兘涓虹┖")
- private Long workOrderId;
-
- @Schema(description = "鐢熶骇浠诲姟 ID", example = "20")
- private Long taskId;
-
- @Schema(description = "宸ヤ綅 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30")
- @NotNull(message = "宸ヤ綅涓嶈兘涓虹┖")
- private Long workstationId;
-
- @Schema(description = "宸ュ簭 ID", example = "40")
- private Long processId;
+ @Schema(description = "鎵瑰彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "BC20250101")
+ @NotEmpty(message = "鎵瑰彿涓嶈兘涓虹┖")
+ private String batchCode;
// ========== 鐗╂枡 ==========
- @Schema(description = "浜у搧鐗╂枡 ID", example = "50")
+ @Schema(description = "浜у搧鐗╂枡 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
+ @NotNull(message = "浜у搧鐗╂枡涓嶈兘涓虹┖")
private Long itemId;
@Schema(description = "璐ㄦ鏂规 ID", example = "5")
@@ -112,6 +101,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