From 5afb5cc0d06b235b284d140692c63c3cacb5047a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 13 May 2026 18:04:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?test(api):=20=E6=9B=B4=E6=96=B0=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E5=A2=9E=E5=BC=BA=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将有效的物料编号修改为2200047982 - 修改来料检验申请接口路径为 /external/incoming-inspection-task/incoming-apply - 使用 UUID 和随机数工具类生成请求号、交货单号、采购组等字段 - 添加供应商编码和名称的测试数据 - 设置检验类型为0以覆盖更多测试场景 --- .../ExternalIncomingInspectionTaskApiTest.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java index e7a617cd..b2381589 100644 --- a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/ExternalIncomingInspectionTaskApiTest.java +++ b/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 result = post("/external/incoming-inspection-task/apply", request, new TypeReference<>() {}); + ApiResult 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; } } From 58622ee443dc1a95732cab38a2738758efd4d3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 13 May 2026 18:11:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(qms):=20=E6=96=B0=E5=A2=9E=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E5=8D=95=E5=AE=A1=E6=A0=B8=E5=A4=87=E6=B3=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QmsIncomingInspectionIssueTicketAuditQO类中添加remark属性用于记录备注 - 在QmsIssueTicketControllerService服务中设置remark字段值 - 优化质检单审核流程，支持保存审批备注信息 --- .../qms/admin/service/QmsIssueTicketControllerService.java | 1 + .../pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index bdbdb09f..b6259f79 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/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()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java index 8f528bc6..aa4c8a01 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java +++ b/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=严重 */