新增移库页面与WebSocket支持，优化任务逻辑新增移库页面支持移库任务输入与提交。新增 WebSocket 支持（`websocket.js`、`...

huangxiaoqiang

2025-11-13 1f9a89458a66c12c1f7dfbceb2588ada8fbf16f4

 ÏîÄ¿´úÂë/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;
@@ -433,4 +435,115 @@
    }

    #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();

            // èŽ·å–UTC当前时间
            DateTime utcNow = DateTime.UtcNow;

            // è®¡ç®—当月时间范围
            DateTime firstDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1);
            DateTime lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddSeconds(-1);

            // è®¡ç®—当天时间范围
            DateTime todayStart = utcNow.Date;
            DateTime todayEnd = todayStart.AddDays(1).AddTicks(-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 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);

            // ç”Ÿæˆæœ€è¿‘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
                },
                new {
                    name = "今日出库量",
                    value = currentDayOutStocks
                },
                new {
                    name = "本月进库量",
                    value = currentMonthInStocks
                },
                new {
                    name = "本月出库量",
                    value = currentMonthOutStocks
                },
                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(),
                }
            };

            return content.OK(data: obj);
        }
        catch (Exception ex)
        {
            return content.Error("系统错误，请联系管理员");
        }
    }

    #endregion
}