From e17031c2ae589902c867f2ad39862b78a08d379b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 15 Jun 2026 15:16:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(qms):=20=E4=BF=AE=E5=A4=8DCOA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=80=BB=E8=BE=91=E5=92=8C=E8=B4=A8=E6=A3=80=E5=91=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除冗余的COA报告存在性检查逻辑，简化审核流程
- 修复XML映射文件中物料编号、分类代码和描述的参数引用错误
- 统一参数访问路径为request对象下的字段引用
---
 .../service/impl/QmsCoaReviewServiceImpl.java       | 13 -------------
 .../resources/mapper/QmsQualityInspectorMapper.xml  | 12 ++++++------
 2 files changed, 6 insertions(+), 19 deletions(-)

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 786d7e9b..7c6653dc 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
@@ -623,19 +623,6 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl<QmsCoaReviewMapper, Qms
         }
 
         // 有已发送的COA任务，才需要检查COA报告
-        // 判断是否存在COA报告（未删除）
-        boolean hasReport = lambdaQuery()
-                .eq(QmsCoaReview::getSupplierId, supplier.getId())
-                .eq(QmsCoaReview::getMaterialId, material.getId())
-                .eq(QmsCoaReview::getPurchaseNo, qo.getPurchaseNo())
-                .eq(QmsCoaReview::getDeleted, false)
-                .exists();
-        // 没有COA报告，放行
-        if (!hasReport) {
-            return true;
-        }
-
-        // 有COA报告时，检查是否存在已审核通过（status=2）且未删除的COA报告
         return lambdaQuery()
                 .eq(QmsCoaReview::getSupplierId, supplier.getId())
                 .eq(QmsCoaReview::getMaterialId, material.getId())
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
index b489e029..8639843a 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
@@ -133,13 +133,13 @@
         WHERE qi.inspection_type=#{request.inspectionType} AND imi.inspector_id = (
             SELECT id FROM qms_quality_inspector WHERE user_id = #{userId} LIMIT 1
         )
-        <if test="materialNo != null and materialNo != ''">
+        <if test="request.materialNo != null and request.materialNo != ''">
           AND m.material_no = #{request.materialNo}
         </if>
-        <if test="materialCategoryCode != null and materialCategoryCode != ''">
+        <if test="request.materialCategoryCode != null and request.materialCategoryCode != ''">
           AND m.material_category_code LIKE CONCAT(#{request.materialCategoryCode}, '%')
         </if>
-        <if test="materialDesc != null and materialDesc != ''">
+        <if test="request.materialDesc != null and request.materialDesc != ''">
           AND m.material_desc LIKE CONCAT('%', #{request.materialDesc}, '%')
         </if>
         UNION ALL
@@ -163,13 +163,13 @@
         WHERE qi.inspection_type=#{request.inspectionType} AND imci.inspector_id = (
             SELECT id FROM qms_quality_inspector WHERE user_id = #{userId} LIMIT 1
         )
-        <if test="materialNo != null and materialNo != ''">
+        <if test="request.materialNo != null and request.materialNo != ''">
           AND m.material_no = #{request.materialNo}
         </if>
-        <if test="materialCategoryCode != null and materialCategoryCode != ''">
+        <if test="request.materialCategoryCode != null and request.materialCategoryCode != ''">
           AND m.material_category_code LIKE CONCAT(#{request.materialCategoryCode}, '%')
         </if>
-        <if test="materialDesc != null and materialDesc != ''">
+        <if test="request.materialDesc != null and request.materialDesc != ''">
           AND m.material_desc LIKE CONCAT('%', #{request.materialDesc}, '%')
         </if>
         ORDER BY material_id ASC