WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

称重优化

Browse Source
This commit is contained in:
zc
2026-04-09 16:02:05 +08:00
parent 90eb4a1af8
commit 677349559c
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java
View File

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

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

@@ -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());