From 4c7f64565eb15b4773011d69bf8e2fe23d7bb151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 14 Jun 2026 17:02:25 +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=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加了Page和PageData导入依赖 - 修改todoSearch方法中权限检查逻辑，当用户非质检人员时返回空分页数据而非抛出异常 - 修改countByCurrentUser方法中权限检查逻辑，当用户非质检人员时返回空计数对象而非抛出异常 - 在WmsIncomingInspectionTaskCallbackQO中添加requestNo字段并添加NotBlank注解验证 - 在回调服务中设置requestNo字段值用于第三方系统唯一标识请求单号 --- .../IncomingInspectionTaskControllerService.java | 12 ++++++++---- .../WmsIncomingInspectionTaskCallbackService.java | 1 + .../pojo/qo/WmsIncomingInspectionTaskCallbackQO.java | 6 ++++++ 3 files changed, 15 insertions(+), 4 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 b2e425c6..5056af0f 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 @@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.exception.NflgException; +import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.*; import com.nflg.wms.common.util.UserUtil; @@ -738,8 +740,9 @@ public class IncomingInspectionTaskControllerService { .eq(QmsQualityInspector::getInspectionType, 1) .last("LIMIT 1") .one(); - VUtil.trueThrowBusinessError(Objects.isNull(inspector)) - .throwMessage("当前用户不是质检人员，无法查询待检验任务"); + if (Objects.isNull(inspector)){ + return Page.of(0,0,0); + } return incomingInspectionTaskService.todoSearch(request, inspector.getId()); } @@ -755,8 +758,9 @@ public class IncomingInspectionTaskControllerService { .eq(QmsQualityInspector::getInspectionType, 1) .last("LIMIT 1") .one(); - VUtil.trueThrowBusinessError(Objects.isNull(inspector)) - .throwMessage("当前用户不是质检人员，无法查询任务数量"); + if (Objects.isNull(inspector)){ + return new QmsIncomingInspectionTaskCountVO(); + } return incomingInspectionTaskService.countByCurrentUser(inspector.getId()); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java index b4057c10..0908f434 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java @@ -58,6 +58,7 @@ public class WmsIncomingInspectionTaskCallbackService { private void incoming(QmsIncomingInspectionTaskVO taskVO, Short processingResult) { WmsIncomingInspectionTaskCallbackQO qo = new WmsIncomingInspectionTaskCallbackQO() .setTaskNo(taskVO.getTaskNo()) + .setRequestNo(taskVO.getRequestNo()) .setInspectionType(taskVO.getInspectionType()) .setMaterialNo(taskVO.getMaterialNo()) .setSupplierCode(taskVO.getSupplierCode()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java index a9e2db63..3b9269d6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java @@ -1,6 +1,7 @@ package com.nflg.wms.common.pojo.qo; import com.nflg.wms.common.pojo.dto.MaterialQrCodeDTO; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.experimental.Accessors; @@ -15,6 +16,11 @@ public class WmsIncomingInspectionTaskCallbackQO { */ private String taskNo; + /** + * 请求单号，第三方唯一编号 + */ + private String requestNo; + /** * 检验类型，0：来料检测； */