diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index 059145a..a9ec2aa 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -97,7 +97,7 @@ public class MaterialInfoResp extends BaseDetailResp { * 颜色灯光值 */ @Schema(description = "灯光等级") - @ExcelProperty(value = "灯光等级", converter = LightLevelEnumConverter.class, order = 4) + @ExcelProperty(value = "灯光等级", order = 4) private Integer lightLevel; /** diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index ece9466..0c95b69 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -215,17 +215,6 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl v1)); } - //处理灯光等级 - Map lightLevelMap = new HashMap<>(); - importMaterialList.forEach(row -> { - if (row.getLightLevelName() != null) { - Integer valueByDescription = LightLevelEnum.getValueByDescription(row.getLightLevelName()); - if (null != valueByDescription) { - lightLevelMap.put(row.getLightLevelName(), valueByDescription); - } - } - }); - // 批量操作数据库集合 List insertList = new ArrayList<>(); List updateByNameList = new ArrayList<>(); @@ -243,7 +232,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl