优化与ERP出库单逻辑，增加打印程序

huangxiaoqiang

2025-10-27 387731cab892804912e68cb91e6fb804411c4756

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

@@ -1,6 +1,8 @@
using AngleSharp.Dom;
using Dm;
using Mapster;
using Masuit.Tools;
using NewLife.Reflection;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar;
using System.Collections;
@@ -11,16 +13,49 @@
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Order;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
using WIDESEA_IOrderRepository;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;

namespace WIDESEA_StorageBasicService;

public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
    public StockInfoService(IStockInfoRepository BaseDal, ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository; 
    private readonly IDt_InboundOrderRepository _inboundOrderRepository;
    private readonly IUnitOfWorkManage _unitOfWorkManage;
    private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
    private readonly IDt_TaskService _taskService;
    private readonly ILocationInfoRepository _locationRepository;
    private readonly IDt_TaskRepository _taskRepository;
    private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;

    public StockInfoService(IStockInfoRepository BaseDal, 
                                ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
                                IDt_InboundOrderRepository inboundOrderRepository,
                                IUnitOfWorkManage unitOfWorkManage,
                                IStockInfoDetailRepository stockInfoDetailRepository,
                                IDt_TaskService taskService,
                                ILocationInfoRepository locationRepository,
                                IDt_TaskRepository taskRepository,
                                IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
    {
        _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
        _inboundOrderRepository = inboundOrderRepository;
        _unitOfWorkManage = unitOfWorkManage;
        _stockInfoDetailRepository = stockInfoDetailRepository;
        _taskService = taskService;
        _locationRepository = locationRepository;
        _taskRepository = taskRepository;
        _outDetailsRepository = outDetailsRepository;
    }

    /// <summary>
@@ -60,6 +95,7 @@
        Expression<Func<DtStockInfo, bool>> locationStatus = null;
        Expression<Func<DtStockInfo, bool>> floor = null;
        Expression<Func<DtStockInfo, bool>> areaId = null;
        Expression<Func<DtStockInfo, bool>> materielCode = null;
        foreach (var item in searchParametersList)
        {
            if (item.Name.Contains("locationStatus"))
@@ -74,6 +110,10 @@
            {
                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);
            }
        }
        //.IncludesAllFirstLayer()
        var data = BaseDal.Db.Queryable<DtStockInfo>()
@@ -83,10 +123,398 @@
            .WhereIF(locationStatus != null, locationStatus)
            .WhereIF(floor != null, floor)
            .WhereIF(areaId != null, areaId)
            .WhereIF(materielCode != null, materielCode)
            .OrderBy(orderByModels)
            .ToPageList(options.Page, options.Rows, ref totalCount);
        new PageGridData<DtStockInfo>(totalCount, data);
        return new PageGridData<DtStockInfo>(totalCount, data);
    }

    public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
    {
        List<DtLocationInfo> locationsNew = new List<DtLocationInfo>();
        foreach (var item in locations)
        {
            if (item.AreaId == 1)
            {
                if (item.Depth == 2)
                {
                    var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == item.Column && x.Layer == item.Layer);

                    if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
                    {
                        locationsNew.Remove(item);
                        continue;
                    }
                }
                locationsNew.Add(item);
            }
            else if (item.AreaId == 2)
            {
                var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);

                foreach (var Lateral in locationLateral)
                {
                    if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
                    {
                        locationsNew.Remove(item);
                        continue;
                    }
                    locationsNew.Add(item);
                }
            }

            else if (item.AreaId == 5 || item.AreaId == 6)
            {
                var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);

                foreach (var lateral in locationLateral)
                {
                    if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
                    {
                        locationsNew.Remove(item);
                        continue;
                    }
                    locationsNew.Add(item);
                }
            }
        }
        return locationsNew;
    }

    #region åº“存视图
    public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
    {
        var stocks = BaseDal.Db.Queryable<DtStockInfo>()
        .Includes(x => x.StockInfoDetails)
        .Includes(x => x.LocationInfo)
        .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
        .Where(x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0 && d.Quantity > d.OutboundQuantity)).ToList().OrderBy(x => x.CreateDate);

        List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
        List<DtStockInfo> stockNew = new List<DtStockInfo>();
        if (stocks != null || stocks.Count() > 0)
        {
            var locations = stocks.Select(s => s.LocationInfo).ToList();
            locationInfos = GetStockLocations(locations).Distinct().ToList();
            stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
        }

        var result = stockNew.Select(s => new StockSelectViewDTO
        {
            MaterielCode = s.StockInfoDetails
            .FirstOrDefault(d => d.MaterielCode == viewDto.materielCode)?.MaterielCode ?? string.Empty,

            MaterielName = s.StockInfoDetails
            .FirstOrDefault(d => d.MaterielCode == viewDto.materielCode)?.MaterielName ?? string.Empty,

            UseableQuantity = s.StockInfoDetails
            .Where(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0 && d.Quantity > d.OutboundQuantity)
            .Sum(d => (decimal?)d.Quantity - d.OutboundQuantity) ?? 0,  // å¤„理空值情况

            PalletCode = s.PalletCode ?? string.Empty,
            LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
        }).ToList();

        return result;
    }

    public WebResponseContent GetStockView(GetStockSelectViewDto viewDto)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            Expression<Func<DtStockInfoDetail, bool>> expressionOrder = x => true;
            if (!string.IsNullOrEmpty(viewDto.materielCode))
            {
                expressionOrder = x => x.MaterielCode.Contains(viewDto.materielCode);
            }
            int count = 0;
            count = BaseDal.Db.Queryable<DtStockInfo>()
                                .Includes(x => x.StockInfoDetails)
                                .Includes(x => x.LocationInfo)
                                .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
                                .WhereIF(!viewDto.materielCode.IsNullOrEmpty(), x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0)).ToList().OrderBy(x => x.CreateDate).Count();


            int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0));
            if (viewDto.pageNo <= maxPage)
            {
                var stocks = BaseDal.Db.Queryable<DtStockInfo>()
                                    .Includes(x => x.StockInfoDetails)
                                    .Includes(x => x.LocationInfo)
                                    .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
                                                && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
                                    .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,
                                        StockInfoDetails = x.StockInfoDetails
                                            .OrderByDescending(d => d.CreateDate)
                                            .Take(1)
                                            .ToList(),
                                        LocationInfo = x.LocationInfo
                                    })
                                    .OrderBy(x => x.CreateDate)
                                    .ToList();

                List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
                List<DtStockInfo> stockNew = new List<DtStockInfo>();
                if (stocks != null || stocks.Count() > 0)
                {
                    var locations = stocks.Select(s => s.LocationInfo).ToList();
                    locationInfos = GetStockLocations(locations).Distinct().ToList();
                    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
                {
                    Id =s.Id,

                    MaterielCode = s.StockInfoDetails
                    .FirstOrDefault()?.MaterielCode ?? string.Empty,

                    MaterielName = s.StockInfoDetails
                    .FirstOrDefault()?.MaterielName ?? string.Empty,

                    Quantity = s.StockInfoDetails
                    .FirstOrDefault()?.Quantity ?? 0,  // å¤„理空值情况

                    PalletCode = s.PalletCode ?? string.Empty,

                    LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
                }).ToList();

                content = WebResponseContent.Instance.OK(data: result);
            }
            else
            {
                var stocks = BaseDal.Db.Queryable<DtStockInfo>()
                                    .Includes(x => x.StockInfoDetails)
                                    .Includes(x => x.LocationInfo)
                                    .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
                                                && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
                                    .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,
                                        StockInfoDetails = x.StockInfoDetails
                                            .OrderByDescending(d => d.CreateDate)
                                            .Take(1)
                                            .ToList(),
                                        LocationInfo = x.LocationInfo
                                    })
                                    .OrderBy(x => x.CreateDate)
                                    .ToList();

                List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
                List<DtStockInfo> stockNew = new List<DtStockInfo>();
                if (stocks != null || stocks.Count() > 0)
                {
                    var locations = stocks.Select(s => s.LocationInfo).ToList();
                    locationInfos = GetStockLocations(locations).Distinct().ToList();
                    stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
                }

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

                    MaterielCode = s.StockInfoDetails
                    .FirstOrDefault()?.MaterielCode ?? string.Empty,

                    MaterielName = s.StockInfoDetails
                    .FirstOrDefault()?.MaterielName ?? string.Empty,

                    Quantity = s.StockInfoDetails
                    .FirstOrDefault()?.Quantity ?? 0,  // å¤„理空值情况

                    PalletCode = s.PalletCode ?? string.Empty,

                    LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
                }).ToList();

                content = WebResponseContent.Instance.OK(data: result);
            }
        }
        catch (Exception ex)
        {
            content = WebResponseContent.Instance.Error($"查询出库单据错误,错误信息:{ex.Message}");
        }
        return content;
    }

    #endregion

    #region å…¶ä»–出库视图
    public List<StockSelectViewDTO> GetOtherOutBoundView(int id)
    {
        DtStockInfo stock = BaseDal.Db.Queryable<DtStockInfo>()
                   .Includes(x => x.StockInfoDetails)
                   .Includes(x => x.LocationInfo)
                   .Where(x => x.Id == id)
                   .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable).First();

        List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
        List<DtStockInfo> stockNew = new List<DtStockInfo>();
        if (stock != null)
        {
            if (_taskService.LocationIsOutBound(stock.LocationInfo))
            {
                return null;
            }
        }

        var result = stock.StockInfoDetails.Select(s => new StockSelectViewDTO
        {
            MaterielCode = s.MaterielCode ?? string.Empty,

            MaterielName = s.MaterielName ?? string.Empty,

            Quantity = s.Quantity,  // å¤„理空值情况

            PalletCode = stock.PalletCode ?? string.Empty,

            LocationCode = stock.LocationCode ?? string.Empty
        }).ToList();

        return result;
    }

    #endregion

    #region ç»„盘
    public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
    {
        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);

                    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("未找到入库单据信息");
                    }
                }
                DtStockInfo boxing = new DtStockInfo()
                {
                    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 () =>
                {
                    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;
        }
        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("库存历史信息添加失败");
        }
    }

    /// <summary>
@@ -126,4 +554,5 @@
            return WebResponseContent.Instance.Error(ex.Message);
        }
    }
    #endregion
}