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): 库存预警补单位名称,补齐演示角色缺失的菜单授权

---
 scripts/cfwj-demo-seed-20261103/README.md                                                                            |    4 
 scripts/cfwj-demo-seed-20261103/seed_cfwj_docs.py                                                                    |   12 ++++
 docs/sql/cfwj_role_menu_gap_20261103.sql                                                                             |  114 ++++++++++++++++++++++++++++++++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stockwarning/MesWmStockWarningServiceImpl.java |   11 +++
 4 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/docs/sql/cfwj_role_menu_gap_20261103.sql b/docs/sql/cfwj_role_menu_gap_20261103.sql
new file mode 100644
index 0000000..bb44581
--- /dev/null
+++ b/docs/sql/cfwj_role_menu_gap_20261103.sql
@@ -0,0 +1,114 @@
+-- 璇氬彂浜旈噾锛圕FWJ锛夎鑹茶彍鍗曟巿鏉冭ˉ婕� 2026-11-03
+-- 鑳屾櫙锛氳彍鍗曡ˉ榻愬悗浠嶆湁鑻ュ共椤甸潰鍙巿鏉冪粰浜嗚秴绠★紙role_id=1锛夛紝鏅�氭紨绀鸿鑹茬湅涓嶅埌锛�
+--       鍙﹀銆岃鍒掓帓绋嬨�嶉《绾х洰褰曟湰韬病鏈夋巿鏉冭褰曪紝浼氬鑷村叾涓嬬殑鐢熶骇璁″垝/鐢熶骇鎺掍骇鍦ㄦ櫘閫氳鑹茶彍鍗曟爲閲岃涓㈠純銆�
+-- 瑙掕壊锛�163 璁惧 / 164 璐ㄩ噺 / 165 閿�鍞� / 166 鐢熶骇绠$悊鍛� / 167 鐢熶骇鍛� / 168 缁忕悊
+-- 骞傜瓑锛氶�愬妫�鏌� system_role_menu 鏄惁宸插瓨鍦紝涓嶄細浜х敓閲嶅鎺堟潈銆�
+
+INSERT INTO system_role_menu (role_id, menu_id, creator, create_time)
+SELECT p.role_id, p.menu_id, '1', NOW()
+FROM (
+  SELECT 2 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 155 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 160 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 161 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 162 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075513 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075538 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075538 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075538 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075539 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075539 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075539 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075540 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075540 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075540 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075541 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075541 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075541 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075542 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075542 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075542 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075543 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075543 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075543 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075544 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075544 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075544 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075545 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075545 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075545 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075546 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075546 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075546 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075547 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075547 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075547 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075514 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075514 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075514 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075515 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075515 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075515 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075516 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075516 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075516 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075517 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075517 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075517 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075518 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075518 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075518 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075519 AS menu_id
+UNION ALL   SELECT 166 AS role_id, 1075519 AS menu_id
+UNION ALL   SELECT 167 AS role_id, 1075519 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075521 AS menu_id
+UNION ALL   SELECT 163 AS role_id, 1075522 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075523 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075524 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075525 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075526 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075527 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075528 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075536 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075537 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075548 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075549 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075550 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075551 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075552 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075553 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075554 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075555 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075556 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075557 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075558 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075559 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075560 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075561 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075562 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075563 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075564 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075565 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075566 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075567 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075568 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075568 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075569 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075569 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075570 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075570 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075571 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075571 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075572 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075572 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075573 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075573 AS menu_id
+UNION ALL   SELECT 165 AS role_id, 1075574 AS menu_id
+UNION ALL   SELECT 168 AS role_id, 1075574 AS menu_id
+) p
+WHERE NOT EXISTS (
+  SELECT 1 FROM system_role_menu rm
+  WHERE rm.role_id = p.role_id AND rm.menu_id = p.menu_id AND rm.deleted = b'0'
+);
diff --git a/scripts/cfwj-demo-seed-20261103/README.md b/scripts/cfwj-demo-seed-20261103/README.md
index 645b07a..2f8c7be 100644
--- a/scripts/cfwj-demo-seed-20261103/README.md
+++ b/scripts/cfwj-demo-seed-20261103/README.md
@@ -35,8 +35,8 @@
 | 璁惧 | mes_dv_{subject,checkplan,checkrecord,maintenrecord,repair,spare,metering} |
 | 浜哄姏 | hrm_attendance_record锛�300 鏉★級銆乭rm_salary_calculation锛�10 鏉★級銆乭rm_salary_payment锛�1 鏉★級 |
 
-寰呮浠诲姟椤甸渶瑕佺殑銆屽凡鍒拌揣鏈楠屻�嶏紙鍒拌揣閫氱煡 6/7锛変笌銆屽凡鍑哄簱鏈楠屻�嶏紙閿�鍞嚭搴撳崟 4銆侀��璐ф楠� RQC锛夊湪
-`seed_cfwj_docs.py` 绗� 13 鑺傝ˉ鍏呫��
+寰呮浠诲姟椤甸渶瑕佺殑銆屽凡鍒拌揣鏈楠屻�嶏紙鍒拌揣閫氱煡 6/7锛夈�併�屽凡鍑哄簱鏈楠屻�嶏紙閿�鍞嚭搴撳崟 4銆侀��璐ф楠� RQC锛変互鍙�
+浠撳偍搴撳瓨棰勮瑙勫垯锛堜綆浜庝笅闄� 2 鏉°�侀珮浜庝笂闄� 1 鏉★級閮藉湪 `seed_cfwj_docs.py` 绗� 13 鑺傝ˉ鍏呫��
 
 ## 鐗╂枡 id 鍙e緞
 
diff --git a/scripts/cfwj-demo-seed-20261103/seed_cfwj_docs.py b/scripts/cfwj-demo-seed-20261103/seed_cfwj_docs.py
index a6a04ef..422dde4 100644
--- a/scripts/cfwj-demo-seed-20261103/seed_cfwj_docs.py
+++ b/scripts/cfwj-demo-seed-20261103/seed_cfwj_docs.py
@@ -780,5 +780,17 @@
                         'remark', 'creator', 'create_time'], rqcl)
 print('pending-inspect extra ok')
 
+# 搴撳瓨棰勮瑙勫垯锛氳鐩栦綆浜庝笅闄愩�侀珮浜庝笂闄愪袱绫伙紝璁╀粨鍌ㄣ�屽簱瀛橀璀︺�嶉〉鏈夌湡瀹炲憡璀�
+warn_rules = [  # id, item, warehouse, min, max, remark
+    (1, 1001, 3, 80, None, '鎴愬搧浠撴硶鍏扮洏浣庝簬瀹夊叏搴撳瓨'),
+    (2, 1015, 4, 100, None, '鍒囧墛娑蹭綆浜庤ˉ璐х偣'),
+    (3, 1009, 1, 2000, 3000, '閽㈡瓒呭偍'),
+]
+clean('mes_wm_stock_warning_rule', [r[0] for r in warn_rules])
+ins('mes_wm_stock_warning_rule', ['id', 'item_id', 'warehouse_id', 'min_quantity', 'max_quantity', 'enabled',
+                                  'notify_user_id', 'remark', 'creator', 'create_time'],
+    [(r[0], r[1], r[2], r[3], r[4], 1, 249, r[5], ADMIN, ts(D(2026, 8, 3), 6100 + r[0])) for r in warn_rules])
+print('stock warning rules ok')
+
 conn.commit()
 print('DOCS OK')
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