From b78f044e3ec24c0e4c2d477e469434d514cb3d42 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 12 三月 2026 17:32:18 +0800
Subject: [PATCH] 合并下发时判断ids是否存在
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
index b1dd5b4..bd32f1f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.AliDingConfig;
+import com.ruoyi.production.dto.ProductMaterialGroupDto;
import com.ruoyi.production.enums.MaterialConfigTypeEnum;
import com.ruoyi.production.mapper.ProductMaterialMapper;
import com.ruoyi.production.pojo.ProductMaterial;
@@ -337,29 +338,26 @@
}
@Override
- public Map<String, List<ProductMaterial>> ProductMaterialList(String materialName) {
+ public List<ProductMaterialGroupDto> ProductMaterialList(String materialName) {
- List<ProductMaterialConfig> materialConfigList =
- productMaterialConfigService.list(new LambdaQueryWrapper<ProductMaterialConfig>()
- .eq(ProductMaterialConfig::getConfigType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
+ List<ProductMaterialConfig> materialConfigList = productMaterialConfigService.list(new LambdaQueryWrapper<ProductMaterialConfig>()
+ .eq(ProductMaterialConfig::getConfigType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
- Map<String, List<ProductMaterial>> productMaterialMap = new HashMap<>();
+ List<ProductMaterialGroupDto> productMaterialMap = new ArrayList<>();
if (materialConfigList == null || materialConfigList.isEmpty()) {
return productMaterialMap;
}
for (ProductMaterialConfig materialConfig : materialConfigList) {
LambdaQueryWrapper<ProductMaterial> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProductMaterial::getMaterialTypeId, materialConfig.getId())
- .select(ProductMaterial::getId, ProductMaterial::getMaterialName)
.like(materialName != null && !materialName.isEmpty(), ProductMaterial::getMaterialName, materialName);
-
List<ProductMaterial> productMaterialList = list(wrapper);
-
- if (productMaterialList != null && !productMaterialList.isEmpty()) {
- productMaterialMap.put(materialConfig.getConfigName(), productMaterialList);
- }
+ ProductMaterialGroupDto dto = new ProductMaterialGroupDto();
+ dto.setConfigId(materialConfig.getId());
+ dto.setConfigName(materialConfig.getConfigName());
+ dto.setMaterialList(productMaterialList);
+ productMaterialMap.add(dto);
}
-
return productMaterialMap;
}
--
Gitblit v1.9.3