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("超出总检验数量");