From e5aff5af5b56a9ee092735fb931948d3badacc27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 9 Jun 2026 08:46:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(inspection):=20=E4=BF=AE=E5=A4=8D=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E4=B8=AD=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加了对物料唯一编号不为空的条件判断 - 新增二维码有效性验证功能 - 保留原有的物料重复检验检查逻辑 - 确保只有在物料唯一编号存在时才执行验证流程 --- ...IncomingInspectionTaskControllerService.java | 17 ++++++++++++----- 1 file changed, 12 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 5ac33d32..f4f27ec5 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 @@ -997,11 +997,18 @@ 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("该物料已检验过"); + if(StrUtil.isNotBlank(request.getMaterialUniqueNo())){ + VUtil.trueThrowBusinessError(!incomingInspectionTaskQrService.lambdaQuery() + .eq(QmsIncomingInspectionTaskQr::getTaskId, request.getTaskId()) + .eq(QmsIncomingInspectionTaskQr::getMaterialQrCode, request.getMaterialUniqueNo()) + .exists() + ).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("超出总检验数量");