From 1a933353a3dbd7bb38046284b9bfdaf6d702e74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 29 Apr 2026 14:36:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(incoming-inspection):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A0=B7=E6=9C=AC=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C=E5=92=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E8=A7=84=E6=A0=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改样本数量校验逻辑，去除测试方法判断，使用检测数量限制样本数量
- 修正剩余样本数量计算，避免超出请求数量
- 在查询中增加检测数量字段，丰富任务详情信息
- 修正样本记录数量统计SQL，计算总检验数量而非计数
- 在检验任务VO中新增物料规格属性，完善物料信息展示
---
 ...comingInspectionTaskControllerService.java | 10 +-
 .../pojo/vo/QmsIncomingInspectionTaskVO.java  |  5 +
 .../QmsIncomingInspectionTaskMapper.xml       | 91 ++++++++++---------
 .../QmsIncomingInspectionTaskRecordMapper.xml |  2 +-
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
index 7c91bb2a..e65a9bd1 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
@@ -756,16 +756,10 @@ public class IncomingInspectionTaskControllerService {
         List<QmsIncomingInspectionTaskCheckItemVO> datas = inspectionStandardService.getItemsForCheck(standard.getId());
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("未设置检验项目");
         Integer count = incomingInspectionTaskRecordService.getCount(task.getId());
-        Integer total;
-        if (Objects.equals(standard.getTestingMethodDictItemId(), dictionaryItemService.getIdByCode("InspectionStandardTestingMethod", "Full"))) {
-            total = task.getInspectionQty();
-        } else {
-            total = getCountOfSampling(task.getId(), task.getInspectionQty(), standard);
-        }
-        VUtil.trueThrowBusinessError(count > total).throwMessage("样本数量不能大于总数量");
+        VUtil.trueThrowBusinessError(count > task.getDetectionQty()).throwMessage("样本数量不能大于总数量");
         return new QmsIncomingInspectionTaskCheckDetailVO()
                 .setItems(datas)
-                .setCount(total - count)
+                .setCount(Math.min(task.getDetectionQty() - count,request.getNum()))
                 .setPdfDrawings(
                         inspectionStandardItemService.lambdaQuery()
                                 .select(QmsInspectionStandardItem::getPdfDrawing)
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java
index 5062e71d..02310182 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java
@@ -37,6 +37,11 @@ public class QmsIncomingInspectionTaskVO {
      */
     private String drawingNoVer;
 
+    /**
+     * 物料规格
+     */
+    private String materialSpecifications;
+
     /**
      * 检验标准id
      */
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
index feb6ff33..95287b34 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
@@ -42,7 +42,8 @@
         t.callback_result,
         t.warehouse,
         t.storage_days,
-        t.storage_location
+        t.storage_location,
+        t.detection_qty
         FROM qms_incoming_inspection_task t
         LEFT JOIN qms_qc_material m ON t.material_id = m.id
         LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id
@@ -177,51 +178,51 @@
     </select>
 
     <select id="getDetail" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskVO">
-        SELECT
-            t.id,
-            t.task_no,
-            t.material_id,
-            m.material_no,
-            m.material_desc,
-            m.drawing_no_ver,
-            t.inspection_standard_id,
-            s.version AS standard_version,
-            t.supplier_code,
-            t.supplier_name,
-            t.delivery_order_no,
-            t.delivery_order_line,
-            t.purchase_order_no,
-            t.purchase_order_line,
-            t.factory,
-            t.inspection_type,
-            t.inspection_qty,
-            t.qualified_qty,
-            t.unqualified_qty,
-            t.inspection_status,
-            t.inspection_result,
-            t.inspector_id,
-            t.inspector_name,
-            t.agent_id,
-            t.agent_name,
-            t.submit_time,
-            t.inspection_start_time,
-            t.inspection_finish_time,
-            t.required_finish_time,
-            t.is_overdue,
-            t2.task_no as related_task_no,
-            t.update_user_id,
-            t.update_user_name,
-            t.update_time,
-            t.purchase_group,
-            t.warehouse,
-            t.storage_location,
-            t.storage_days,
-            t.callback_result,
-            t.detection_qty
+        SELECT t.id,
+               t.task_no,
+               t.material_id,
+               m.material_no,
+               m.material_desc,
+               m.drawing_no_ver,
+               m.material_specifications,
+               t.inspection_standard_id,
+               s.version  AS standard_version,
+               t.supplier_code,
+               t.supplier_name,
+               t.delivery_order_no,
+               t.delivery_order_line,
+               t.purchase_order_no,
+               t.purchase_order_line,
+               t.factory,
+               t.inspection_type,
+               t.inspection_qty,
+               t.qualified_qty,
+               t.unqualified_qty,
+               t.inspection_status,
+               t.inspection_result,
+               t.inspector_id,
+               t.inspector_name,
+               t.agent_id,
+               t.agent_name,
+               t.submit_time,
+               t.inspection_start_time,
+               t.inspection_finish_time,
+               t.required_finish_time,
+               t.is_overdue,
+               t2.task_no as related_task_no,
+               t.update_user_id,
+               t.update_user_name,
+               t.update_time,
+               t.purchase_group,
+               t.warehouse,
+               t.storage_location,
+               t.storage_days,
+               t.callback_result,
+               t.detection_qty
         FROM qms_incoming_inspection_task t
-        LEFT JOIN qms_qc_material m ON t.material_id = m.id
-        LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id
-        LEFT JOIN qms_incoming_inspection_task t2 ON t.related_task_id = t2.id
+                 LEFT JOIN qms_qc_material m ON t.material_id = m.id
+                 LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id
+                 LEFT JOIN qms_incoming_inspection_task t2 ON t.related_task_id = t2.id
         WHERE t.id = #{id}
     </select>
 
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml
index 633f6884..5656dda7 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml
@@ -3,6 +3,6 @@
 <mapper namespace="com.nflg.wms.repository.mapper.QmsIncomingInspectionTaskRecordMapper">
 
     <select id="getCount" resultType="java.lang.Integer">
-        SELECT SUM(count) FROM qms_incoming_inspection_task_record WHERE task_id=#{taskId}
+        SELECT COALESCE(SUM(inspection_qty),0) FROM qms_incoming_inspection_task_record WHERE task_id=#{taskId}
     </select>
 </mapper>