From 756e13ccd124d29fc7a61c0267a4e6423b277a6c Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 19 May 2026 10:12:09 +0800
Subject: [PATCH] =?UTF-8?q?1449=20MPM=E5=90=8C=E6=AD=A5=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=8A=E9=92=A2=E6=9E=84=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/service/StructuralPackageControllerService.java   | 6 ++----
 .../com/nflg/wms/common/pojo/dto/PackageMaterialDTO.java    | 2 +-
 .../main/java/com/nflg/wms/common/pojo/vo/TrayItemVO.java   | 2 +-
 .../wms/repository/service/impl/WmsMaterialServiceImpl.java | 2 +-
 4 files changed, 5 insertions(+), 7 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 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<WmsMaterialMapper, WmsMa
 
     @Override
     public void add(WmsMaterial wmsMaterial) {
-        VUtil.trueThrowBusinessError(wmsMaterial.getVersion()==1
+        VUtil.trueThrowBusinessError("1".equals(wmsMaterial.getVersion())
                         && lambdaQuery().eq(WmsMaterial::getNo, wmsMaterial.getNo()).exists())
                 .throwMessage("SAP料号已存在");
         save(wmsMaterial);