From 0d0dd802605c57dad9bbfc05dc791bdbdf541608 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 11:09:23 +0800
Subject: [PATCH] fix(mes,sql): 库存预警补单位名称，补齐演示角色缺失的菜单授权
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stockwarning/MesWmStockWarningServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stockwarning/MesWmStockWarningServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stockwarning/MesWmStockWarningServiceImpl.java
index ff44c9b..b9258a0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stockwarning/MesWmStockWarningServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stockwarning/MesWmStockWarningServiceImpl.java
@@ -8,10 +8,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.stockwarning.vo.MesWmStockWarningRulePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stockwarning.vo.MesWmStockWarningRuleRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stockwarning.vo.MesWmStockWarningRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stockwarning.MesWmStockWarningRuleDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.stockwarning.MesWmStockWarningRuleMapper;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
@@ -50,6 +52,8 @@
private MesWmStockWarningRuleMapper ruleMapper;
@Resource
private MesMdmItemService mdmItemService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
@Resource
private MesWmWarehouseService warehouseService;
@Resource
@@ -144,6 +148,9 @@
// 3. 閫愭潯瑙勫垯鍒ゆ柇鏄惁棰勮
Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
convertSet(rules, MesWmStockWarningRuleDO::getItemId));
+ // 鐗╂枡鍗曚綅鏉ヨ嚜璁￠噺鍗曚綅琛紝缂哄け鏃跺墠绔細鏄剧ず銆�--銆嶏紝杩欓噷琛ラ綈渚夸簬浠撶鐩存帴鍒ゆ柇缂哄彛澶у皬
+ Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
convertSet(rules, MesWmStockWarningRuleDO::getWarehouseId));
List<MesWmStockWarningAlertRespVO> alertList = new ArrayList<>();
@@ -168,6 +175,10 @@
if (item != null) {
alert.setItemCode(item.getCode());
alert.setItemName(item.getName());
+ MesMdUnitMeasureDO unit = unitMap.get(item.getUnitMeasureId());
+ if (unit != null) {
+ alert.setUnitName(unit.getName());
+ }
}
MesWmWarehouseDO warehouse = warehouseMap.get(rule.getWarehouseId());
if (warehouse != null) {
--
Gitblit v1.9.3