From 0204bc614e3132ce94d3fb1de9d330e9250f233c Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 15 十一月 2025 14:10:09 +0800
Subject: [PATCH] 新增大屏显示，优化WMS首页数据展示，后端数据推送接口新加库存差异比较
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
index 4d78fcb..ef5112f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
@@ -4,12 +4,14 @@
using Masuit.Tools;
using NewLife.Reflection;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Collections;
using System.Collections.Generic;
using System.Drawing.Printing;
using System.Linq.Expressions;
using System.Threading.Tasks;
+using System.Xml.Linq;
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
@@ -38,6 +40,7 @@
private readonly IDt_TaskService _taskService;
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
+ private readonly IDt_Task_HtyRepository _task_HtyRepository;
private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
public StockInfoService(IStockInfoRepository BaseDal,
@@ -48,7 +51,8 @@
IDt_TaskService taskService,
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
- IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository outDetailsRepository,
+ IDt_Task_HtyRepository task_HtyRepository) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
@@ -58,6 +62,7 @@
_locationRepository = locationRepository;
_taskRepository = taskRepository;
_outDetailsRepository = outDetailsRepository;
+ _task_HtyRepository = task_HtyRepository;
}
#region 鏂规硶閲嶅啓
/// <summary>
@@ -433,4 +438,145 @@
}
#endregion
+
+ #region 搴撳瓨鏁版嵁灞曠ず
+
+ public async Task<WebResponseContent> GetStockData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stocks = await _stockInfoDetailRepository.QueryDataAsync(x => true);
+ var orderdetail = SqlSugarHelper.DbWMS.Queryable<Dt_OrderOutDetails_Hty>().Where(x => true).ToList();
+ var task = _taskRepository.QueryData(x => true).ToList();
+
+ // 鑾峰彇UTC褰撳墠鏃堕棿
+ DateTime utcNow = DateTime.UtcNow;
+
+ // 璁＄畻褰撴湀鏃堕棿鑼冨洿
+ DateTime firstDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1);
+ DateTime lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻涓婃湀鏃堕棿鑼冨洿
+ DateTime firstDayOfLastMonth = new DateTime(utcNow.Year, utcNow.Month, 1).AddMonths(-1);
+ DateTime lastDayOfLastMonth = firstDayOfLastMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻褰撳ぉ鏃堕棿鑼冨洿
+ DateTime todayStart = utcNow.Date;
+ DateTime todayEnd = todayStart.AddDays(1).AddTicks(-1);
+
+ // 璁＄畻鏄ㄦ棩鏃堕棿鑼冨洿
+ DateTime startOfPreviousDay = utcNow.AddDays(-1).Date; // 鍓嶄竴澶╃殑 00:00:00
+ DateTime endOfPreviousDay = startOfPreviousDay.AddDays(1).AddSeconds(-1);
+
+ // 鏌ヨ褰撴湀鏁版嵁
+ var currentMonthInStocks = stocks.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocks = orderdetail.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.OutboundQuantity);
+
+ //鏌ヨ涓婃湀鏁版嵁
+ var currentMonthInStocksLastMonth = stocks.Where(x => x.CreateDate >= firstDayOfLastMonth && x.CreateDate <= lastDayOfLastMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocksLastMonth = orderdetail.Where(x => x.CreateDate >= firstDayOfLastMonth && x.CreateDate <= lastDayOfLastMonth).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ浠婃棩鏁版嵁
+ var currentDayInStocks = stocks.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.Quantity);
+ var currentDayOutStocks = orderdetail.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ鏄ㄥぉ鏃ユ暟鎹�
+ var currentDayInStocksLast = stocks.Where(x => x.CreateDate >= startOfPreviousDay && x.CreateDate <= endOfPreviousDay).Sum(x => x.Quantity);
+ var currentDayOutStocksLast = orderdetail.Where(x => x.CreateDate >= startOfPreviousDay && x.CreateDate <= endOfPreviousDay).Sum(x => x.OutboundQuantity);
+
+ // 鐢熸垚鏈�杩�7澶╃殑鍑哄叆搴撴暟鎹�
+ var last7Days = Enumerable.Range(0, 7)
+ .Select(i => utcNow.Date.AddDays(-i))
+ .OrderBy(x => x)
+ .ToList();
+
+ var monthDays = Enumerable.Range(1, DateTime.DaysInMonth(utcNow.Year, utcNow.Month))
+ .Select(day => new DateTime(utcNow.Year, utcNow.Month, day))
+ .Where(date => date <= utcNow.Date) // 鍙寘鍚埌浠婂ぉ涓烘鐨勬棩鏈�
+ .ToList();
+
+ var inboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ }).ToList();
+
+ var outboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ var MonthSumData = monthDays.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ InValue = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ OutValue = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ object obj = new
+ {
+ metrics = new List<object>{
+ new {
+ name = "浠婃棩杩涘簱閲�",
+ value = currentDayInStocks,
+ compare =currentDayInStocks-currentDayInStocksLast,
+ },
+ new {
+ name = "浠婃棩鍑哄簱閲�",
+ value = currentDayOutStocks,
+ compare =currentDayOutStocks-currentDayOutStocksLast,
+ },
+ new {
+ name = "鏈湀杩涘簱閲�",
+ value = currentMonthInStocks,
+ compare =currentMonthInStocks-currentMonthInStocksLastMonth,
+ },
+ new {
+ name = "鏈湀鍑哄簱閲�",
+ value = currentMonthOutStocks,
+ compare = currentMonthOutStocks - currentMonthOutStocksLastMonth,
+ },
+ new {
+ name = "搴撳瓨鎬婚噺",
+ value = stocks.Sum(x => x.Quantity)
+ }
+ },
+ outbound = new
+ {
+ dates = outboundData.Select(x => x.Date).ToArray(),
+ values = outboundData.Select(x => x.Value).ToArray()
+ },
+ inbound = new
+ {
+ dates = inboundData.Select(x => x.Date).ToArray(),
+ values = inboundData.Select(x => x.Value).ToArray()
+ },
+ monthData = new
+ {
+ dates = MonthSumData.Select(x => x.Date).ToArray(),
+ inValue = MonthSumData.Select(x => x.InValue).ToArray(),
+ outValue = MonthSumData.Select(x => x.OutValue).ToArray(),
+ },
+ newTask = task.Select(x => new
+ {
+ x.PalletCode,
+ x.Roadway,
+ x.SourceAddress,
+ x.TargetAddress,
+ x.ErrorMessage,
+ x.CreateDate,
+ TaskType = EnumHelper.GetDescriptionFromEnums(x.TaskType, typeof(TaskOutboundTypeEnum), typeof(TaskInboundTypeEnum), typeof(TaskAcrossFloorTypeEnum), typeof(TaskRelocationTypeEnum), typeof(TaskAGVCarryTypeEnum)),
+ TaskState = EnumHelper.GetDescriptionFromEnums(x.TaskState, typeof(TaskInStatusEnum), typeof(TaskOutStatusEnum), typeof(TaskAcrossFloorStatusEnum), typeof(TaskRelocationStatusEnum), typeof(TaskAGVCarryStatusEnum))
+ }).ToList()
+ };
+ return content.OK(data: obj);
+ }
+ catch (Exception ex)
+ {
+ return content.Error("绯荤粺閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3