From b17e1fcec8f13717102691605b3e191c2de2d256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 29 Apr 2026 10:30:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E4=BC=98=E5=8C=96=E9=80=81?= =?UTF-8?q?=E6=A3=80=E5=8F=8A=E6=A3=80=E6=B5=8B=E6=95=B0=E9=87=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整送检数量字段注释和校验信息的描述 - 在入库检验任务服务逻辑中根据检测方法设置检测数量 - 实体及VO中新增检测数量与已检数量属性，并计算未检数量 - Mapper接口及XML新增获取已检数量的数据库查询方法 - 在获取任务详情时设置已检数量以供前端显示使用 --- ...comingInspectionTaskControllerService.java | 25 +++++++++++++++++++ .../qo/ExternalIncomingInspectionApplyQO.java | 6 ++--- .../pojo/vo/QmsIncomingInspectionTaskVO.java | 21 +++++++++++++++- .../entity/QmsIncomingInspectionTask.java | 7 +++++- .../QmsIncomingInspectionTaskMapper.java | 2 ++ .../IQmsIncomingInspectionTaskService.java | 2 ++ .../QmsIncomingInspectionTaskServiceImpl.java | 5 ++++ .../QmsIncomingInspectionTaskMapper.xml | 8 +++++- 8 files changed, 70 insertions(+), 6 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 a1c0b4e6..e97733df 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 @@ -224,6 +224,18 @@ public class IncomingInspectionTaskControllerService { .setTriggerTime(LocalDateTime.now()) ); } + + // 9. 设置检测数量 + Integer total; + if (Objects.equals(standard.getTestingMethodDictItemId(), dictionaryItemService.getIdByCode("InspectionStandardTestingMethod", "Full"))) { + total = task.getInspectionQty(); + } else { + total = getCountOfSampling(task.getId(), task.getInspectionQty(), standard); + } + incomingInspectionTaskService.lambdaUpdate() + .set(QmsIncomingInspectionTask::getDetectionQty, total) + .eq(QmsIncomingInspectionTask::getId, task.getId()) + .update(); } /** @@ -333,6 +345,18 @@ public class IncomingInspectionTaskControllerService { .setTriggerTime(LocalDateTime.now()) ); } + + // 9. 设置检测数量 + Integer total; + if (Objects.equals(standard.getTestingMethodDictItemId(), dictionaryItemService.getIdByCode("InspectionStandardTestingMethod", "Full"))) { + total = task.getInspectionQty(); + } else { + total = getCountOfSampling(task.getId(), task.getInspectionQty(), standard); + } + incomingInspectionTaskService.lambdaUpdate() + .set(QmsIncomingInspectionTask::getDetectionQty, total) + .eq(QmsIncomingInspectionTask::getId, task.getId()) + .update(); } private DictionaryItem getAql(Long id, List aqls) { @@ -521,6 +545,7 @@ public class IncomingInspectionTaskControllerService { public QmsIncomingInspectionTaskVO getDetail(Long id) { QmsIncomingInspectionTaskVO detail = incomingInspectionTaskService.getDetail(id); VUtil.trueThrowBusinessError(Objects.isNull(detail)).throwMessage("任务不存在"); + detail.setInspectedQty(incomingInspectionTaskService.getInspectedQty(id)); return detail; } 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 36ec25c9..5fa62a89 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 @@ -66,10 +66,10 @@ public class ExternalIncomingInspectionApplyQO { private String factory; /** - * 检验数量（必填），即送检数量 + * 送检数量（必填） */ - @NotNull(message = "检验数量不能为空") - @Min(value = 1, message = "检验数量必须大于0") + @NotNull(message = "送检数量不能为空") + @Min(value = 1, message = "送检数量必须大于0") private Integer inspectionQty; /** 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 1a27ed8a..f25eb69a 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 @@ -103,7 +103,7 @@ public class QmsIncomingInspectionTaskVO { private Integer inspectionType; /** - * 检验数量 + * 送检数量 */ private Integer inspectionQty; @@ -117,6 +117,25 @@ public class QmsIncomingInspectionTaskVO { */ private Integer unqualifiedQty; + /** + * 检测数量 + */ + private Integer detectionQty; + + /** + * 已检数量 + */ + private Integer inspectedQty; + + /** + * 未检数量 + */ + private Integer uninspectedQty; + + public Integer getUninspectedQty() { + return detectionQty - inspectedQty; + } + /** * 检验状态：0=待检，1=已检 */ 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 178216c0..709a9297 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 @@ -88,7 +88,7 @@ public class QmsIncomingInspectionTask implements Serializable { private Integer inspectionType; /** - * 检验数量，即送检数量 + * 送检数量 */ private Integer inspectionQty; @@ -102,6 +102,11 @@ public class QmsIncomingInspectionTask implements Serializable { */ private Integer unqualifiedQty; + /** + * 检测数量 + */ + private Integer detectionQty; + /** * 检验状态：0=待检，1=检验中，2=已检 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIncomingInspectionTaskMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIncomingInspectionTaskMapper.java index 7d302ce2..3d28d4f7 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIncomingInspectionTaskMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIncomingInspectionTaskMapper.java @@ -21,4 +21,6 @@ public interface QmsIncomingInspectionTaskMapper extends BaseMapper +