From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
index e0b5d50..00e33da 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSaveReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemStatusUpdateReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.item.vo.MdmItemSyncUpdateReqVO;
+import cn.iocoder.yudao.module.mdm.dal.dataobject.brand.MdmBrandDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.category.MdmItemCategoryDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemBatchConfigDO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.item.MdmItemDO;
@@ -179,6 +180,9 @@
// 鍏宠仈鏌ヨ璁￠噺鍗曚綅鍚嶇О
Map<Long, MdmUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
convertSet(itemList, MdmItemDO::getUnitMeasureId));
+ // 鍏宠仈鏌ヨ鍝佺墝鍚嶇О锛堥噰璐笅鍗曢渶瑕佺‘璁ゅ搧鐗岋級
+ Map<Long, MdmBrandDO> brandMap = brandService.getBrandMap(
+ convertSet(itemList, MdmItemDO::getBrandId));
// 杞崲
List<MdmItemRespVO> respList = BeanUtils.toBean(itemList, MdmItemRespVO.class);
// 鎵归噺鏌ヨ鍚屾鐘舵��
@@ -210,6 +214,11 @@
MdmUnitMeasureDO unit = unitMap.get(resp.getUnitMeasureId());
if (unit != null) {
resp.setUnitMeasureName(unit.getName());
+ }
+ // 鍝佺墝鍚嶇О
+ MdmBrandDO brand = brandMap.get(resp.getBrandId());
+ if (brand != null) {
+ resp.setBrandName(brand.getName());
}
MdmUnitMeasureDO auxUnit1 = auxUnitMap.get(resp.getUnitMeasureId2());
if (auxUnit1 != null) {
@@ -245,10 +254,16 @@
// 濉厖鍗曚綅鍚嶇О绛夊叧鑱斿瓧娈碉紝纭繚涓嬫媺閫夋嫨鍚庡彲甯﹀嚭鍗曚綅绛変俊鎭�
Map<Long, MdmUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
convertSet(respList, MdmItemRespVO::getUnitMeasureId));
+ Map<Long, MdmBrandDO> brandMap = brandService.getBrandMap(
+ convertSet(respList, MdmItemRespVO::getBrandId));
respList.forEach(resp -> {
MdmUnitMeasureDO unit = unitMap.get(resp.getUnitMeasureId());
if (unit != null) {
resp.setUnitMeasureName(unit.getName());
+ }
+ MdmBrandDO brand = brandMap.get(resp.getBrandId());
+ if (brand != null) {
+ resp.setBrandName(brand.getName());
}
});
return success(respList);
@@ -265,6 +280,13 @@
resp.setCategoryName(category.getName());
}
}
+ // 鍝佺墝鍚嶇О
+ if (resp.getBrandId() != null) {
+ MdmBrandDO brand = brandService.getBrand(resp.getBrandId());
+ if (brand != null) {
+ resp.setBrandName(brand.getName());
+ }
+ }
// 涓诲崟浣嶅悕绉�
if (resp.getUnitMeasureId() != null) {
MdmUnitMeasureDO unit = unitMeasureService.getUnitMeasure(resp.getUnitMeasureId());
--
Gitblit v1.9.3