fix(inspection): 修复来料检验任务查询权限检查问题

- 添加了Page和PageData导入依赖
- 修改todoSearch方法中权限检查逻辑，当用户非质检人员时返回空分页数据而非抛出异常
- 修改countByCurrentUser方法中权限检查逻辑，当用户非质检人员时返回空计数对象而非抛出异常
- 在WmsIncomingInspectionTaskCallbackQO中添加requestNo字段并添加NotBlank注解验证
- 在回调服务中设置requestNo字段值用于第三方系统唯一标识请求单号

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

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())

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：来料检测；
      */