From 049ff61c245511ce321460194f5f17ef9f391809 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 16:28:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(inspection):=20=E5=A2=9E=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=94=AF=E4=B8=80=E7=BC=96=E5=8F=B7=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=8F=8A=E6=A3=80=E9=AA=8C=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 校验物料唯一编号不为空，防止传入空值 - 检查任务中物料是否已被检验，避免重复检验 - 验证当前检验数量未超过任务总检验数量减已检数量 - 优化异常提示信息，提高用户操作反馈准确性 --- .../service/IncomingInspectionTaskControllerService.java | 9 +++++++++ .../qo/QmsIncomingInspectionTaskTodoCheckSubmitQO.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) 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 fd47ef23..e057e307 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 @@ -809,6 +809,15 @@ public class IncomingInspectionTaskControllerService { QmsIncomingInspectionTask task = incomingInspectionTaskService.getById(request.getTaskId()); VUtil.trueThrowBusinessError(Objects.isNull(task)).throwMessage("任务不存在"); VUtil.trueThrowBusinessError(task.getInspectionStatus() == 2).throwMessage("该任务已完成"); + VUtil.trueThrowBusinessError(incomingInspectionTaskRecordService.lambdaQuery() + .eq(QmsIncomingInspectionTaskRecord::getTaskId, request.getTaskId()) + .eq(QmsIncomingInspectionTaskRecord::getMaterialUniqueNo, request.getMaterialUniqueNo()) + .exists() + ).throwMessage("该物料已检验过"); + Integer inspectedQty = incomingInspectionTaskService.getInspectedQty(task.getId()); + VUtil.trueThrowBusinessError(request.getInspectionQty() > (task.getDetectionQty() - inspectedQty)) + .throwMessage("超出总检验数量"); + LocalDateTime now = LocalDateTime.now(); Long userId = UserUtil.getUserId(); String userName = UserUtil.getUserName(); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitQO.java index cdabdb4f..180c0b4b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitQO.java @@ -1,6 +1,7 @@ package com.nflg.wms.common.pojo.qo; import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -22,7 +23,7 @@ public class QmsIncomingInspectionTaskTodoCheckSubmitQO { /** * 物料唯一编号 */ - @NotNull(message = "物料唯一编号不能为空") + @NotBlank(message = "物料唯一编号不能为空") private String materialUniqueNo; /**