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; }