From b5f90961414b593bc30293b2ae3e66482db160d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 23 Jun 2026 10:34:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ExternalIncomingInspectionApplyQO 和 ExternalInventoryInspectionApplyQO 中新增 batchNo 字段 - 在 IncomingInspectionTaskControllerService 的任务创建和更新流程中设置批次号 - 在 QmsIncomingInspectionTask 实体中添加 batchNo 字段映射 - 更新 QmsIncomingInspectionTaskMapper.xml 中的查询语句以包含批次号字段 - 在 QmsIncomingInspectionTaskVO 中添加 batchNo 返回字段 --- .../service/IncomingInspectionTaskControllerService.java | 6 ++++-- .../pojo/qo/ExternalIncomingInspectionApplyQO.java | 5 +++++ .../pojo/qo/ExternalInventoryInspectionApplyQO.java | 5 +++++ .../wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java | 5 +++++ .../wms/repository/entity/QmsIncomingInspectionTask.java | 5 +++++ .../resources/mapper/QmsIncomingInspectionTaskMapper.xml | 9 ++++++--- 6 files changed, 30 insertions(+), 5 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 473b14a1..7041f4cc 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 @@ -213,7 +213,8 @@ public class IncomingInspectionTaskControllerService { .setInspectorId(inspectorId) .setInspectorName(inspectorName) .setSubmitTime(now) - .setRequiredFinishTime(requiredFinishTime); + .setRequiredFinishTime(requiredFinishTime) + .setBatchNo(request.getBatchNo()); incomingInspectionTaskService.save(task); @@ -352,7 +353,8 @@ public class IncomingInspectionTaskControllerService { .setInspectorId(inspectorId) .setInspectorName(inspectorName) .setSubmitTime(now) - .setRequiredFinishTime(requiredFinishTime); + .setRequiredFinishTime(requiredFinishTime) + .setBatchNo(request.getBatchNo()); incomingInspectionTaskService.save(task); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java index c172656e..48aa4e34 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java @@ -89,6 +89,11 @@ public class ExternalIncomingInspectionApplyQO { @NotBlank(message = "采购组不能为空") private String purchaseGroup; + /** + * 批次号 + */ + private String batchNo; + /** * 二维码列表 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java index cf3a02c3..78019dec 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java @@ -56,6 +56,11 @@ public class ExternalInventoryInspectionApplyQO { @Min(value = 1, message = "存储时长必须大于0") private Integer storageDays; + /** + * 批次号 + */ + private String batchNo; + /** * 二维码列表 */ 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 c2fc0947..774323b9 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 @@ -242,4 +242,9 @@ public class QmsIncomingInspectionTaskVO { * 检测方式，关联字典项id（字典编码：InspectionStandardTestingMethod） */ private Long testingMethodDictItemId; + + /** + * 批次号 + */ + private String batchNo; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java index 93422930..5c71f01a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java @@ -221,4 +221,9 @@ public class QmsIncomingInspectionTask implements Serializable { * 更新时间 */ private LocalDateTime updateTime; + + /** + * 批次号 + */ + private String batchNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml index ba27a2a6..164961f8 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml @@ -49,7 +49,8 @@ t.warehouse, t.storage_days, t.storage_location, - t.detection_qty + t.detection_qty, + t.batch_no 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 @@ -152,7 +153,8 @@ t.update_user_id, t.update_user_name, t.update_time, - t.detection_qty + t.detection_qty, + t.batch_no 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 @@ -228,7 +230,8 @@ t.storage_days, t.callback_result, t.detection_qty, - t.testing_method_dict_item_id + t.testing_method_dict_item_id, + t.batch_no 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