From 6a8af1f3629210f8c3efbae3e6fff3ed7353ab92 Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Fri, 17 Apr 2026 11:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9COA=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E7=9B=B4=E6=8E=A5=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QmsCoaTaskController.java      | 12 +++-
 .../common/pojo/qo/QmsCoaTaskUpdateQO.java    | 19 +----
 .../vo/QmsQualityInspectorMaterialVO.java     |  5 ++
 .../service/IQmsCoaTaskService.java           |  7 +-
 .../service/impl/QmsCoaTaskServiceImpl.java   | 71 ++++++++++++-------
 .../mapper/QmsQualityInspectorMapper.xml      |  1 +
 6 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java
index 5ce6ac59..2a1430d1 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java
@@ -51,7 +51,7 @@ public class QmsCoaTaskController extends BaseController {
     }
 
     /**
-     * 修改COA通知任务（仅状态为0时可修改）
+     * 修改COA通知任务（只允许修改报告要求和报告模板，修改后状态改为0）
      */
     @Transactional
     @PostMapping("update")
@@ -60,6 +60,16 @@ public class QmsCoaTaskController extends BaseController {
         return ApiResult.success();
     }
 
+    /**
+     * 直接发布COA通知任务（状态直接变为1，并填入发送时间）
+     */
+    @Transactional
+    @PostMapping("publish")
+    public ApiResult<Void> publish(@Valid @RequestBody QmsCoaTaskAddQO qo) {
+        coaTaskService.publish(qo);
+        return ApiResult.success();
+    }
+
     /**
      * 批量发送（状态改为1，填入发送时间）
      *
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java
index 4ce0871a..f189ae62 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java
@@ -3,10 +3,8 @@ package com.nflg.wms.common.pojo.qo;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.time.LocalDate;
-
 /**
- * 修改COA通知任务参数（id必传，其余可选）
+ * 修改COA通知任务参数（id必传，只允许修改报告要求和报告模板）
  */
 @Data
 public class QmsCoaTaskUpdateQO {
@@ -17,26 +15,11 @@ public class QmsCoaTaskUpdateQO {
     @NotNull(message = "ID不能为空")
     private Long id;
 
-    /**
-     * 供应商编号（可选）
-     */
-    private String supplierCode;
-
-    /**
-     * 物料编号（可选）
-     */
-    private String materialNo;
-
     /**
      * 报告要求（可选）
      */
     private String requirement;
 
-    /**
-     * 最晚提交时间（可选）
-     */
-    private LocalDate lastSubTime;
-
     /**
      * 报告模板（可选）
      */
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java
index accb1c01..5dad66d7 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java
@@ -28,6 +28,11 @@ public class QmsQualityInspectorMaterialVO {
      */
     private String drawingNo;
 
+    /**
+     * 图纸版本号
+     */
+    private String drawingNoVer;
+
     /**
      * 物料类别编码
      */
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java
index 485536a0..784c0b9f 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java
@@ -27,10 +27,15 @@ public interface IQmsCoaTaskService extends IService<QmsCoaTask> {
     void delete(Long id);
 
     /**
-     * 修改COA通知任务（状态不为0时不可修改）
+     * 修改COA通知任务（只允许修改报告要求和报告模板，修改后状态改为0）
      */
     void update(QmsCoaTaskUpdateQO qo);
 
+    /**
+     * 直接发布COA通知任务（状态改为1，填入发送时间）
+     */
+    void publish(QmsCoaTaskAddQO qo);
+
     /**
      * 批量发送（状态改为1，填入发送时间）
      */
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
index 0cc394e4..39873c40 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java
@@ -111,48 +111,67 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl<QmsCoaTaskMapper, QmsCoaT
         if (Objects.isNull(task)) {
             throw new NflgException(STATE.BusinessError, "任务不存在");
         }
-        if (!Objects.equals(task.getStatus(), 0)) {
-            throw new NflgException(STATE.BusinessError, "当前状态不允许修改，只有待发送（状态0）的任务才能修改");
-        }
 
         String operator = UserUtil.getUserName();
         LocalDateTime now = LocalDateTime.now();
 
         var updater = lambdaUpdate().eq(QmsCoaTask::getId, qo.getId());
 
-        // 按供应商编号更新
-        if (Objects.nonNull(qo.getSupplierCode()) && !qo.getSupplierCode().isEmpty()) {
-            UserSupplier supplier = userSupplierService.getByCode(qo.getSupplierCode());
-            if (Objects.isNull(supplier)) {
-                throw new NflgException(STATE.BusinessError, "供应商编号不存在：" + qo.getSupplierCode());
-            }
-            updater.set(QmsCoaTask::getSupplierId, supplier.getId());
-        }
-        // 按物料编号更新
-        if (Objects.nonNull(qo.getMaterialNo()) && !qo.getMaterialNo().isEmpty()) {
-            QmsQcMaterial material = qcMaterialService.lambdaQuery()
-                    .eq(QmsQcMaterial::getMaterialNo, qo.getMaterialNo())
-                    .last("LIMIT 1")
-                    .one();
-            if (Objects.isNull(material)) {
-                throw new NflgException(STATE.BusinessError, "物料编号不存在：" + qo.getMaterialNo());
-            }
-            updater.set(QmsCoaTask::getMaterialId, material.getId());
-        }
+        // 只允许修改报告要求和报告模板
         if (Objects.nonNull(qo.getRequirement()) && !qo.getRequirement().isEmpty()) {
             updater.set(QmsCoaTask::getRequirement, qo.getRequirement());
         }
-        if (Objects.nonNull(qo.getLastSubTime())) {
-            updater.set(QmsCoaTask::getLastSubTime, qo.getLastSubTime());
-        }
         if (Objects.nonNull(qo.getReportTemplate())) {
             updater.set(QmsCoaTask::getReportTemplate, qo.getReportTemplate());
         }
-        updater.set(QmsCoaTask::getUpdateBy, operator)
+        
+        // 修改后状态改为0（待发送）
+        updater.set(QmsCoaTask::getStatus, 0)
+                .set(QmsCoaTask::getUpdateBy, operator)
                 .set(QmsCoaTask::getUpdateTime, now)
                 .update();
     }
 
+    // ==================== 直接发布 ====================
+
+    @Transactional
+    @Override
+    public void publish(QmsCoaTaskAddQO qo) {
+        // 按供应商编号查供应商
+        UserSupplier supplier = userSupplierService.getByCode(qo.getSupplierCode());
+        if (Objects.isNull(supplier)) {
+            throw new NflgException(STATE.BusinessError, "供应商编号不存在：" + qo.getSupplierCode());
+        }
+        // 按物料编号查物料
+        QmsQcMaterial material = qcMaterialService.lambdaQuery()
+                .eq(QmsQcMaterial::getMaterialNo, qo.getMaterialNo())
+                .last("LIMIT 1")
+                .one();
+        if (Objects.isNull(material)) {
+            throw new NflgException(STATE.BusinessError, "物料编号不存在：" + qo.getMaterialNo());
+        }
+
+        String operator = UserUtil.getUserName();
+        LocalDateTime now = LocalDateTime.now();
+
+        // 直接创建状态为1（已发送）的任务，并填入发送时间
+        QmsCoaTask task = new QmsCoaTask()
+                .setSupplierId(supplier.getId())
+                .setMaterialId(material.getId())
+                .setUserId(UserUtil.getUserId())
+                .setStatus(1)
+                .setNoticeTime(now)
+                .setRequirement(qo.getRequirement())
+                .setReportTemplate(qo.getReportTemplate())
+                .setLastSubTime(qo.getLastSubTime())
+                .setDeleted(false)
+                .setCreateBy(operator)
+                .setCreateTime(now)
+                .setUpdateBy(operator)
+                .setUpdateTime(now);
+        save(task);
+    }
+
     // ==================== 发送 ====================
 
     @Transactional
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
index 91154bec..7572a35e 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
@@ -111,6 +111,7 @@
             qi.material_id,
             m.material_no,
             m.drawing_no,
+            m.drawing_no_ver,
             m.material_category_code,
             m.material_category_code_path_name AS material_category_name,
             m.material_desc                    AS material_name,