From 22f880117d9e44085beec589084411dd80874c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 20 Apr 2026 15:33:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(QmsInspectionStandard):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E7=B1=BB=E5=9E=8B=E5=B9=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将QmsInspectionStandard实体中version字段类型由Integer改为String - 注释掉自动生成版本号的方法及相关调用，修改为直接使用传入的version值 - QmsInspectionStandardControllerService中设置版本号及启用状态使用编辑请求数据 - QmsInspectionStandardEditQO中新增version和isEnabled字段，增加参数校验 - 将部分流操作由collect(Collectors.toList())替换为toList()方法调用，提高代码简洁性 --- ...msInspectionStandardControllerService.java | 64 ++++++++++--------- .../pojo/qo/QmsInspectionStandardEditQO.java | 13 ++++ .../entity/QmsInspectionStandard.java | 2 +- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java index f779a03f..c24c0ba5 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java @@ -255,12 +255,12 @@ public class QmsInspectionStandardControllerService { LocalDateTime now = LocalDateTime.now(); // 自动生成版本号：查询该物料已发布的最大版本号，如果存在则加1，否则默认为1 - Integer versionNo = generateVersionNo(qo.getMaterialId()); +// Integer versionNo = generateVersionNo(qo.getMaterialId()); QmsInspectionStandard standard = new QmsInspectionStandard(); standard.setMaterialId(qo.getMaterialId()); standard.setDrawingUrl(qo.getDrawingUrl()); - standard.setVersion(versionNo); +// standard.setVersion(versionNo); standard.setPackagingMethodId(qo.getPackagingMethodId()); standard.setInspectionCycle(qo.getInspectionCycle()); // 默认值 @@ -285,34 +285,34 @@ public class QmsInspectionStandardControllerService { return standard.getId(); } - /** - * 生成版本号：查询该物料已发布的最大版本号，如果存在则加1，否则默认为1 - * @param materialId 物料ID - * @return 版本号 - */ - private Integer generateVersionNo(Long materialId) { - // 查询该物料已发布的检验标准 - List publishedStandards = inspectionStandardService.lambdaQuery() - .eq(QmsInspectionStandard::getMaterialId, materialId) - .eq(QmsInspectionStandard::getPublishStatus, 1) - .isNotNull(QmsInspectionStandard::getVersion) - .list(); - - if (publishedStandards == null || publishedStandards.isEmpty()) { - // 如果没有已发布的版本，默认版本号为1 - return 1; - } - - // 查找最大版本号 - int maxVersion = publishedStandards.stream() - .map(QmsInspectionStandard::getVersion) - .mapToInt(version -> version != null ? version : 0) - .max() - .orElse(0); - - // 返回最大版本号加1 - return maxVersion + 1; - } +// /** +// * 生成版本号：查询该物料已发布的最大版本号，如果存在则加1，否则默认为1 +// * @param materialId 物料ID +// * @return 版本号 +// */ +// private Integer generateVersionNo(Long materialId) { +// // 查询该物料已发布的检验标准 +// List publishedStandards = inspectionStandardService.lambdaQuery() +// .eq(QmsInspectionStandard::getMaterialId, materialId) +// .eq(QmsInspectionStandard::getPublishStatus, 1) +// .isNotNull(QmsInspectionStandard::getVersion) +// .list(); +// +// if (publishedStandards == null || publishedStandards.isEmpty()) { +// // 如果没有已发布的版本，默认版本号为1 +// return 1; +// } +// +// // 查找最大版本号 +// int maxVersion = publishedStandards.stream() +// .map(QmsInspectionStandard::getVersion) +// .mapToInt(version -> version != null ? version : 0) +// .max() +// .orElse(0); +// +// // 返回最大版本号加1 +// return maxVersion + 1; +// } /** * 编辑检验标准（包含检测项列表） @@ -340,6 +340,8 @@ public class QmsInspectionStandardControllerService { standard.setDrawingUrl(qo.getDrawingUrl()); standard.setPackagingMethodId(qo.getPackagingMethodId()); standard.setInspectionCycle(qo.getInspectionCycle()); + standard.setVersion(qo.getVersion()); + standard.setIsEnabled(qo.getIsEnabled()); // 审计字段 standard.setUpdateUserId(userId); standard.setUpdateUserName(userName); @@ -369,7 +371,7 @@ public class QmsInspectionStandardControllerService { .list() .stream() .map(QmsInspectionStandardItem::getId) - .collect(Collectors.toList()); + .toList(); // 处理传入的检测项 List newItemIds = new ArrayList<>(); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java index 9b6a3cce..5463dbf5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,4 +17,16 @@ public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO { */ @NotNull(message = "检验标准ID不能为空") private Long id; + + /** + * 版本号 + */ + @NotBlank + private String version; + + /** + * 是否启用 + */ + @NotNull + private Boolean isEnabled; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectionStandard.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectionStandard.java index 301fb28e..79327ad9 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectionStandard.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectionStandard.java @@ -39,7 +39,7 @@ public class QmsInspectionStandard implements Serializable { /** * 版本号 */ - private Integer version; + private String version; /** * 是否启用