rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: bug-721 钢构件版本号支持字母+数字

This commit is contained in:
曹鹏飞 2025-09-25 10:21:02 +08:00
parent e2a516abae
commit 11b4dd11b4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
View File

@ -328,8 +328,7 @@ public class StructuralPackageControllerService {
packageInfo.setRemark(remark); packageInfo.setRemark(remark);
String version = row.getString(1); String version = row.getString(1);
VUtil.trueThrowBusinessError(StrUtil.isBlank(version)).throwMessage("版本号不能为空"); VUtil.trueThrowBusinessError(StrUtil.isBlank(version)).throwMessage("版本号不能为空");
VUtil.trueThrowBusinessError(!NumberUtils.isCreatable(version)).throwMessage("版本号无效"); packageInfo.setVersion(version);
packageInfo.setVersion(new BigDecimal(version));
VUtil.trueThrowBusinessError(packageService.lambdaQuery() VUtil.trueThrowBusinessError(packageService.lambdaQuery()
.eq(WmsStructuralPackage::getNo, packageInfo.getNo()) .eq(WmsStructuralPackage::getNo, packageInfo.getNo())
.eq(WmsStructuralPackage::getVersion, packageInfo.getVersion()) .eq(WmsStructuralPackage::getVersion, packageInfo.getVersion())

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java
View File

@ -54,8 +54,8 @@ public class PackageAddQO {
/** /**
* 版本号 * 版本号
*/ */
@NotNull @NotBlank
private BigDecimal version; private String version;
/** /**
* 修改日志 * 修改日志

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackage.java
View File

@ -75,7 +75,7 @@ public class WmsStructuralPackage implements Serializable {
/** /**
* 版本号 * 版本号
*/ */
private BigDecimal version; private String version;
/** /**
* 修改日志 * 修改日志