提交

heshaofeng

6 天以前 c6fb4ffebbb3dc2cdc303070ad6cb5625ac8bb48

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -1,4 +1,6 @@
using AutoMapper;
using Autofac.Core;
using AutoMapper;
using MailKit.Search;
using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
@@ -6,6 +8,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Stock;
using WIDESEA_IAllocateService;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
@@ -22,14 +25,19 @@
        public IRepository<Dt_StockInfo> Repository => BaseDal;
        private readonly IRepository<Dt_StockInfoDetail> _stockInfoDetailRepository;
        private readonly IOutboundOrderService _outboundOrderService;
        //private readonly IOutboundOrderDetailService _outboundOrderDetailService;

        private readonly IRepository<Dt_AllocateOrder> _allocateRepository;
        private readonly ILocationInfoService _locationInfoService;
        public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService) : base(BaseDal)
        public StockInfoService(IRepository<Dt_StockInfo> BaseDal, IMapper mapper, IRepository<Dt_StockInfoDetail> stockInfoDetailRepository, IRecordService recordService, ILocationInfoService locationInfoService, IOutboundOrderService outboundOrderService, IRepository<Dt_AllocateOrder> allocateRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _stockInfoDetailRepository = stockInfoDetailRepository;
            _recordService = recordService;
            _locationInfoService = locationInfoService;
            _outboundOrderService = outboundOrderService;
            _allocateRepository = allocateRepository;
            //_outboundOrderDetailService = outboundOrderDetailService;
        }

        /// <summary>
@@ -116,7 +124,7 @@
            if (stockTotalQuantity < needQuantity)
            {
                residueQuantity = needQuantity - stockTotalQuantity;
               

            }
            else
            {
@@ -153,7 +161,7 @@
            residueQuantity = remainingNeed;
            return (outStocks, stockAllocations);
        }
        

        /// <summary>
        /// æ ¹æ®æ¡ç èŽ·å–库存信息
        /// </summary>
@@ -184,7 +192,7 @@
        public List<Dt_StockInfo> GetStockInfos(string materielCode, string lotNo, string supplyCode, List<string> locationCodes)
        {
            var query = Db.Queryable<Dt_StockInfo>()
             .Where(x => locationCodes.Contains(x.LocationCode)
             .Where(x => locationCodes.Contains(x.LocationCode) && x.StockStatus == StockStatusEmun.入库完成.ObjToInt()
             //  && x.StockStatus == (int)StockStatusEmun.正常)
             ).Includes(x => x.Details);

@@ -203,10 +211,7 @@
                query = query.Where(x => x.Details.Any(d => d.SupplyCode == supplyCode));
            }

            var stocks = query.ToList();

            return stocks.OrderBy(x => x.Details.Where(d => d.MaterielCode == materielCode && (string.IsNullOrEmpty(supplyCode) || d.SupplyCode == supplyCode) &&
                           (string.IsNullOrEmpty(lotNo) || d.BatchNo == lotNo)).Min(d => d.CreateDate)).ToList();  
            return query.OrderBy(x => x.CreateDate).ToList();
            //ISugarQueryable<Dt_LocationInfo> sugarQueryable = Db.Queryable<Dt_LocationInfo>().Where(x => locationCodes.Contains(x.LocationCode));
            //ISugarQueryable<Dt_StockInfo> sugarQueryable1 = Db.Queryable<Dt_StockInfo>().Includes(x => x.Details).Where(x => x.Details.Any(v => v.MaterielCode == materielCode));
            //return sugarQueryable.InnerJoin(sugarQueryable1, (a, b) => a.LocationCode == b.LocationCode).Select((a, b) => b).OrderBy(a => a.CreateDate).Includes(a => a.Details).ToList();
@@ -216,7 +221,7 @@
        {
            List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();

            return GetStockInfos(materielCode, batchNo,supplyCode, locationCodes);
            return GetStockInfos(materielCode, batchNo, supplyCode, locationCodes);
        }

        public Dt_StockInfo GetPalletStockInfo(int locationType)
@@ -227,49 +232,167 @@

        public List<Dt_StockInfo> GetStockInfosByPalletCodes(List<string> palletCodes)
        {
            return Db.Queryable<Dt_StockInfo>().Where(x => palletCodes.Contains(x.PalletCode)).Includes(x => x.Details).ToList();
            return Db.Queryable<Dt_StockInfo>().Where(x => palletCodes.Contains(x.PalletCode)).Includes(x => x.Details).OrderBy(x => x.CreateDate).ToList();
        }
        // æ·»åŠ èŽ·å–单个托盘库存的方法（如果不存在）
        public Dt_StockInfo GetStockInfoByPalletCode(string palletCode)
        {
            return Db.Queryable<Dt_StockInfo>()
                .Where(x => x.PalletCode == palletCode)
                .Includes(x => x.Details)
                .First();
        }

 
        /// <summary>
        /// 
        /// </summary>
        /// <param name="orderId"></param>
        /// <param name="materielCode"></param>
        /// <returns></returns>
        //public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
        //{
        //    try
        //    {
        //        Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
        //        if (outboundOrder == null)
        //        {
        //            throw new Exception($"未找到出库单信息");
        //        }

        //        List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();

        //        return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
        //        {
        //            LocationCode = a.LocationCode,
        //            MaterielCode = b.MaterielCode,
        //            MaterielName = b.MaterielName,
        //            Barcode=b.Barcode,
        //            PalletCode = a.PalletCode,
        //            UseableQuantity = b.StockQuantity - b.OutboundQuantity
        //        }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
        //        {
        //            LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
        //            MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
        //            MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
        //            Barcode=x.FirstOrDefault()?.Barcode??"",
        //            PalletCode = x.Key,
        //            UseableQuantity = x.Sum(x => x.UseableQuantity)
        //        }).ToList();
        //    }
        //    catch (Exception ex)
        //    {
        //        return null;
        //    }

        //} 

        public List<StockSelectViewDTO> GetAllocateSelectViewDTOs(int orderId, string materielCode)
        {
            var dballocate = _allocateRepository.Db.Queryable<Dt_AllocateOrder>().First(x => x.Id == orderId);
            if (dballocate == null)
            {
                throw new Exception($"未找到单据编号为{dballocate.OrderNo}的单信息");

            }

            var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == dballocate.OrderNo).First();
            if (outboundOrder == null)
            {
                throw new Exception($"未找到单据编号为{dballocate.OrderNo}的出库单信息");
            }
            return GetStockSelectViews(outboundOrder.Id, materielCode);
        }

        public List<StockSelectViewDTO> GetSelectViewDTOs(string orderNo, string materielCode)
        {
            var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderNo).First();
            if (outboundOrder == null)
            {
                throw new Exception($"未找到单据编号为{orderNo}的出库单信息");
            }
            return GetStockSelectViews(outboundOrder.Id, materielCode);
        }

        public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
        {
            try
            Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
            if (outboundOrder == null)
            {
                Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == orderId);
                if (outboundOrder == null)
                throw new Exception($"未找到ID为{orderId}的出库单信息");
            }

            // èŽ·å–出库单明细，用于确定需要的批次和供应商
            var orderDetails = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrderDetail>().Where(x => x.OrderId == orderId && x.MaterielCode == materielCode).ToList();

            if (!orderDetails.Any())
            {
                throw new Exception($"出库单{orderId}中未找到物料{materielCode}的明细信息");
            }

            List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
            var result = new List<StockSelectViewDTO>();

            // ä¸ºæ¯ä¸ªå‡ºåº“单明细查询对应的库存
            foreach (var orderDetail in orderDetails)
            {
                // æž„建查询条件
                var stockQuery = Db.Queryable<Dt_StockInfo>()
                    .Where(x => locationCodes.Contains(x.LocationCode))
                    .Where(x => x.StockStatus == (int)StockStatusEmun.入库完成 || x.StockStatus == (int)StockStatusEmun.过期)
                    .Includes(x => x.Details);

                // æ‰§è¡ŒæŸ¥è¯¢å¹¶æŒ‰å…ˆè¿›å…ˆå‡ºæŽ’序
                var Qstocks = stockQuery.Where(x => x.Details.Any(d => d.MaterielCode == materielCode && d.StockQuantity > d.OutboundQuantity));

                if (!string.IsNullOrEmpty(orderDetail.BatchNo))
                {
                    throw new Exception($"未找到出库单信息");

                    Qstocks = stockQuery.Where(x => x.Details.Any(d => d.BatchNo == orderDetail.BatchNo));

                }
                if (!string.IsNullOrEmpty(orderDetail.SupplyCode))
                {

                    Qstocks = stockQuery.Where(x => x.Details.Any(d => d.SupplyCode == orderDetail.SupplyCode));

                }

                List<string> locationCodes = _locationInfoService.GetCanOutLocationCodes();
                var stocks = Qstocks.OrderBy(x => x.CreateDate).ToList();

                return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
                foreach (var stock in stocks)
                {
                    LocationCode = a.LocationCode,
                    MaterielCode = b.MaterielCode,
                    MaterielName = b.MaterielName,
                    PalletCode = a.PalletCode,
                    UseableQuantity = b.StockQuantity - b.OutboundQuantity
                }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
                {
                    LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
                    MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
                    MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
                    PalletCode = x.Key,
                    UseableQuantity = x.Sum(x => x.UseableQuantity)
                }).ToList();
            }
            catch (Exception ex)
            {
                return null;
                    var relevantDetails = stock.Details
                        .Where(d => d.MaterielCode == materielCode &&
                                   string.IsNullOrEmpty(orderDetail.BatchNo) ? true : d.BatchNo == orderDetail.BatchNo &&
                                   string.IsNullOrEmpty(orderDetail.SupplyCode) ? true : d.SupplyCode == orderDetail.SupplyCode &&
                                   d.StockQuantity > d.OutboundQuantity)
                        .ToList();

                    if (relevantDetails.Any())
                    {
                        var firstDetail = relevantDetails.First();
                        var useableQuantity = relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);

                        result.Add(new StockSelectViewDTO
                        {
                            LocationCode = stock.LocationCode,
                            MaterielCode = firstDetail.MaterielCode,
                            MaterielName = firstDetail.MaterielName,
                            BatchNo = orderDetail.BatchNo,
                            SupplyCode = orderDetail.SupplyCode,
                            Barcode = firstDetail.Barcode,
                            PalletCode = stock.PalletCode,
                            UseableQuantity = useableQuantity,
                            StockCreateDate = stock.CreateDate,
                            StockId = stock.Id,
                            OrderDetailId = orderDetail.Id // å…³è”到具体的出库单明细
                        });
                    }
                }
            }

            return result;
        }

    }
}