From 9226417bd5de471a174c569e32be5a19339309a3 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 19 May 2026 10:19:40 +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

---
 .../processor/MaterialZipImportProcessor.java      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java
index 4ae2fe43..bf2df47d 100644
--- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java
+++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java
@@ -83,8 +83,20 @@ public class MaterialZipImportProcessor implements BasicProcessor {
                         WmsMaterial old = materialService.getCurrent(materialNo);
                         if (Objects.isNull(old) || StrUtil.isNotBlank(old.getImage())) {
                             omsLogger.info("添加图纸");
+                            // 计算新版本号
+                            String newVersion;
+                            if (Objects.isNull(old)) {
+                                newVersion = "1";
+                            } else {
+                                try {
+                                    int versionNum = Integer.parseInt(old.getVersion());
+                                    newVersion = String.valueOf(versionNum + 1);
+                                } catch (NumberFormatException e) {
+                                    newVersion = old.getVersion() + ".1";
+                                }
+                            }
                             WmsMaterial material = new WmsMaterial()
-                                    .setVersion(Objects.isNull(old) ? 1 : old.getVersion() + 1)
+                                    .setVersion(newVersion)
                                     .setNo(bomMaterialDTO.getMaterialNo())
                                     .setDescribe(bomMaterialDTO.getMaterialDesc())
                                     .setDrawingNo(bomMaterialDTO.getDrawingNo())