DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
86156
2025-11-07 14:33:57 +08:00
parent e26a80dd3d 03760a64b8
commit 4dcb468c9b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
View File

@@ -145,16 +145,16 @@ public class WmsProductServiceImpl implements IWmsProductService {
if ("产品".equals(type)) { if ("产品".equals(type)) {
// 产品默认属性（根据截图） // 产品默认属性（根据截图）
defaultAttrs = Arrays.asList( defaultAttrs = Arrays.asList(
new String[]{"规格", "0.6 * 1250"}, new String[]{"规格", null},
new String[]{"材质", "SPCC"}, new String[]{"材质", null},
new String[]{"表面处理", "涂油"} new String[]{"表面处理", null}
); );
} else { } else {
// 原料默认属性（根据截图） // 原料默认属性（根据截图）
defaultAttrs = Arrays.asList( defaultAttrs = Arrays.asList(
new String[]{"规格", "4 * 1265"}, new String[]{"规格", null},
new String[]{"材质", "Q195L"}, new String[]{"材质", null},
new String[]{"厂家", "天铁"} new String[]{"厂家", null}
); );
} }

12
klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
View File

@@ -255,16 +255,16 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
if ("产品".equals(type)) { if ("产品".equals(type)) {
// 产品默认属性（根据截图） // 产品默认属性（根据截图）
defaultAttrs = Arrays.asList( defaultAttrs = Arrays.asList(
new String[]{"规格", "0.6 * 1250"}, new String[]{"规格", null},
new String[]{"材质", "SPCC"}, new String[]{"材质", null},
new String[]{"表面处理", "涂油"} new String[]{"表面处理", null}
); );
} else { } else {
// 原料默认属性（根据截图） // 原料默认属性（根据截图）
defaultAttrs = Arrays.asList( defaultAttrs = Arrays.asList(
new String[]{"规格", "4 * 1265"}, new String[]{"规格", null},
new String[]{"材质", "Q195L"}, new String[]{"材质", null},
new String[]{"厂家", "天铁"} new String[]{"厂家", null}
); );
} }