美瑞安淮安立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
wangxinhui
2025-07-30 88676143aeceaeec3bd108f9cd609c4f3470ba96 
 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs


@@ -1,4 +1,5 @@


using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;


using MailKit.Search;


using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;


using System;


using System.Collections.Generic;


using System.Linq;


@@ -8,6 +9,7 @@


using WIDESEA_Common.LocationEnum;


using WIDESEA_Common.OrderEnum;


using WIDESEA_Common.StockEnum;


using WIDESEA_Common.WareHouseEnum;


using WIDESEA_Core;


using WIDESEA_Core.BaseRepository;


using WIDESEA_Core.BaseServices;


@@ -47,7 +49,21 @@


            _basicService = basicService;


            _recordService = recordService;


        }




        public WebResponseContent GetOutboundOrderDetails(SaveModel saveModel)


        {


            WebResponseContent content = new WebResponseContent();


            try


            {


                string orderNo = saveModel.MainData["orderNo"].ToString();


                Dt_OutboundOrder inboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderNo == orderNo).Includes(x => x.Details).First();


                content.OK(data: inboundOrder.Details);


            }


            catch (Exception ex)


            {


                content.Error(ex.Message);


            }


            return content;


        }


        /// <summary>


        /// é”å®šåº“存，由系统分配(仅逻辑运算，不生成任务，不修改数据库数据)


        /// </summary>


@@ -223,8 +239,8 @@


            }


            Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);


            List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();


            List<Dt_OutboundOrderDetail> groupDetails = outboundOrderDetails.GroupBy(x => new { x.MaterielCode, x.BatchNo }).Select(x => new Dt_OutboundOrderDetail { OrderQuantity = x.Sum(v => v.OrderQuantity) - x.Sum(v => v.LockQuantity), MaterielCode = x.Key.MaterielCode, BatchNo = x.Key.BatchNo, }).ToList();




            List<Dt_OutboundOrderDetail> groupDetails = outboundOrderDetails.GroupBy(x => new { x.MaterielCode, x.BatchNo }).Select(x => new Dt_OutboundOrderDetail { OrderQuantity = x.Sum(v => v.OrderQuantity) - x.Sum(v => v.LockQuantity), MaterielCode = x.Key.MaterielCode, BatchNo = x.Key.BatchNo }).ToList();


            Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x=>x.WarehouseId== outboundOrder.WarehouseId);


            List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();


            List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();


            foreach (var item in groupDetails)


@@ -239,6 +255,13 @@


                    throw new Exception($"未找到可分配库存");


                }


                List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, item.MaterielCode, needQuantity, out float residueQuantity);


                if (warehouse.WarehouseCode==WarehouseEnum.HA152.ToString())


                {


                    if (needQuantity< autoAssignStocks.Count)


                    {


                        throw new Exception($"系统超时,请稍后再试");


                    }


                }


                item.LockQuantity += needQuantity - residueQuantity;


                outStocks.AddRange(autoAssignStocks);


                float assignQuantity = needQuantity - residueQuantity;


@@ -282,8 +305,6 @@




                locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));


            }








            return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);


        }


@@ -391,7 +412,20 @@


                List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();


                foreach (var item in stockInfos)


                {


                    foreach (var detail in item.Details)


                    {


                        // è¿›è¡Œå®‰å…¨è½¬æ¢


                        if (detail.OutboundQuantity != null && decimal.TryParse(detail.OutboundQuantity.ToString(), out decimal outboundDecimal))  


                        {


                            decimal outboundDecimal1 = Convert.ToDecimal(detail.OutboundQuantity);


                        }


                        else


                        {


                            detail.OutboundQuantity = 0; // é»˜è®¤å€¼æˆ–记录错误


                        }


                    }


                    stockInfoDetails.AddRange(item.Details);




                }


                _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);


                BaseDal.UpdateData(outboundOrderDetails);


@@ -399,14 +433,14 @@


                List<Dt_OutStockLockInfo> addOutStockLockInfos = outStockLockInfos.Where(x => x.Id == 0).ToList();


                if (addOutStockLockInfos != null && addOutStockLockInfos.Any())


                {


                    if(tasks != null)


                    if (tasks != null)


                    {


                        addOutStockLockInfos.ForEach(x =>


                        {


                            x.TaskNum = tasks.FirstOrDefault(v => v.PalletCode == x.PalletCode)?.TaskNum;


                        });


                    }


                   




                    _outStockLockInfoService.Repository.AddData(addOutStockLockInfos);


                }


                List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();