From 03760a64b8230dbde332d0f750bd34d2234ffc0c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 7 Nov 2025 09:21:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=94=B9=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=92=8C=E5=8E=9F=E6=96=99=E9=BB=98=E8=AE=A4=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=80=BC=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将产品默认属性值从具体值改为null- 将原料默认属性值从具体值改为null
- 统一处理产品和原料的默认属性逻辑
---
 .../com/klp/service/impl/WmsProductServiceImpl.java  | 12 ++++++------
 .../klp/service/impl/WmsRawMaterialServiceImpl.java  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
index 1c6a4b85..be191bf8 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
@@ -145,16 +145,16 @@ public class WmsProductServiceImpl implements IWmsProductService {
         if ("产品".equals(type)) {
             // 产品默认属性（根据截图）
             defaultAttrs = Arrays.asList(
-                new String[]{"规格", "0.6 * 1250"},
-                new String[]{"材质", "SPCC"},
-                new String[]{"表面处理", "涂油"}
+                new String[]{"规格", null},
+                new String[]{"材质", null},
+                new String[]{"表面处理", null}
             );
         } else {
             // 原料默认属性（根据截图）
             defaultAttrs = Arrays.asList(
-                new String[]{"规格", "4 * 1265"},
-                new String[]{"材质", "Q195L"},
-                new String[]{"厂家", "天铁"}
+                new String[]{"规格", null},
+                new String[]{"材质", null},
+                new String[]{"厂家", null}
             );
         }
 
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
index b1ec0ac4..806d7a45 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
@@ -255,16 +255,16 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
         if ("产品".equals(type)) {
             // 产品默认属性（根据截图）
             defaultAttrs = Arrays.asList(
-                new String[]{"规格", "0.6 * 1250"},
-                new String[]{"材质", "SPCC"},
-                new String[]{"表面处理", "涂油"}
+                new String[]{"规格", null},
+                new String[]{"材质", null},
+                new String[]{"表面处理", null}
             );
         } else {
             // 原料默认属性（根据截图）
             defaultAttrs = Arrays.asList(
-                new String[]{"规格", "4 * 1265"},
-                new String[]{"材质", "Q195L"},
-                new String[]{"厂家", "天铁"}
+                new String[]{"规格", null},
+                new String[]{"材质", null},
+                new String[]{"厂家", null}
             );
         }