From 92c6a2e5646c06814f8fc4f25179dc0684dc2f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sun, 14 Jun 2026 09:24:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=9B=B4=E6=96=B0COA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8A=9F=E8=83=BD=E7=9A=84=E6=95=B0=E6=8D=AE=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=92=8C=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除批次号的必填验证要求
- 在更新操作中添加批次号字段映射
- 为物料编码和采购单号添加必填验证注解
- 为COA报告字段添加必填验证注解
- 重新定义更新对象中的字段注释和验证规则
---
 .../wms/common/pojo/qo/QmsCoaReviewAddQO.java     |  3 +--
 .../wms/common/pojo/qo/QmsCoaReviewUpdateQO.java  | 15 ++++++++++++---
 .../service/impl/QmsCoaReviewServiceImpl.java     |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java
index 97eaa96c..4ba71bcf 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java
@@ -24,9 +24,8 @@ public class QmsCoaReviewAddQO {
     private String purchaseNo;
 
     /**
-     * 批次号（必传）
+     * 批次号
      */
-    @NotBlank(message = "批次号不能为空")
     private String batchNo;
 
     /**
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java
index 5e157d4e..c36f9ab9 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java
@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -19,18 +20,26 @@ public class QmsCoaReviewUpdateQO {
     private Long id;
 
     /**
-     * 物料编码（可选，状态0时可改）
+     * 物料编码
      */
+    @NotBlank(message = "物料编码不能为空")
     private String materialNo;
 
     /**
-     * 采购单号（可选，状态0时可改）
+     * 采购单号
      */
+    @NotBlank(message = "采购单号不能为空")
     private String purchaseNo;
 
     /**
-     * COA报告（可选，状态0或3时可改）
+     * 批次号
      */
+    private String batchNo;
+
+    /**
+     * COA报告
+     */
+    @NotBlank(message = "COA报告不能为空")
     private String coaFile;
 
     /**
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java
index 8b3ba32c..7441faff 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java
@@ -200,6 +200,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl<QmsCoaReviewMapper, Qms
             if (Objects.nonNull(qo.getCoaFile()) && !qo.getCoaFile().isEmpty()) {
                 updater.set(QmsCoaReview::getCoaFile, qo.getCoaFile());
             }
+            updater.set(QmsCoaReview::getBatchNo, qo.getBatchNo());
             // 修改图片
             if (qo.getImages() != null) {
                 updater.set(QmsCoaReview::getImage, qo.getImages().isEmpty() ? null : String.join(",", qo.getImages()));