增加质检出入库逻辑

dengjunjie

2025-07-09 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -8,6 +8,12 @@
using WIDESEA_DTO.Stock;
using WIDESEA_Model.Models;
using WIDESEA_Core.Helper;
using Newtonsoft.Json;
using WIDESEA_DTO.WCSInfo;
using WIDESEAWCS_DTO.WCSInfo;
using Microsoft.AspNetCore.DataProtection.KeyManagement;
using WIDESEA_Common.TaskEnum;
using System.Collections;

namespace WIDESEA_TaskInfoService
{
@@ -44,6 +50,7 @@
                            TaskState = OutTaskStatusEnum.OutNew.ObjToInt(),
                            TaskType = TaskTypeEnum.Outbound.ObjToInt(),
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                            //TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
                        };
                        tasks.Add(task);
                    }
@@ -51,7 +58,6 @@
            }
            return tasks;
        }

        /// <summary>
        /// å‡ºåº“任务数据处理
        /// </summary>
@@ -59,59 +65,223 @@
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
        public (List<Dt_Task>?, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, List<Dt_LocationInfo>?, Dt_OutboundOrder?) OutboundTaskDataHandle(int[] keys)
        {
            List<Dt_Task> tasks = new List<Dt_Task>();
            Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);
            List<Dt_Task>? tasks = new List<Dt_Task>();
            List<Dt_OutboundOrderDetail> outboundOrderDetails = _outboundService.OutboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));

            if (outboundOrderDetail == null)
            if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
            {
                throw new Exception("未找到出库单明细信息");
            }

            if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
            if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt()) != null)
            {
                throw new Exception("选择数量超出单据数量");
                throw new Exception("所选出库单明细存在出库中或已完成");
            }
            List<Dt_StockInfo>? stockInfos = null;
            Dt_OutboundOrderDetail? orderDetail = null;
            List<Dt_StockInfo>? stockInfos = new List<Dt_StockInfo>();
            List<Dt_OutboundOrderDetail>? orderDetails = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
            List<Dt_LocationInfo>? locationInfos = null;
            if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
            {
                (List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    tasks = GetTasks(result.Item1);
                    result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                    result.Item3.ForEach(x =>
                    {
                        x.Status = OutStockStatus.出库中.ObjToInt();
                    });
            List<Dt_LocationInfo>? locationInfos1 = null;
            Dt_OutboundOrder? outboundOrder = null;

                    stockInfos = result.Item1;
                    orderDetail = result.Item2;
                    outStockLockInfos = result.Item3;
                    locationInfos = result.Item4;
                }
                else
                {
                    throw new Exception("无库存");
                }
            (List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, Dt_OutboundOrder?) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
            if (result.Item1 != null && result.Item1.Count > 0)
            {
                (List<Dt_Task>?, List<Dt_LocationInfo>?, List<Dt_StockInfo>?) result1 = GetTasks(result.Item1, TaskTypeEnum.Outbound, result.Item4);
                tasks = result1.Item1;
                locationInfos1 = result1.Item2;
                stockInfos.AddRange(result1.Item3);

                stockInfos.AddRange(result.Item1);
                orderDetails = result.Item2;
                outStockLockInfos = result.Item3;
                locationInfos = result.Item4;
                outboundOrder = result.Item5;
            }
            else
            {
                List<Dt_OutStockLockInfo> stockLockInfos = _outboundService.OutboundStockLockInfoService.GetByOrderDetailId(outboundOrderDetail.OrderId);
                if (stockLockInfos != null && stockLockInfos.Count > 0)
                {
                    List<Dt_StockInfo> stocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockLockInfos.Select(x => x.PalletCode).Distinct().ToList());
                    tasks = GetTasks(stocks);
                }
                throw new Exception("无库存");
            }

            return (tasks, stockInfos, orderDetail == null ? null : new List<Dt_OutboundOrderDetail> { orderDetail }, outStockLockInfos, locationInfos);
            return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos, locationInfos1, outboundOrder);
        }
        /// <summary>
        /// åº“存数据转出库任务
        /// </summary>
        /// <param name="stockInfos"></param>
        /// <returns></returns>
        public (List<Dt_Task>?, List<Dt_LocationInfo>?, List<Dt_StockInfo>?) GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType, List<Dt_LocationInfo>? locationInfos)
        {
            List<Dt_Task> tasks = new List<Dt_Task>();
            List<Dt_LocationInfo> locations = new List<Dt_LocationInfo>();
            List<Dt_StockInfo> stocks = new List<Dt_StockInfo>();
            foreach (var item in stockInfos.GroupBy(x => x.LocationCode))
            {
                Dt_LocationInfo locationInfo = locationInfos.First(x => x.LocationCode == item.Key);
                (List<Dt_Task>?, List<Dt_LocationInfo>?, List<Dt_StockInfo>?) result = GetRelocationTask(stockInfos);
                tasks.AddRange(result.Item1);//移库任务
                locations.AddRange(result.Item2);//移库货位
                stocks.AddRange(result.Item3);//移库库存
                foreach (var stockInfo in item.OrderByDescending(x => x.SerialNumber))
                {
                    if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
                    {
                        Dt_Task task = new()
                        {
                            CurrentAddress = stockInfo.LocationCode,
                            Grade = 0,
                            PalletCode = stockInfo.PalletCode,
                            TargetIsPickPlace = false,
                            SourceIsPickPlace = stockInfo.SerialNumber == locationInfo.MaxQty,
                            NextAddress = "1008",
                            Roadway = locationInfo.RoadwayNo,
                            SourceAddress = stockInfo.LocationCode,
                            TargetAddress = "1008",
                            TaskState = TaskOutStatusEnum.OutNew.ObjToInt(),
                            TaskType = taskType.ObjToInt(),
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                        };
                        tasks.Add(task);
                    }
                }
            }
            return (tasks, locations, stocks);
        }
        /// <summary>
        /// èŽ·å–移库任务
        /// </summary>
        /// <param name="locationInfo"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public (List<Dt_Task>?, List<Dt_LocationInfo>?, List<Dt_StockInfo>?) GetRelocationTask(List<Dt_StockInfo> stockInfos)
        {
            List<Dt_Task> dt_Tasks = new List<Dt_Task>();
            List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
            List<Dt_StockInfo> stockInfos1 = new List<Dt_StockInfo>();
            foreach (var item in stockInfos.GroupBy(x => x.LocationCode))
            {
                var locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == item.Key);
                if (locationInfo.Row == 1)
                {
                    var StockInfos = _stockService.StockInfoService.Repository.QueryData(x => x.LocationCode == locationInfo.LocationCode && !stockInfos.Select(x => x.PalletCode).Contains(x.PalletCode)).ToList();
                    foreach (var StockInfo in StockInfos)
                    {
                        foreach (var item1 in item)
                        {
                            if (StockInfo.SerialNumber > item1.SerialNumber)
                            {
                                stockInfos1.Add(StockInfo);
                                break;
                            }
                        }
                    }
                }
            }
            if (stockInfos1.Count > 0)
            {
                List<string> strings = new List<string>();
                foreach (var item in stockInfos1.GroupBy(x => x.LocationCode))
                {
                    Dt_LocationInfo? locationInfo2 = _basicService.LocationInfoService.AssignLocation(strings);
                    if (locationInfo2 == null) throw new Exception("无可移库货位");
                    locationInfo2.LocationStatus = LocationStatusEnum.Relocationing.ObjToInt();
                    strings.Add(locationInfo2.LocationCode);
                    locationInfos.Add(locationInfo2);
                    foreach (var item1 in item.OrderByDescending(x => x.SerialNumber))
                    {
                        locationInfo2.CurrentQty++;
                        Dt_Task task = new()
                        {
                            CurrentAddress = item1.LocationCode,
                            SourceIsPickPlace = item1.SerialNumber == 24,
                            TargetIsPickPlace = locationInfo2.MaxQty == locationInfo2.CurrentQty,
                            Grade = 0,
                            PalletCode = item1.PalletCode,
                            NextAddress = locationInfo2.LocationCode,
                            Roadway = locationInfo2.RoadwayNo,
                            SourceAddress = item1.LocationCode,
                            TargetAddress = locationInfo2.LocationCode,
                            TaskState = WIDESEA_Common.TaskEnum.TaskRelocationStatusEnum.RelocationNew.ObjToInt(),
                            TaskType = TaskRelocationTypeEnum.Relocation.ObjToInt(),
                            TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum))
                        };
                        dt_Tasks.Add(task);
                        item1.SerialNumber = locationInfo2.CurrentQty;
                        item1.StockStatus = StockStatusEmun.移库中.ObjToInt();
                    }
                }
            }
            return (dt_Tasks, locationInfos, stockInfos1);
        }
        /// <summary>
        /// å‡ºåº“任务数据处理/指定出库单出库
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public (List<Dt_Task>?, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, List<Dt_LocationInfo>?, Dt_OutboundOrder?) OutboundTaskDataHandle(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
        {
            List<Dt_Task>? tasks = new List<Dt_Task>();
            if (stockSelectViews == null || stockSelectViews.Count < 1) throw new Exception("未获取到指定库存信息");
            Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);

            if (outboundOrderDetail == null) throw new Exception("未找到出库单明细信息");
            if (outboundOrderDetail.OrderDetailStatus != OrderDetailStatusEnum.New.ObjToInt())
                throw new Exception("所选出库单明细存在出库中或已完成");

            Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
            outboundOrder.Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail };

            List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
            List<Dt_LocationInfo>? locationInfos = null;
            List<Dt_LocationInfo>? locationInfos1 = null;

            (List<Dt_StockInfo>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutboundOrderDetailService.AssignStockOutbound(outboundOrder, stockSelectViews);

            if (result.Item1 != null && result.Item1.Count > 0)
            {
                (List<Dt_Task>?, List<Dt_LocationInfo>?, List<Dt_StockInfo>?) result1 = GetTasks(result.Item1, TaskTypeEnum.Outbound, result.Item3);
                tasks = result1.Item1;
                locationInfos1 = result1.Item2;
                stockInfos.AddRange(result1.Item3);

                stockInfos.AddRange(result.Item1);
                outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                outboundOrderDetail.LockQuantity = result.Item1.Count;
                outStockLockInfos = result.Item2;
                locationInfos = result.Item3;
                outboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
            }
            else
            {
                throw new Exception("无库存");
            }

            return (tasks, stockInfos, new List<Dt_OutboundOrderDetail> { outboundOrderDetail }, outStockLockInfos, locationInfos, locationInfos1, outboundOrder);
        }
        public WebResponseContent NewGenerateOutboundTask(int orderDetailId, List<Dt_Inventory_Batch> inventory_Batches)
        {
            try
            {
                List<Dt_Task> tasks = new List<Dt_Task>();
                List<Dt_InventoryInfo> stockInfos = new List<Dt_InventoryInfo>();
                List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
                Dt_OutboundOrder order = new Dt_OutboundOrder();



                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
@@ -122,9 +292,48 @@
        {
            try
            {
                (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(orderDetailId, stockSelectViews);
                List<Dt_Task> tasks = new List<Dt_Task>();
                List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
                List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
                List<Dt_LocationInfo> locationInfos1 = new List<Dt_LocationInfo>();
                Dt_OutboundOrder order = new Dt_OutboundOrder();

                WebResponseContent content = GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
                #region å‡ºåº“任务数据处理
                (List<Dt_Task>?, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, List<Dt_LocationInfo>?, Dt_OutboundOrder?) result = OutboundTaskDataHandle(orderDetailId, stockSelectViews);
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    tasks.AddRange(result.Item1);
                }
                if (result.Item2 != null && result.Item2.Count > 0)
                {
                    stockInfos.AddRange(result.Item2);
                }
                if (result.Item3 != null && result.Item3.Count > 0)
                {
                    outboundOrderDetails.AddRange(result.Item3);
                }
                if (result.Item4 != null && result.Item4.Count > 0)
                {
                    outStockLockInfos.AddRange(result.Item4);
                }
                if (result.Item5 != null && result.Item5.Count > 0)
                {
                    locationInfos.AddRange(result.Item5);
                }
                if (result.Item6 != null && result.Item6.Count > 0)
                {
                    locationInfos1.AddRange(result.Item6);
                }
                if (result.Item7 != null)
                {
                    order = result.Item7;
                }
                #endregion

                //WebResponseContent content = GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
                WebResponseContent content = GenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, locationInfos1, order);

                return content;
            }
@@ -134,6 +343,59 @@
            }
        }

        public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null, List<Dt_LocationInfo>? locationInfos1 = null, Dt_OutboundOrder? order = null)
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                BaseDal.AddData(tasks);
                if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                {
                    List<Dt_OutStockLockInfo> addOutStockLockInfos = outStockLockInfos.Where(x => x.Id == 0).ToList();
                    if (addOutStockLockInfos != null && addOutStockLockInfos.Any())
                    {
                        if (tasks != null)
                        {
                            addOutStockLockInfos.ForEach(x =>
                            {
                                x.TaskNum = tasks.FirstOrDefault(v => v.PalletCode == x.PalletCode)?.TaskNum;
                            });
                        }

                        _outboundService.OutboundStockLockInfoService.Repository.AddData(addOutStockLockInfos);
                    }
                    List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();
                    if (updateOutStockLockInfos != null && updateOutStockLockInfos.Any())
                    {
                        _outboundService.OutboundStockLockInfoService.Repository.UpdateData(updateOutStockLockInfos);
                    }
                    _stockService.StockInfoService.Repository.UpdateData(stockInfos);
                    _basicRepository.LocationInfoRepository.UpdateData(locationInfos);
                    _basicRepository.LocationInfoRepository.UpdateData(locationInfos1);
                    _outboundService.OutboundOrderService.Repository.UpdateData(order);
                    _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
                }
                else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
                {
                    _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
                }
                #region ä¸‹å‘任务给WCS
                List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);
                var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                if (ResultData.Result == null) throw new Exception($"向WCS下发出库任务超时");
                WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                if (content == null) throw new Exception($"下发出库任务WCS无响应");
                if (!content.Status) throw new Exception(content.Message);
                #endregion
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务后数据更新到数据库
        /// </summary>
@@ -149,10 +411,72 @@
            {
                _unitOfWorkManage.BeginTran();

                #region ç”Ÿæˆç§»åº“任务
                List<Dt_Task> taskList = new List<Dt_Task>();
                List<Dt_StockInfo> dt_StockInfos = _stockService.StockInfoService.Repository.LocationCodesGetStockInfos(tasks.Select(x => x.SourceAddress).ToList());
                List<Dt_StockInfo> dt_stockInfos = dt_StockInfos.Where(x => x.StockStatus == StockStatusEmun.出库锁定.ObjToInt() || tasks.Select(x => x.PalletCode).ToList().Contains(x.PalletCode)).ToList();//待出库库存
                dt_StockInfos = dt_StockInfos.Where(x => !dt_stockInfos.Select(x => x.Id).ToList().Contains(x.Id)).ToList();//排除待出库库存
                if (dt_StockInfos.Count > 0)
                {
                    foreach (var dt_stockInfo in dt_stockInfos)
                    {
                        foreach (var dt_StockInfo in dt_StockInfos.Where(x => x.LocationCode == dt_stockInfo.LocationCode))
                        {
                            if (dt_StockInfo.InDate > dt_stockInfo.InDate)
                            {
                                dt_StockInfo.StockStatus = StockStatusEmun.移库中.ObjToInt();
                                dt_stockInfo.Details.ForEach(x =>
                                {
                                    x.Status = StockStatusEmun.移库中.ObjToInt();
                                });
                            }
                        }
                    }
                    List<Dt_StockInfoDetail> stockInfoDetails = dt_StockInfos.Where(x => x.StockStatus == StockStatusEmun.移库中.ObjToInt()).Select(x => x.Details).ToList().OfType<Dt_StockInfoDetail>().ToList();//待移库详情
                    foreach (var stockInfoDetail in stockInfoDetails.GroupBy(x => x.MaterielCode))
                    {
                        foreach (var item in stockInfoDetail.GroupBy(x => x.BatchNo))
                        {
                            var locationInfo = _basicService.LocationInfoService.AssignLocation(item.Count());//重新分配货位
                            var stockInfo = dt_StockInfos.Where(x => x.Id == item.First().StockId).First();
                            foreach (var infoDetail in item)
                            {
                                Dt_Task task = new Dt_Task()
                                {
                                    CurrentAddress = stockInfo.LocationCode,
                                    Grade = 2,
                                    PalletCode = stockInfo.PalletCode,
                                    NextAddress = locationInfo.LocationCode,
                                    Roadway = locationInfo.RoadwayNo,
                                    SourceAddress = stockInfo.LocationCode,
                                    TargetAddress = locationInfo.LocationCode,
                                    TaskState = WIDESEA_Common.TaskEnum.TaskRelocationStatusEnum.RelocationNew.ObjToInt(),
                                    TaskType = TaskTypeEnum.Relocation.ObjToInt(),
                                    TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                                };
                                taskList.Add(task);
                            }
                            stockInfo.LocationCode = locationInfo.LocationCode;
                        }
                    }
                }
                tasks.AddRange(taskList);
                #endregion

                BaseDal.AddData(tasks);

                #region ä¸‹å‘任务给WCS
                List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);
                var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                if (ResultData.Result == null) throw new Exception($"向WCS下发出库任务超时");
                WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                if (content == null) throw new Exception($"下发出库任务WCS无响应");
                if (!content.Status) throw new Exception(content.Message);
                #endregion

                if (stockInfos != null && outboundOrderDetails != null && outStockLockInfos != null && locationInfos != null)
                {
                    WebResponseContent content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
                    content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);

                    if (content.Status)
                    {
@@ -199,32 +523,43 @@
                List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
                foreach (int key in keys)
                {
                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(key, stockSelectViews);
                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
                        stockInfos.AddRange(result.Item2);
                    }
                    if (result.Item3 != null && result.Item3.Count > 0)
                    {
                        outboundOrderDetails.AddRange(result.Item3);
                    }
                    if (result.Item4 != null && result.Item4.Count > 0)
                    {
                        outStockLockInfos.AddRange(result.Item4);
                    }
                    if (result.Item5 != null && result.Item5.Count > 0)
                    {
                        locationInfos.AddRange(result.Item5);
                    }
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks.AddRange(result.Item1);
                    }
                }
                List<Dt_LocationInfo> locationInfos1 = new List<Dt_LocationInfo>();
                Dt_OutboundOrder order = new Dt_OutboundOrder();

                WebResponseContent content = GenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
                #region å‡ºåº“任务数据处理
                (List<Dt_Task>?, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?, List<Dt_LocationInfo>?, Dt_OutboundOrder?) result = OutboundTaskDataHandle(keys);
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    tasks.AddRange(result.Item1);
                }
                if (result.Item2 != null && result.Item2.Count > 0)
                {
                    stockInfos.AddRange(result.Item2);
                }
                if (result.Item3 != null && result.Item3.Count > 0)
                {
                    outboundOrderDetails.AddRange(result.Item3);
                }
                if (result.Item4 != null && result.Item4.Count > 0)
                {
                    outStockLockInfos.AddRange(result.Item4);
                }
                if (result.Item5 != null && result.Item5.Count > 0)
                {
                    locationInfos.AddRange(result.Item5);
                }
                if (result.Item6 != null && result.Item6.Count > 0)
                {
                    locationInfos1.AddRange(result.Item6);
                }
                if (result.Item7 != null)
                {
                    order = result.Item7;
                }
                #endregion

                //WebResponseContent content = GenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
                WebResponseContent content = GenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, locationInfos1, order);
                return content;
            }
            catch (Exception ex)
@@ -273,7 +608,7 @@

                _unitOfWorkManage.BeginTran();
                stockInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.OutLock.ObjToInt();
                BaseDal.AddData(task);
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();