SuZhouGuanHong/ShanMeiXinNengYuan.git

			@@ -1,6 +1,7 @@
			using Microsoft.AspNetCore.Authorization;
			using Microsoft.AspNetCore.Mvc;
			using SqlSugar;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Core;
			using WIDESEA_Model.Models;

			@@ -72,11 +73,6 @@
			/// <summary>
			/// 每日统计
			/// </summary>
			/// <remarks>
			/// 注意：数据在 SQL 层过滤后，在应用层按日期分组。
			/// SqlSugar 的 GroupBy 不支持对 .Date 这样的计算列直接生成 SQL GROUP BY，
			/// 因此采用此方式以确保跨数据库兼容性。
			/// </remarks>
			[HttpGet("DailyStats"), AllowAnonymous]
			public async Task<WebResponseContent> DailyStats([FromQuery] int days = 30)
			{
			@@ -86,19 +82,52 @@
			if (days > 365) days = 365;

			var startDate = DateTime.Today.AddDays(-days + 1);
			var endDate = DateTime.Today; // 包含今天

			var query = await _db.Queryable<Dt_Task_Hty>()
			.Where(t => t.InsertTime >= startDate)
			.Where(t => t.InsertTime >= startDate && t.InsertTime <= endDate)
			.Select(t => new { t.InsertTime, t.TaskType })
			.ToListAsync();

			var result = query
			// 生成日期范围
			var allDates = new List<DateTime>();
			for (var date = startDate; date <= endDate; date = date.AddDays(1))
			{
			allDates.Add(date);
			}

			// 按日期分组统计
			var groupedData = query
			.GroupBy(t => t.InsertTime.Date)
			.Select(g => new
			{
			Date = g.Key.ToString("yyyy-MM-dd"),
			Inbound = g.Count(t => t.TaskType >= 500 && t.TaskType < 600),
			Date = g.Key,
			Inbound = g.Count(t => t.TaskType >= 200 && t.TaskType < 300),
			Outbound = g.Count(t => t.TaskType >= 100 && t.TaskType < 200)
			})
			.ToDictionary(x => x.Date, x => x);

			// 补全缺失日期
			var result = allDates.Select(date =>
			{
			if (groupedData.TryGetValue(date, out var data))
			{
			return new
			{
			Date = date.ToString("MM-dd"),
			Inbound = data.Inbound,
			Outbound = data.Outbound
			};
			}
			else
			{
			return new
			{
			Date = date.ToString("MM-dd"),
			Inbound = 0,
			Outbound = 0
			};
			}
			})
			.OrderBy(x => x.Date)
			.ToList();
			@@ -110,7 +139,6 @@
			return WebResponseContent.Instance.Error($"每日统计获取失败: {ex.Message}");
			}
			}

			/// <summary>
			/// 每周统计
			/// </summary>
			@@ -137,7 +165,7 @@
			.Select(g => new
			{
			Week = g.Key,
			Inbound = g.Count(t => t.TaskType >= 500 && t.TaskType < 600),
			Inbound = g.Count(t => t.TaskType >= 200 && t.TaskType < 300),
			Outbound = g.Count(t => t.TaskType >= 100 && t.TaskType < 200)
			})
			.OrderBy(x => x.Week)
			@@ -165,9 +193,7 @@
			/// 每月统计
			/// </summary>
			/// <remarks>
			/// 注意：数据在 SQL 层过滤后，在应用层按年月分组。
			/// SqlSugar 的 GroupBy 不支持匿名对象 (Year, Month) 直接映射到 SQL GROUP BY，
			/// 因此采用此方式以确保跨数据库兼容性。
			/// 按年月统计入站和出站任务数量
			/// </remarks>
			[HttpGet("MonthlyStats"), AllowAnonymous]
			public async Task<WebResponseContent> MonthlyStats([FromQuery] int months = 12)
			@@ -179,26 +205,74 @@
			var startDate = DateTime.Today.AddMonths(-months + 1);
			startDate = new DateTime(startDate.Year, startDate.Month, 1);

			var query = await _db.Queryable<Dt_Task_Hty>()
			var monthlyStats = await _db.Queryable<Dt_Task_Hty>()
			.Where(t => t.InsertTime >= startDate)
			.Select(t => new { t.InsertTime, t.TaskType })
			.GroupBy(t => new { t.InsertTime.Year, t.InsertTime.Month })
			.Select(t => new
			{
			Year = t.InsertTime.Year,
			Month = t.InsertTime.Month,
			Inbound = SqlFunc.AggregateSum(
			SqlFunc.IIF(t.TaskType >= 200 && t.TaskType < 300, 1, 0)
			),
			Outbound = SqlFunc.AggregateSum(
			SqlFunc.IIF(t.TaskType >= 100 && t.TaskType < 200, 1, 0)
			)
			})
			.OrderBy(t => t.Year)
			.OrderBy(t => t.Month)
			.ToListAsync();

			var result = query
			.GroupBy(t => new { t.InsertTime.Year, t.InsertTime.Month })
			.Select(g => new
			// 生成所有需要统计的月份列表
			var allMonths = new List<DateTime>();
			var currentMonth = startDate;
			var endMonth = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1);

			while (currentMonth <= endMonth)
			{
			Month = $"{g.Key.Year}-{g.Key.Month:D2}",
			Inbound = g.Count(t => t.TaskType >= 500 && t.TaskType < 600),
			Outbound = g.Count(t => t.TaskType >= 100 && t.TaskType < 200)
			})
			.OrderBy(x => x.Month)
			.ToList();
			allMonths.Add(currentMonth);
			currentMonth = currentMonth.AddMonths(1);
			}

			// 将查询结果转换为字典，方便查找
			var statsDict = monthlyStats.ToDictionary(
			s => $"{s.Year}-{s.Month:D2}",
			s => new { s.Inbound, s.Outbound }
			);

			// 构建完整的结果列表，包含所有月份
			var result = new List<object>();
			foreach (var month in allMonths)
			{
			var monthKey = $"{month.Year}-{month.Month:D2}";

			if (statsDict.TryGetValue(monthKey, out var stat))
			{
			result.Add(new
			{
			Month = monthKey,
			Inbound = stat.Inbound,
			Outbound = stat.Outbound
			});
			}
			else
			{
			result.Add(new
			{
			Month = monthKey,
			Inbound = 0,
			Outbound = 0
			});
			}
			}

			return WebResponseContent.Instance.OK(null, result);
			}
			catch (Exception ex)
			{
			// 记录异常日志（实际项目中建议使用日志框架）
			// _logger.LogError(ex, "每月统计获取失败");

			return WebResponseContent.Instance.Error($"每月统计获取失败: {ex.Message}");
			}
			}
			@@ -241,25 +315,52 @@
			{
			try
			{
			// 查询仓库名称
			// 查询所有仓库信息
			var warehouses = await _db.Queryable<Dt_Warehouse>()
			.Select(w => new { w.WarehouseId, w.WarehouseName })
			.ToListAsync();
			var warehouseDict = warehouses.ToDictionary(w => w.WarehouseId, w => w.WarehouseName);

			// 使用 SQL GROUP BY 在数据库层面聚合，仅返回聚合结果
			var stockGroups = await _db.Queryable<Dt_StockInfo>()
			.GroupBy(s => s.WarehouseId)
			.Select(s => new { s.WarehouseId, Count = SqlFunc.AggregateCount(s.Id) })
			// 查询所有货位信息，按仓库分组统计总数
			var locationGroups = await _db.Queryable<Dt_LocationInfo>()
			.GroupBy(l => l.WarehouseId)
			.Select(l => new
			{
			WarehouseId = l.WarehouseId,
			TotalLocations = SqlFunc.AggregateCount(l.Id)
			})
			.ToListAsync();

			var result = stockGroups
			.Select(g => new
			// 查询状态不为Free的货位信息（有货货位），按仓库分组统计
			var occupiedLocationGroups = await _db.Queryable<Dt_LocationInfo>()
			.Where(l => l.LocationStatus != (int)LocationStatusEnum.Free)
			.GroupBy(l => l.WarehouseId)
			.Select(l => new
			{
			Warehouse = warehouseDict.TryGetValue(g.WarehouseId, out var name) ? name : $"仓库{g.WarehouseId}",
			Count = g.Count
			WarehouseId = l.WarehouseId,
			OccupiedLocations = SqlFunc.AggregateCount(l.Id)
			})
			.ToList();
			.ToListAsync();

			// 将仓库信息与货位统计信息合并
			var result = warehouses.Select(w =>
			{
			var totalLocations = locationGroups.FirstOrDefault(lg => lg.WarehouseId == w.WarehouseId)?.TotalLocations ?? 0;
			var occupiedLocations = occupiedLocationGroups.FirstOrDefault(og => og.WarehouseId == w.WarehouseId)?.OccupiedLocations ?? 0;
			var emptyLocations = totalLocations - occupiedLocations;

			var occupiedPercentage = totalLocations > 0 ? Math.Round((double)occupiedLocations / totalLocations * 100, 2) : 0.0;
			var emptyPercentage = totalLocations > 0 ? Math.Round((double)emptyLocations / totalLocations * 100, 2) : 0.0;

			return new
			{
			Warehouse = w.WarehouseName,
			Total = totalLocations,
			HasStock = occupiedLocations,
			NoStock = emptyLocations,
			HasStockPercentage = $"{occupiedPercentage}%",
			NoStockPercentage = $"{emptyPercentage}%"
			};
			}).ToList();

			return WebResponseContent.Instance.OK(null, result);
			}