From fbf30750da6fb963529770b50698db6345bca80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 5 Jun 2026 15:11:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(incoming-inspection):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=AA=8C=E8=AF=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=B0=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 getItemsForCheck 方法中的 @Valid 注解 - 添加二维码唯一编号字段到 QmsIncomingInspectionTaskTodoCheckItemsQO 类 - 在 getItemsForCheck 方法中增加二维码验证逻辑 - 验证二维码唯一编号是否为空的业务错误 - 验证二维码唯一编号是否有效的业务规则 - 根据任务ID查询并验证二维码列表中的匹配关系 --- .../service/IncomingInspectionTaskControllerService.java | 8 +++++++- .../qo/QmsIncomingInspectionTaskTodoCheckItemsQO.java | 5 +++++ 2 files changed, 12 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 5d4a5497..bc8f119b 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 @@ -859,9 +859,15 @@ public class IncomingInspectionTaskControllerService { // }).toList(); // } - public QmsIncomingInspectionTaskCheckDetailVO getItemsForCheck(@Valid QmsIncomingInspectionTaskTodoCheckItemsQO request) { + public QmsIncomingInspectionTaskCheckDetailVO getItemsForCheck(QmsIncomingInspectionTaskTodoCheckItemsQO request) { QmsIncomingInspectionTask task = incomingInspectionTaskService.getById(request.getTaskId()); VUtil.trueThrowBusinessError(Objects.isNull(task)).throwMessage("任务不存在"); + List qrs = incomingInspectionTaskQrService.lambdaQuery().eq(QmsIncomingInspectionTaskQr::getTaskId, task.getId()).list(); + if (CollectionUtil.isNotEmpty(qrs)) { + VUtil.trueThrowBusinessError(StrUtil.isBlank(request.getQrCode())).throwMessage("二维码唯一编号不能为空"); + VUtil.trueThrowBusinessError(qrs.stream().noneMatch(qr -> qr.getMaterialQrCode().equals(request.getQrCode()))) + .throwMessage("无效的二维码唯一编号"); + } QmsInspectionStandard standard = inspectionStandardService.getById(task.getInspectionStandardId()); VUtil.trueThrowBusinessError(Objects.isNull(standard)).throwMessage("检验标准不存在"); List datas = inspectionStandardService.getItemsForCheck(standard.getId()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckItemsQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckItemsQO.java index dcf437b3..1248d8aa 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckItemsQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckItemsQO.java @@ -17,4 +17,9 @@ public class QmsIncomingInspectionTaskTodoCheckItemsQO { */ @NotNull(message = "数量不能为空") private Integer num; + + /** + * 二维码唯一编号 + */ + private String qrCode; }