From 44b38a6ab7f4430a2d9c6230d516a27b484cc338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 14 May 2026 16:44:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(qms):=20=E4=BF=AE=E6=AD=A3=E4=B8=A5?= =?UTF-8?q?=E6=A0=BC=E6=80=A7=E6=A3=80=E6=9F=A5=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BALong?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将QmsCodeLetterMatrix中inspectionType字段类型由Short改为Long - 修改QmsSamplingPlanAddQO.CodeLetterMatrixQO中inspectionType字段类型为Long并添加非空校验 - 修正QmsSamplingPlanDetailVO中inspectionType字段类型为Long - 更新QmsSamplingPlanApiTest测试用例中inspectionType字段对应的数值类型为Long --- .../java/com/nflg/qms/admin/QmsSamplingPlanApiTest.java | 6 +++--- .../com/nflg/wms/common/pojo/qo/QmsSamplingPlanAddQO.java | 4 ++-- .../nflg/wms/common/pojo/vo/QmsSamplingPlanDetailVO.java | 2 +- .../com/nflg/wms/repository/entity/QmsCodeLetterMatrix.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/QmsSamplingPlanApiTest.java b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/QmsSamplingPlanApiTest.java index 23fa8b58..4720680c 100644 --- a/nflg-qms-admin/src/test/java/com/nflg/qms/admin/QmsSamplingPlanApiTest.java +++ b/nflg-qms-admin/src/test/java/com/nflg/qms/admin/QmsSamplingPlanApiTest.java @@ -254,7 +254,7 @@ public class QmsSamplingPlanApiTest { // 字码内容需要在codeLetters列表中存在，AQL优先值需要在aqlPriorityValues列表中存在 List matrices = new ArrayList<>(); QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix1 = new QmsSamplingPlanAddQO.CodeLetterMatrixQO(); - matrix1.setInspectionType((short) 0); // 正常检查 + matrix1.setInspectionType(2043888507669143553L); // 正常检查 matrix1.setCodeLetter("A"); // 关联字码列表中的"A" matrix1.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010 matrix1.setSampleSize(125); @@ -262,7 +262,7 @@ public class QmsSamplingPlanApiTest { matrix1.setAcValue(3); matrices.add(matrix1); QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix2 = new QmsSamplingPlanAddQO.CodeLetterMatrixQO(); - matrix2.setInspectionType((short) 1); // 正常检查 + matrix2.setInspectionType(2043888559619792897L); // 正常检查 matrix2.setCodeLetter("A"); // 关联字码列表中的"A" matrix2.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010 matrix2.setSampleSize(125); @@ -270,7 +270,7 @@ public class QmsSamplingPlanApiTest { matrix2.setAcValue(3); matrices.add(matrix2); QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix3 = new QmsSamplingPlanAddQO.CodeLetterMatrixQO(); - matrix3.setInspectionType((short) 2); // 正常检查 + matrix3.setInspectionType(2043888611771768833L); // 正常检查 matrix3.setCodeLetter("A"); // 关联字码列表中的"A" matrix3.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010 matrix3.setSampleSize(125); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanAddQO.java index 02c8eaf8..f6adf99a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanAddQO.java @@ -120,10 +120,10 @@ public class QmsSamplingPlanAddQO { @Data public static class CodeLetterMatrixQO { /** - * 严格性检查类型：0-正常检查，1-加严检查，2-放宽检查 + * 严格性检查类型，字典项id（InspectionStandardSQLType） */ @NotNull(message = "严格性检查类型不能为空") - private Short inspectionType; + private Long inspectionType; /** * 字码（关联codeLetters中的字码） diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSamplingPlanDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSamplingPlanDetailVO.java index 0bacf76b..3dc09458 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSamplingPlanDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsSamplingPlanDetailVO.java @@ -95,7 +95,7 @@ public class QmsSamplingPlanDetailVO extends QmsSamplingPlanVO { /** * 严格性检查类型：0-正常检查，1-加严检查，2-放宽检查 */ - private Short inspectionType; + private Long inspectionType; /** * 字码ID */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsCodeLetterMatrix.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsCodeLetterMatrix.java index d9a98b6c..146ff1ce 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsCodeLetterMatrix.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsCodeLetterMatrix.java @@ -31,9 +31,9 @@ public class QmsCodeLetterMatrix implements Serializable { private Long samplingPlanId; /** - * 严格性检查类型：0-正常检查，1-加严检查，2-放宽检查 + * 严格性检查类型，字典项id（InspectionStandardSQLType） */ - private Short inspectionType; + private Long inspectionType; /** * 字码ID