V3.50

2026-06-25 15:21:43 +08:00
parent 8ba1ff37f0
commit c1092407ad
7 changed files with 128 additions and 43 deletions
--- a/inventory-backend/app/api/v1/inbound/stock.py
+++ b/inventory-backend/app/api/v1/inbound/stock.py
@ -308,8 +308,8 @@ def get_stock_list():
        if is_aggregated:
            grouped_dict = {}
            for item in all_items:
-                # 核心聚合键：类型 + 规格型号 + 库位
-                group_key = f"{item.get('type')}_{item.get('standard')}_{item.get('warehouse_location', '')}"
+                # 核心聚合键：类型 + 规格型号 + 库位 + base_id（含 base_id 防止不同物料被错误合并）
+                group_key = f"{item.get('type')}_{item.get('standard')}_{item.get('warehouse_location', '')}_{item.get('base_id', '')}"

                if group_key in grouped_dict:
                    # 累加数量