称重优化

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;
 
     /**

wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java

@@ -215,17 +215,6 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
                 .collect(Collectors.toMap(MaterialTypeDO::getTypeName, MaterialTypeDO::getId, (k1, v1) -> v1));
         }
 
-        //处理灯光等级
-        Map<String, Integer> 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<MaterialInfoDO> insertList = new ArrayList<>();
         List<MaterialInfoDO> updateByNameList = new ArrayList<>();
@@ -243,7 +232,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
                 ? row.getMaterialProcess()
                 : null);
             materialDO.setMaterialTypeId(materialTypeMap.get(row.getTypeName()));
-            materialDO.setLightLevel(lightLevelMap.get(row.getLightLevelName()));
+            materialDO.setLightLevel(StrUtil.isNotBlank(row.getLightLevelName()) ? Integer.parseInt(row.getLightLevelName()) : null);
             // 修改 or 新增
             if (UPDATE.validate(req.getDuplicateName(), row.getMaterialName(), existName)) {
                 materialDO.setMaterialName(row.getMaterialName());