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

huangxiaoqiang

2025-11-13 1f9a89458a66c12c1f7dfbceb2588ada8fbf16f4

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs

@@ -4,16 +4,19 @@
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;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Order;
@@ -24,12 +27,13 @@
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;
using JsonSerializer = System.Text.Json.JsonSerializer;

namespace WIDESEA_StorageBasicService;

public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository; 
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
    private readonly IDt_InboundOrderRepository _inboundOrderRepository;
    private readonly IUnitOfWorkManage _unitOfWorkManage;
    private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
@@ -38,7 +42,7 @@
    private readonly IDt_TaskRepository _taskRepository;
    private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;

    public StockInfoService(IStockInfoRepository BaseDal, 
    public StockInfoService(IStockInfoRepository BaseDal,
                                ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
                                IDt_InboundOrderRepository inboundOrderRepository,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -57,7 +61,7 @@
        _taskRepository = taskRepository;
        _outDetailsRepository = outDetailsRepository;
    }

    #region æ–¹æ³•é‡å†™
    /// <summary>
    /// åˆ†é¡µ
    /// </summary>
@@ -96,6 +100,7 @@
        Expression<Func<DtStockInfo, bool>> floor = null;
        Expression<Func<DtStockInfo, bool>> areaId = null;
        Expression<Func<DtStockInfo, bool>> materielCode = null;
        Expression<Func<DtStockInfo, bool>> materielName = null;
        foreach (var item in searchParametersList)
        {
            if (item.Name.Contains("locationStatus"))
@@ -108,11 +113,15 @@
            }
            else if (item.Name.Contains("areaId"))
            {
                areaId = x => x.LocationInfo.AreaId== Convert.ToInt32(item.Value);
                areaId = x => x.LocationInfo.AreaId == Convert.ToInt32(item.Value);
            }
            else if (item.Name.Contains("materielCode"))
            {
                materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
            }
            else if (item.Name.Contains("materielName"))
            {
                materielName = x => x.StockInfoDetails.Any(d => d.MaterielName == item.Value);
            }
        }
        //.IncludesAllFirstLayer()
@@ -124,10 +133,46 @@
            .WhereIF(floor != null, floor)
            .WhereIF(areaId != null, areaId)
            .WhereIF(materielCode != null, materielCode)
            .WhereIF(materielName != null, materielName)
            .OrderBy(orderByModels)
            .ToPageList(options.Page, options.Rows, ref totalCount);
        new PageGridData<DtStockInfo>(totalCount, data);
        return new PageGridData<DtStockInfo>(totalCount, data);
    }

    public override WebResponseContent UpdateData(SaveModel saveModel)
    {
        var remark = saveModel.MainData["remark"].ToString();
        var palletCode = saveModel.MainData["palletCode"].ToString();
        List<DtStockInfoDetail> details = DeserializeList<DtStockInfoDetail>(saveModel.DetailData);
        if (remark == "调拨出库")
        {
            return _taskService.HandAllocateOutBoundTaskAsync(details).Result;
        }
        else if (remark == "其他出库")
        {
            return _taskService.OtherOutBoundTaskAsync(details).Result;
        }
        else
        {
            return WebResponseContent.Instance.Error("系统异常");
        }
    }
    public List<T> DeserializeList<T>(List<Dictionary<string, object>> rawData)
    {
        if (rawData == null) return new List<T>();
        var processedData = rawData.Select(dict =>
        {
            var newDict = new Dictionary<string, object>();
            foreach (var kvp in dict)
            {
                var newKey = char.ToUpper(kvp.Key[0]) + kvp.Key.Substring(1);
                newDict[newKey] = kvp.Value;
            }
            return newDict;
        }).ToList();
        var json = JsonSerializer.Serialize(processedData);
        return JsonSerializer.Deserialize<List<T>>(json);
    }

    public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
@@ -181,6 +226,8 @@
        }
        return locationsNew;
    }

    #endregion

    #region åº“存视图
    public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
@@ -248,7 +295,7 @@
                                    .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
                                        x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
                                    .Select(x => new DtStockInfo
                                    { 
                                    {
                                        Id = x.Id,
                                        PalletCode = x.PalletCode,
                                        LocationCode = x.LocationCode,
@@ -270,9 +317,9 @@
                    stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
                }

                var result = stockNew.Skip((maxPage-1) * 10).Take(10).Select(s => new StockSelectViewDTO
                var result = stockNew.Skip((maxPage - 1) * 10).Take(10).Select(s => new StockSelectViewDTO
                {
                    Id =s.Id,
                    Id = s.Id,

                    MaterielCode = s.StockInfoDetails
                    .FirstOrDefault()?.MaterielCode ?? string.Empty,
@@ -389,170 +436,114 @@

    #endregion

    #region ç»„盘
    public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
    #region åº“存数据展示

    public async Task<WebResponseContent> GetStockData()
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (groupPlate == null || groupPlate.OrderNos.IsNullOrEmpty() || groupPlate.palletCode.IsNullOrEmpty())
            {
                return content.Error("参数错误");
            }
            var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == groupPlate.palletCode);
            if (!info.IsNullOrEmpty())
            {
                content.Error("该托盘已存在组盘");
            }
            else
            {
                List<DtStockInfoDetail> details = new List<DtStockInfoDetail>();
                foreach (var item in groupPlate.OrderNos)
                {
                    var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item);
            var stocks = await _stockInfoDetailRepository.QueryDataAsync(x => true);
            var orderdetail = SqlSugarHelper.DbWMS.Queryable<Dt_OrderOutDetails_Hty>().Where(x => true).ToList();

                    if (InboundOrder != null)
                    {
                        var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber == InboundOrder.ProductDrawingNumber && x.DemandClassification == InboundOrder.DemandClassification).FirstOrDefault();
                        if (x != null)
                        {
                            details.Remove(x);
                            x.MaterielCode = InboundOrder.MaterialNo;
                            x.MaterielName = InboundOrder.MaterialName;
                            x.DemandClassification = InboundOrder.DemandClassification;
                            x.Warehouse = InboundOrder.WarehouseName;
                            x.OrderNo = InboundOrder.UpperOrderNo;
                            x.Unit = InboundOrder.Unit;
                            x.Specs = InboundOrder.Specs;
                            x.Weight = InboundOrder.Weight;
                            x.Quantity = x.Quantity + InboundOrder.Quantity;
                            x.DrawingNumber = InboundOrder.ProductDrawingNumber;
                            x.Date = InboundOrder.Datetime;
                            details.Add(x);
                        }
                        else
                        {
                            DtStockInfoDetail detail = new DtStockInfoDetail()
                            {
                                MaterielCode = InboundOrder.MaterialNo,
                                MaterielName = InboundOrder.MaterialName,
                                DemandClassification = InboundOrder.DemandClassification,
                                Warehouse = InboundOrder.WarehouseName,
                                OrderNo = InboundOrder.UpperOrderNo,
                                Unit = InboundOrder.Unit,
                                Specs = InboundOrder.Specs,
                                Weight = InboundOrder.Weight,
                                Quantity = InboundOrder.Quantity,
                                DrawingNumber = InboundOrder.ProductDrawingNumber,
                                Date = InboundOrder.Datetime,
                            };
                            details.Add(detail);
                        }
                    }
                    else
                    {
                        return content.Error("未找到入库单据信息");
                    }
            // èŽ·å–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)
                }
                DtStockInfo boxing = new DtStockInfo()
            },
                outbound = new
                {
                    PalletCode = groupPlate.palletCode,
                    StockStatus = (int)StockStateEmun.组盘暂存,
                    StockInfoDetails = details
                };
                await BaseDal.AddDataNavAsync(boxing);
                content.OK("组盘成功");
            }
            return content;
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }
    #endregion

    #region è§£ç›˜
    public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (groupPlate == null || groupPlate.palletCode.IsNullOrEmpty())
            {
                return content.Error("参数错误");
            }
            var stock = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.组盘暂存);
            if (!stock.IsNullOrEmpty())
            {
                stock.StockStatus = (int)StockStateEmun.组盘撤销;
                DtStockInfo_Hty stockhty = stock.Adapt<DtStockInfo_Hty>();
                stockhty.ModifyDate = DateTime.Now;
                await _unitOfWorkManage.UseTranAsync(async () =>
                    dates = outboundData.Select(x => x.Date).ToArray(),
                    values = outboundData.Select(x => x.Value).ToArray()
                },
                inbound = new
                {
                    await BaseDal.Db.DeleteNav<DtStockInfo>(x => x.Id == stock.Id)
                                            .Include(x => x.StockInfoDetails)
                                            .ExecuteCommandAsync();
                    await AddStockHtyAsync(stockhty);
                });
                content.OK("解盘成功");
            }
            else
            {
                content.Error("未找到组盘数据");
            }
            return content;
                    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(ex.Message);
        }
    }
    private async Task AddStockHtyAsync(DtStockInfo_Hty stockhty)
    {
        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).IncludesAllFirstLayer().ExecuteCommandAsync();
        if (!isStockAdd)
        {
            throw new Exception("库存历史信息添加失败");
            return content.Error("系统错误，请联系管理员");
        }
    }

    /// <summary>
    /// æ‰¹é‡åˆ é™¤
    /// </summary>
    /// <param name="keys"></param>
    /// <returns></returns>
    public override WebResponseContent DeleteData(object[] keys)
    {
        try
        {
            List<DtStockInfo_Hty> stockInfos = new List<DtStockInfo_Hty>();
            List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();

            foreach (var item in keys)
            {
                var stock = BaseDal.QueryFirstNavAsync(x => x.Id == item.ObjToInt()).Result;
                var stockHty = stock.Adapt<DtStockInfo_Hty>();
                stockInfos.Add(stockHty);

                var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.LocationCode == stock.LocationCode).Result;
                var lastStatus = location.LocationStatus;
                location.LocationStatus = (int)LocationEnum.Free;
                locationInfos.Add(location);
                _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
            }
            //var hty = BaseDal.Db.InsertNav(stockInfos)
            //    .Include(x => x.StockInfoDetails)
            //    .ExecuteCommand();
            var isStockAdd = SqlSugarHelper.DbWMS.InsertNav(stockInfos).IncludesAllFirstLayer().ExecuteCommandAsync();

            var locationd = SqlSugarHelper.DbWMS.Updateable(locationInfos).ExecuteCommandHasChange();
            return base.DeleteData(keys);
        }
        catch (Exception ex)
        {
            return WebResponseContent.Instance.Error(ex.Message);
        }
    }
    #endregion
}