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 bb302b6a..8b122c28 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 @@ -276,10 +276,8 @@ public class StructuralPackageControllerService { } if (StrUtil.isBlank(dto.getVersion())) { sb.append("图纸版本不能为空;"); - } else if (!NumberUtils.isCreatable(dto.getVersion())) { - sb.append("图纸版本无效;"); } else { - materialDTO.setVersion(Integer.valueOf(dto.getVersion())); + materialDTO.setVersion(dto.getVersion()); } dto.setError(sb.toString()); materialDTO.setCreateBy(UserUtil.getUserName()); @@ -374,7 +372,7 @@ public class StructuralPackageControllerService { dto.setImage(material1.getImage()); String v = row.getString(6); if (StrUtil.isNotBlank(v)) { - dto.setVersion(Integer.valueOf(v)); + dto.setVersion(v); } else { dto.setVersion(material1.getVersion()); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java index ae7b7f15..eda70945 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java @@ -59,7 +59,7 @@ public class PackageMaterialDTO { * 版本 */ @NotNull - private Integer version; + private String version; /** * 图片 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java index cf4b62d1..4ef8fab3 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java @@ -33,7 +33,7 @@ public class TrayItemVO { /** * 版本 */ - private Integer version; + private String version; /** * 单重 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java index b2434200..2b357fef 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsMaterialServiceImpl.java @@ -32,7 +32,7 @@ public class WmsMaterialServiceImpl extends ServiceImpl