From 11b4dd11b470a4e230087bd23da424412ee27cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Sep 2025 10:21:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-721=20=E9=92=A2=E6=9E=84=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=94=AF=E6=8C=81=E5=AD=97=E6=AF=8D?= =?UTF-8?q?+=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/service/StructuralPackageControllerService.java | 3 +-- .../main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java | 4 ++-- .../com/nflg/wms/repository/entity/WmsStructuralPackage.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java index 49805331..f6d3d5a2 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java @@ -328,8 +328,7 @@ public class StructuralPackageControllerService { packageInfo.setRemark(remark); String version = row.getString(1); VUtil.trueThrowBusinessError(StrUtil.isBlank(version)).throwMessage("版本号不能为空"); - VUtil.trueThrowBusinessError(!NumberUtils.isCreatable(version)).throwMessage("版本号无效"); - packageInfo.setVersion(new BigDecimal(version)); + packageInfo.setVersion(version); VUtil.trueThrowBusinessError(packageService.lambdaQuery() .eq(WmsStructuralPackage::getNo, packageInfo.getNo()) .eq(WmsStructuralPackage::getVersion, packageInfo.getVersion()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java index 8d568614..df6bb311 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java @@ -54,8 +54,8 @@ public class PackageAddQO { /** * 版本号 */ - @NotNull - private BigDecimal version; + @NotBlank + private String version; /** * 修改日志 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackage.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackage.java index 9f6d8f9f..5e4a9573 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackage.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackage.java @@ -75,7 +75,7 @@ public class WmsStructuralPackage implements Serializable { /** * 版本号 */ - private BigDecimal version; + private String version; /** * 修改日志