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

huangxiaoqiang

2025-10-27 387731cab892804912e68cb91e6fb804411c4756

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

@@ -16,6 +16,7 @@
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;
@@ -31,33 +32,30 @@
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository; 
    private readonly IDt_InboundOrderRepository _inboundOrderRepository;
    private readonly IUnitOfWorkManage _unitOfWorkManage;
    private readonly IDt_OtherOutboundOrderRepository _OtheroutorderRepository;
    private readonly IDt_OtherOutboundOrderDetailRepository _OtheroutorderdetailRepository;
    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,
                                IDt_OtherOutboundOrderRepository OtheroutorderRepository,
                                IDt_OtherOutboundOrderDetailRepository OtheroutorderdetailRepository,
                                IStockInfoDetailRepository stockInfoDetailRepository,
                                IDt_TaskService taskService,
                                ILocationInfoRepository locationRepository,
                                IDt_TaskRepository taskRepository) : base(BaseDal)
                                IDt_TaskRepository taskRepository,
                                IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
    {
        _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
        _inboundOrderRepository = inboundOrderRepository;
        _unitOfWorkManage = unitOfWorkManage;
        _OtheroutorderRepository = OtheroutorderRepository;
        _OtheroutorderdetailRepository = OtheroutorderdetailRepository;
        _stockInfoDetailRepository = stockInfoDetailRepository;
        _taskService = taskService;
        _locationRepository = locationRepository;
        _taskRepository = taskRepository;
        _outDetailsRepository = outDetailsRepository;
    }

    /// <summary>
@@ -132,6 +130,57 @@
        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)
@@ -170,258 +219,175 @@
        return result;
    }

    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;
    }

    #endregion

    #region æ ¹æ®å•æ®æ˜Žç»†ç”Ÿæˆå‡ºåº“任务

    public async Task<WebResponseContent> GenerateOutboundTask(GenerateOutTaskDto requestOut)
    public WebResponseContent GetStockView(GetStockSelectViewDto viewDto)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            foreach (var orderId in requestOut.orderIds)
            Expression<Func<DtStockInfoDetail, bool>> expressionOrder = x => true;
            if (!string.IsNullOrEmpty(viewDto.materielCode))
            {
                List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
                Dt_OtherOutboundOrderDetail outboundOrderdetail = _OtheroutorderdetailRepository.QueryFirst(x => x.Id == orderId);
                Dt_OtherOutboundOrder outboundOrder = _OtheroutorderRepository.QueryFirst(x => x.Id == outboundOrderdetail.OrderId);

                (bool, string) checkResult = CheckSelectStockDeital(outboundOrderdetail, requestOut.stockViews, requestOut);
                if (!checkResult.Item1) throw new Exception(checkResult.Item2);

                else
                {
                    var result = AssignStockOutbound(outboundOrderdetail, requestOut.stockViews);

                    if (result.Item1.Count <= 0)
                    {
                        return content.Error("未找到库存分配，请确认是否存在库存或单据数量已出完");
                    }

                    result.Item1.Distinct().ForEach(item =>
                    {
                        RequestTaskDto task = new RequestTaskDto
                        {
                            TaskType = outboundOrder.OrderType,
                            OrderNo = outboundOrder.OrderNo,
                            MaterielCode = outboundOrderdetail.MaterielCode,
                            Position = item.LocationCode,
                            PalletCode = item.PalletCode,
                            AreaId = Convert.ToInt32(requestOut.AreaId),
                        };
                        taskDtos.Add(task);
                        item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.出库锁定;
                        item.StockStatus = (int)StockStateEmun.出库锁定;
                    });
                    List<Dt_Task> taskNews = new List<Dt_Task>();
                    List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
                    foreach (var item in taskDtos)
                    {
                        taskNews.Add(await _taskService.RequestOutboundTaskAsync(item));

                    }
                    List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
                    List<DtLocationInfo> locations = new List<DtLocationInfo>();
                    foreach (var item in taskNews)
                    {
                        taskDTOs.Add(CreateTaskDTO(item));
                        var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
                        var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
                        locationStatusChangeRecords.AddRange(result1.Item1);
                        locationStatusChangeRecords.AddRange(result2.Item1);
                        locations.AddRange(result1.Item2);
                        locations.AddRange(result2.Item2);
                    }

                    await _unitOfWorkManage.UseTranAsync(async () =>
                    {
                        _taskRepository.AddData(taskNews);
                        BaseDal.UpdateDataNav(result.Item1);
                        await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
                        await _locationRepository.UpdateDataAsync(locations);
                        _OtheroutorderdetailRepository.UpdateData(result.Item2);
                    });
                    content = await _taskService.SendWCSTask(taskDTOs);
                }
                expressionOrder = x => x.MaterielCode.Contains(viewDto.materielCode);
            }
            return content;
            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)
        {
            return content.Error(ex.Message);
            content = WebResponseContent.Instance.Error($"查询出库单据错误,错误信息:{ex.Message}");
        }
               
        return content;
    }
    private WMSTaskDTO CreateTaskDTO(Dt_Task task)

    #endregion

    #region å…¶ä»–出库视图
    public List<StockSelectViewDTO> GetOtherOutBoundView(int id)
    {
        return new WMSTaskDTO
        {
            TaskNum = task.TaskNum.Value,
            Grade = task.Grade.Value,
            PalletCode = task.PalletCode,
            RoadWay = task.Roadway,
            SourceAddress = task.SourceAddress,
            TargetAddress = task.TargetAddress,
            TaskState = task.TaskState,
            Id = 0,
            TaskType = task.TaskType,
            AGVTaskNum = task.AGVTaskNum,
            Remark = task.Remark
        };
    }
    public (List<DtStockInfo>, Dt_OtherOutboundOrderDetail) AssignStockOutbound(Dt_OtherOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
    {
        decimal originalNeedQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;
        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();

        decimal needQuantity = originalNeedQuantity;

        List<DtStockInfo> outStocks = new List<DtStockInfo>();
        if (stockSelectViews != null && stockSelectViews.Count > 0)
        List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
        List<DtStockInfo> stockNew = new List<DtStockInfo>();
        if (stock != null)
        {
            outStocks = BaseDal.Db.Queryable<DtStockInfo>().Where(x => stockSelectViews.Select(x => x.PalletCode).ToList().Contains(x.PalletCode)).Includes(x => x.StockInfoDetails).ToList();
        }
        else
        {
            outStocks = GetStockInfos(outboundOrderdetail.MaterielCode);
        }

        List<DtStockInfo> outStockNews=new List<DtStockInfo>();

        foreach (var item in outStocks)
        {
            var stockDetail = item.StockInfoDetails
            .Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
            if (needQuantity <= 0)
            if (_taskService.LocationIsOutBound(stock.LocationInfo))
            {
                continue;
                return null;
            }
            foreach (var detail in stockDetail)
            {
                if (detail != null)
                {
                    if (needQuantity >= detail.Quantity)
                    {
                        if (detail.Quantity <= detail.OutboundQuantity)
                        {
                            continue;
                        }
                        needQuantity -= detail.Quantity;
                        detail.OutboundQuantity = detail.Quantity;
                    }
                    else
                    {
                        if (detail.Quantity <= detail.OutboundQuantity)
                        {
                            continue;
                        }
                        detail.OutboundQuantity = needQuantity;
                        needQuantity = 0;
                    }
                    outStockNews.Add(item);
                }
            }

        }
        outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;

        if (outboundOrderdetail.OverOutQuantity != 0)
        var result = stock.StockInfoDetails.Select(s => new StockSelectViewDTO
        {
            outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.开始;
        }
        return (outStockNews, outboundOrderdetail);
            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;
    }

    private (bool, string) CheckSelectStockDeital(Dt_OtherOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews, GenerateOutTaskDto requestOut)
    {
        if (outboundOrderdetail == null)
        {
            return (false, "未找到出库单信息");
        }
        if (outboundOrderdetail.OrderDetailStatus == (int)OrderStateEmun.已完成)
        {
            return (false, "该明细不可操作");
        }
        if (stockSelectViews != null && stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity)
        {
            return (false, "选择数量超出单据数量");
        }
        if (outboundOrderdetail.OrderQuantity <= outboundOrderdetail.OverOutQuantity)
        {
            return (false, "单据数量已出库完成");
        }
        return (true, "成功");
    }

    public List<DtStockInfo> GetStockInfos(string materielCode)
    {
        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 == materielCode && d.Quantity > 0)).ToList().OrderBy(x => x.CreateDate).ToList();

        if (stocks == null || stocks.Count() <= 0)
        {
            return stocks;
        }

        var locations = stocks.Select(s => s.LocationInfo).ToList();
        List<DtLocationInfo> locationInfos = GetStockLocations(locations).Distinct().ToList();
        stocks = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
        return stocks;
    }
    #endregion æ ¹æ®å•æ®æ˜Žç»†ç”Ÿæˆå‡ºåº“任务
    #endregion

    #region ç»„盘
    public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)