Merge remote-tracking branch '惠信/qms/develop' into qms/develop

- 在QmsIncomingInspectionIssueTicketAuditQO类中添加remark属性用于记录备注
- 在QmsIssueTicketControllerService服务中设置remark字段值
- 优化质检单审核流程，支持保存审批备注信息

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

@@ -566,6 +566,7 @@ public class QmsIssueTicketControllerService {
 
         entity.setApprovalStatus(request.getApprovalStatus())
                 .setStatus((short) 2)
+                .setRemark(request.getRemark())
                 .setCompleteTime(LocalDateTime.now())
                 .setApprovalOpinion(request.getApprovalOpinion())
                 .setIncidentType(request.getIncidentType())

nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java

@@ -2,6 +2,8 @@ package com.nflg.qms.admin;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.TypeReference;
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.json.JSONUtil;
@@ -31,7 +33,7 @@ public class ExternalIncomingInspectionTaskApiTest {
     /** 当前登录用户的 token */
     private static final String TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOjEsInJuU3RyIjoidVFwSWM2R3RJeUoxcFNSczBadzJzb1hvMUZLZXB3czkiLCJuYW1lIjoi6LaF57qn566h55CG5ZGYIiwiY29kZSI6ImFkbWluIiwicm9sZXMiOlsiU3VwZXJBZG1pbiJdLCJ0eXBlIjoxfQ.FtQ2uVwvuxsjAFbXnB006hV1pODtRhZT0z_9nfuR0So";
     /** 有效的物料编号（数据库中已存在，且有已发布检验标准和绑定的IQE） */
-    private static final String VALID_MATERIAL_NO = "2200052100";
+    private static final String VALID_MATERIAL_NO = "2200047982";
     /** 有效的所属工厂 */
     private static final String VALID_FACTORY = "1010";
     // ===================== 配置区结束 =====================
@@ -78,7 +80,7 @@ public class ExternalIncomingInspectionTaskApiTest {
         ExternalIncomingInspectionApplyQO request = buildValidApplyRequest();
         request.setMaterialNo(VALID_MATERIAL_NO);
 
-        ApiResult<Void> result = post("/external/incoming-inspection-task/apply", request, new TypeReference<>() {});
+        ApiResult<Void> result = post("/external/incoming-inspection-task/incoming-apply", request, new TypeReference<>() {});
         assertSuccess(result, "来料检验申请失败");
         System.out.println("  ✅ 来料检验申请成功");
     }
@@ -241,6 +243,15 @@ public class ExternalIncomingInspectionTaskApiTest {
         request.setMaterialNo(VALID_MATERIAL_NO);
         request.setFactory(VALID_FACTORY);
         request.setInspectionQty(100);
+        request.setRequestNo(UUID.randomUUID().toString());
+        request.setDeliveryOrderNo(RandomUtil.randomNumbers(10));
+        request.setDeliveryOrderLine(RandomUtil.randomNumbers(2));
+        request.setPurchaseGroup(RandomUtil.randomNumbers(3));
+        request.setPurchaseOrderNo(RandomUtil.randomNumbers(10));
+        request.setPurchaseOrderLine(RandomUtil.randomNumbers(2));
+        request.setSupplierCode("SUP_001");
+        request.setSupplierName("测试供应商");
+        request.setInspectionType(0);
         return request;
     }
 }

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

@@ -30,6 +30,11 @@ public class QmsIncomingInspectionIssueTicketAuditQO {
      */
     private String approvalOpinion;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 事故类型：0=一般，1=较严重，2=严重
      */