nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java

@@ -187,7 +187,7 @@ public class IncomingInspectionTaskControllerService {
 
         // 7. 构建并保存来料检测任务
         QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
-                .setRequestNo(request.getRequestNo())
+                .setCheckNo(request.getCheckNo())
                 .setTaskNo(taskNo)
                 .setMaterialId(material.getId())
                 .setInspectionStandardId(standard.getId())
@@ -312,7 +312,7 @@ public class IncomingInspectionTaskControllerService {
 
         // 7. 构建并保存库存检测任务（存入来料检测任务表，dataType=1）
         QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
-                .setRequestNo(request.getRequestNo())
+                .setCheckNo(request.getCheckNo())
                 .setTaskNo(taskNo)
                 .setMaterialId(material.getId())
                 .setInspectionStandardId(standard.getId())

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsQcMaterialControllerService.java

@@ -113,14 +113,13 @@ public class QmsQcMaterialControllerService {
         // 构建当前节点完整路径：parentTree.id（若 parentTree 为空则直接取 id）
         String fullPath = StrUtil.isBlank(category.getParentTree())
                 ? String.valueOf(category.getId())
-                : category.getParentTree();
+                : category.getParentTree() + "." + category.getId();
 
         // 一次查询：自身 + 直接子节点（parentTree=fullPath）+ 孙级及更深（parentTree LIKE 'fullPath.%'）
-        // parent_tree 为 ltree 类型，需显式转为 text 才能与 varchar 比较
         return qcMaterialCategoryService.lambdaQuery()
                 .eq(QmsQcMaterialCategory::getCategoryCode, categoryCode)
-                .or().apply("parent_tree::text = {0}", fullPath)
+                .or().eq(QmsQcMaterialCategory::getParentTree, fullPath)
-                .or().apply("parent_tree::text LIKE {0}", fullPath + ".%")
+                .or().likeRight(QmsQcMaterialCategory::getParentTree, fullPath + ".")
                 .list()
                 .stream()
                 .map(QmsQcMaterialCategory::getCategoryCode)

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java

@@ -104,7 +104,8 @@ public class WmsIncomingInspectionTaskCallbackService {
     private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) {
         WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO()
                 .setTaskNo(taskVO.getTaskNo())
-                .setRequestNo(taskVO.getRequestNo())
+                .setCheckNo(taskVO.getCheckNo())
+                .setCheckNo(taskVO.getCheckNo())
                 .setMaterialNo(taskVO.getMaterialNo())
                 .setFactory(taskVO.getFactory())
                 .setWarehouse(taskVO.getWarehouse())

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java

@@ -12,10 +12,10 @@ import lombok.Data;
 public class ExternalIncomingInspectionApplyQO {
 
     /**
-     * 请求单号，第三方唯一编号
+     * 检验单号，第三方唯一编号
      */
-    @NotBlank(message = "请求单号不能为空")
+    @NotBlank(message = "检验单号不能为空")
-    private String requestNo;
+    private String checkNo;
 
     /**
      * 物料编号（必填）

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java

@@ -12,10 +12,10 @@ import lombok.Data;
 public class ExternalInventoryInspectionApplyQO {
 
     /**
-     * 请求单号，第三方唯一编号
+     * 检验单号，第三方唯一编号
      */
-    @NotBlank(message = "请求单号不能为空")
+    @NotBlank(message = "检验单号不能为空")
-    private String requestNo;
+    private String checkNo;
 
     /**
      * 物料编号（必填）

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java

@@ -16,9 +16,9 @@ public class WmsInventoryInspectionTaskCallbackQO {
     private String taskNo;
 
     /**
-     * 请求单号，第三方唯一编号
+     * 检验单号，第三方唯一编号
      */
-    private String requestNo;
+    private String checkNo;
 
     /**
      * 物料编号

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java

@@ -18,9 +18,9 @@ public class QmsIncomingInspectionTaskVO {
     private String taskNo;
 
     /**
-     * 请求单号，第三方唯一编号
+     * 检验单号，第三方唯一编号
      */
-    private String requestNo;
+    private String checkNo;
 
     /**
      * 物料id

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java

@@ -38,9 +38,9 @@ public class QmsIncomingInspectionTask implements Serializable {
     private String taskNo;
 
     /**
-     * 请求单号，第三方唯一编号
+     * 检验单号，第三方唯一编号
      */
-    private String requestNo;
+    private String checkNo;
 
     /**
      * 物料id，关联质检物料表