From c4fb65a699596f46d968451b972cf6fa83a1f6da Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 08 四月 2026 13:35:51 +0800
Subject: [PATCH] fix: 产品没有回显基本单位和备注
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java | 9 ++++++---
src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java | 5 +++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java b/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java
index 7b3e6bd..c22fbba 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java
@@ -35,5 +35,10 @@
@ApiModelProperty("鐗╂枡鍚嶇О")
private String productName;
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
}
\ No newline at end of file
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 33d4399..f54b264 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialServiceImpl.java
@@ -271,8 +271,7 @@
@Override
public List<ProductMaterialGroupDto> ProductMaterialList(Integer type) {
List<ProductMaterialConfig> configList = productMaterialConfigService.list(new LambdaQueryWrapper<ProductMaterialConfig>()
- .eq(ProductMaterialConfig::getConfigType, MaterialConfigTypeEnum.MATERIAL_TYPE.name())
- );
+ .eq(ProductMaterialConfig::getConfigType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
if (CollectionUtils.isEmpty(configList)) {
return new ArrayList<>();
}
@@ -284,7 +283,9 @@
ProductMaterial::getId,
ProductMaterial::getMaterialTypeId,
ProductMaterial::getInventoryCategoryId,
- ProductMaterial::getProductName
+ ProductMaterial::getProductName,
+ ProductMaterial::getUnit,
+ ProductMaterial::getRemark
)
);
materialMap = materialList.stream()
@@ -359,6 +360,8 @@
dto.setProductName(m.getProductName());
dto.setMaterialTypeId(m.getMaterialTypeId());
dto.setInventoryCategoryId(m.getInventoryCategoryId());
+ dto.setUnit(m.getUnit());
+ dto.setRemark(m.getRemark());
return dto;
}
--
Gitblit v1.9.3