From 12d0e0ca71d89cf9407899debab880f68e5db1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 6 May 2026 17:20:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=96=B0=E5=A2=9E=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=B9=B6=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E7=9B=B8=E5=85=B3=E6=B5=81=E7=A8=8B=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QmsIncomingInspectionTask实体及对应Mapper中添加checkNo字段 - 在IncomingInspectionTaskControllerService中设置并保存检验单号 - 在InventoryInspectionTaskCallbackService中传递检验单号信息 - 在ExternalIncomingInspectionApplyQO及ExternalInventoryInspectionApplyQO中新增检验单号校验 - 修改回调参数类WmsInventoryInspectionTaskCallbackQO，增加检验单号字段与检测数量替代送检数量 - 在DepartmentServiceImpl中完善新增和复制部门时的负责人ID与姓名设置 --- .../IncomingInspectionTaskControllerService.java | 2 ++ .../WmsIncomingInspectionTaskCallbackService.java | 4 +++- .../pojo/qo/ExternalIncomingInspectionApplyQO.java | 6 ++++++ .../pojo/qo/ExternalInventoryInspectionApplyQO.java | 6 ++++++ .../pojo/qo/WmsInventoryInspectionTaskCallbackQO.java | 10 ++++++++-- .../common/pojo/vo/QmsIncomingInspectionTaskVO.java | 5 +++++ .../repository/entity/QmsIncomingInspectionTask.java | 5 +++++ .../repository/service/impl/DepartmentServiceImpl.java | 8 ++++++-- .../mapper/QmsIncomingInspectionTaskMapper.xml | 3 +++ 9 files changed, 44 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 01a9b8dd..b8115c5c 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 @@ -187,6 +187,7 @@ public class IncomingInspectionTaskControllerService { // 7. 构建并保存来料检测任务 QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() + .setCheckNo(request.getCheckNo()) .setTaskNo(taskNo) .setMaterialId(material.getId()) .setInspectionStandardId(standard.getId()) @@ -311,6 +312,7 @@ public class IncomingInspectionTaskControllerService { // 7. 构建并保存库存检测任务（存入来料检测任务表，dataType=1） QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() + .setCheckNo(request.getCheckNo()) .setTaskNo(taskNo) .setMaterialId(material.getId()) .setInspectionStandardId(standard.getId()) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java index ba4928ce..3371dc36 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java @@ -104,12 +104,14 @@ public class WmsIncomingInspectionTaskCallbackService { private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) { WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO() .setTaskNo(taskVO.getTaskNo()) + .setCheckNo(taskVO.getCheckNo()) + .setCheckNo(taskVO.getCheckNo()) .setMaterialNo(taskVO.getMaterialNo()) .setFactory(taskVO.getFactory()) .setWarehouse(taskVO.getWarehouse()) .setStorageLocation(taskVO.getStorageLocation()) .setStorageDays(taskVO.getStorageDays()) - .setInspectionQty(taskVO.getInspectionQty()) + .setDetectionQty(taskVO.getDetectionQty()) .setQualifiedQty(taskVO.getQualifiedQty()) .setUnqualifiedQty(taskVO.getUnqualifiedQty()) .setInspectionResult(taskVO.getInspectionResult()) 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 5fa62a89..136cc2dc 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 @@ -11,6 +11,12 @@ import lombok.Data; @Data public class ExternalIncomingInspectionApplyQO { + /** + * 检验单号，第三方唯一编号 + */ + @NotBlank(message = "检验单号不能为空") + private String checkNo; + /** * 物料编号（必填） */ 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 672a609c..35008f96 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 @@ -11,6 +11,12 @@ import lombok.Data; @Data public class ExternalInventoryInspectionApplyQO { + /** + * 检验单号，第三方唯一编号 + */ + @NotBlank(message = "检验单号不能为空") + private String checkNo; + /** * 物料编号（必填） */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java index 1602fdda..726d77ea 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.experimental.Accessors; @@ -14,6 +15,11 @@ public class WmsInventoryInspectionTaskCallbackQO { */ private String taskNo; + /** + * 检验单号，第三方唯一编号 + */ + private String checkNo; + /** * 物料编号 */ @@ -40,9 +46,9 @@ public class WmsInventoryInspectionTaskCallbackQO { private Integer storageDays; /** - * 送检数量 + * 检测数量 */ - private Integer inspectionQty; + private Integer detectionQty; /** * 合格数量 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 02310182..6ee34fd8 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 @@ -17,6 +17,11 @@ public class QmsIncomingInspectionTaskVO { */ private String taskNo; + /** + * 检验单号，第三方唯一编号 + */ + private String checkNo; + /** * 物料id */ 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 709a9297..202c555b 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 @@ -37,6 +37,11 @@ public class QmsIncomingInspectionTask implements Serializable { */ private String taskNo; + /** + * 检验单号，第三方唯一编号 + */ + private String checkNo; + /** * 物料id，关联质检物料表 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java index 70cbe507..e7bfcf83 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java @@ -50,7 +50,9 @@ public class DepartmentServiceImpl extends ServiceImpl SELECT t.id, t.task_no, + t.check_no, t.material_id, m.material_no, m.material_desc,