合并

wangxinhui

2026-03-13 8dc2427e1c5e5e349bce2d72759034c406eb0848

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs

@@ -5,8 +5,10 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
@@ -43,13 +45,13 @@
        /// <summary>
        /// åˆ†é…åº“å­˜
        /// </summary>
        public (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(List<Dt_OutSGOrderDetail> outboundOrderDetails)
        public (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>,string) AssignStockOutbound(List<Dt_OutSGOrderDetail> outboundOrderDetails)
        {
            if (!outboundOrderDetails.Any())
            {
                throw new Exception($"未找到出库单明细信息");
            }

            string message = "";
            //获取所有排程主表
            List<Dt_OutSGOrder> outBSTOrders = _outboundRepository.OutSGOrderRepository.QueryData(x => outboundOrderDetails.Select(x=>x.OutSGOrderId).Distinct().Contains(x.Id));
            List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
@@ -72,14 +74,20 @@
            foreach (var item in groupDetails)
            {
                decimal needQuantity = item.XqLen;
                //获取可用库存
                List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId);
                //获取所有条码
                List<string> palletCodes = outStocks.Select(x => x.PalletCode).ToList();
                //获取老厂缓存可用库存
                List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseOldCacheStocks(item.MaterialNo, item.Width).Where(x => !palletCodes.Contains(x.PalletCode)).ToList() ?? new List<Dt_StockInfo>();
                //获取立库可用库存
                stockInfos.AddRange(_stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!palletCodes.Contains(x.PalletCode)).ToList());
                if (!stockInfos.Any())
                {
                    throw new Exception($"未找到可分配库存");
                    message += $"物料：{item.MaterialNo},幅宽：{item.Width}无库存；";
                    continue;
                }

                //分配实际库存
                List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, needQuantity).OrderBy(x => x.StockLength - x.StockOutLength).ToList();
                List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutOldStocks(stockInfos, needQuantity).ToList();
                //添加库存分配
                outStocks.AddRange(autoAssignStocks);
                //获取所有该物料单据
@@ -90,7 +98,11 @@
                });
                for (int i = 0; i < details.Count; i++)
                {
                    //订单数量
                    ////订单数量
                    //if ((details.Count-1) == i)
                    //{

                    //}
                    decimal orderQuantity = details[i].XqLen;
                    bool assignStop = true;
                    while (assignStop)
@@ -100,17 +112,20 @@

                        decimal orderDetailNeedQuantity = details[i].XqLen - detailAssignQuantity;

                        if (autoAssignStocks.Count==0)
                        {
                            break;
                        }

                        decimal useStockLength = autoAssignStocks[0].StockLength- autoAssignStocks[0].StockOutLength;
                        Dt_OutSGOrder? sGOrder = outBSTOrders.FirstOrDefault(x => x.Id == details[i].OutSGOrderId);
                        if (orderDetailNeedQuantity > useStockLength)
                        {
                             
                            //生成详情
                            Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(sGOrder, details[i], autoAssignStocks[0], useStockLength);
                            outStockLockInfos.Add(outStockLockInfo);
                            details[i].AssignTotalUsage += useStockLength;
                            autoAssignStocks.Remove(autoAssignStocks[0]);

                        }
                        else
                        {
@@ -118,17 +133,21 @@
                            Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(sGOrder, details[i], autoAssignStocks[0], orderDetailNeedQuantity);
                            outStockLockInfos.Add(outStockLockInfo);
                            details[i].AssignTotalUsage = orderQuantity;
                            autoAssignStocks[0].StockOutLength-= orderDetailNeedQuantity;
                            autoAssignStocks[0].StockOutLength+= orderDetailNeedQuantity;
                            if (autoAssignStocks[0].StockOutLength== autoAssignStocks[0].StockLength)
                            {
                                autoAssignStocks.Remove(autoAssignStocks[0]);
                            }
                            assignStop =false;
                        }
                    }
                    
                }

                locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
                locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Where(x=>!x.LocationCode.IsNullOrEmpty() && !locationInfos.Select(x=>x.LocationCode).Contains(x.LocationCode)).Select(x => x.LocationCode).ToList()));
            }

            return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
            return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos, message);
        }
        /// <summary>
        /// å‡ºåº“库存分配后，更新数据库数据
@@ -137,6 +156,10 @@
        {
            try
            {
                stockInfos.Where(x => x.LocationCode.IsNullOrEmpty()).ToList().ForEach(x =>
                {
                    x.StockStatus = StockStatusEmun.出库完成.ObjToInt();
                });
                _stockService.StockInfoService.Repository.UpdateData(stockInfos);
                BaseDal.UpdateData(outboundOrderDetails);

@@ -152,6 +175,9 @@
                    }

                    _outStockLockInfoService.Repository.AddData(addOutStockLockInfos);
                    List<Dt_OutStockLockInfo> addOutCacheInfos = addOutStockLockInfos.Where(x => x.LocationCode.Contains("老厂缓存区")).ToList();
                    List<Dt_OutLineView> outLineViewsAdd = addOutCacheInfos.Select(x => _mapper.Map<Dt_OutLineView>(x)).ToList();
                    _outboundRepository.OutLineViewRepository.AddData(outLineViewsAdd);
                }
                List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();
                if (updateOutStockLockInfos != null && updateOutStockLockInfos.Any())