11.06

wanshenmean

2024-11-06 c9982eb3dd76696b8a3851cc6411a71c402d042f

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -1,10 +1,13 @@
using Mapster;
using log4net.Core;
using Mapster;
using Masuit.Tools;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;

namespace WIDESEA_StorageOutTaskServices;
@@ -83,6 +86,101 @@
    /// </summary>
    /// <param name="saveModel">任务数据合集</param>
    /// <returns>返回结果集</returns>
    //public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
    //{
    //    WebResponseContent content = new WebResponseContent();
    //    try
    //    {
    //        if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
    //        {
    //            var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
    //                 .FirstAsync(x => x.EquipmentName == task.Roadway);
    //            EquipmentParameterInfo info = JsonConvert.DeserializeObject<EquipmentParameterInfo>(process.ProcessValue);
    //            AgingOutputDto agingOutputDto = new AgingOutputDto()
    //            {
    //                OpFlag = 1,
    //                EquipmentCode = stock.LocationInfo.RoadwayNo,
    //                TrayBarcode = stock.PalletCode,
    //                SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto()
    //                {
    //                    SlotNo = x.OrderNo.ToInt32(),
    //                    SerialNo = x.SerialNumber,
    //                    SerialNoResult = true,
    //                    ParameterInfo = new List<ParameterInfo>()
    //                    {
    //                        new ParameterInfo()
    //                        {
    //                            LowerLomit =info.LowerControlLimit,
    //                            UpperLimit = info.UpperControlLimit,
    //                            ParameterResult = info.EquipmentAvailabilityFlag,
    //                            ParameterCode = info.ParameterCode,
    //                            ParameterDesc = info.Description,
    //                            TargetValue = info.TargetValue,
    //                            Value = info.TargetValue,
    //                            DefectCode = info.UOMCode
    //                        }
    //                    }
    //                }).ToList()
    //            };
    //            content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
    //            var result = JsonConvert.DeserializeObject<BasicResult>(content.ToString());
    //            if (!result.Success)
    //            {
    //                throw new Exception(result.MOMMessage);
    //            }
    //        }
    //        // 更新库存状态
    //        var loation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
    //        var detail = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);

    //        // 设置库位状态为空闲
    //        loation.LocationStatus = LocationEnum.Free.ObjToInt();

    //        // 更新任务状态
    //        task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
    //        task.CurrentAddress = task.NextAddress;
    //        task.NextAddress = task.TargetAddress;

    //        LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", "更新库存状态与任务状态");

    //        // 事务处理
    //        // 开始事务
    //        _unitOfWorkManage.BeginTran();
    //        // 删除库存信息
    //        var isStockUpdated = _stockInfoRepository.DeleteDataById(stock.Id);
    //        // 删除库存信息
    //        var isStockDetailUpdated = _stockInfoDetailRepository.DeleteDataByIds(detail.Select(x => (object)x.Id).ToArray());
    //        // 删除任务信息
    //        var isTaskUpdated = BaseDal.DeleteDataById(task.TaskId);

    //        // 如果库存信息和任务信息都更新成功
    //        if (isStockUpdated && isTaskUpdated && isStockDetailUpdated)
    //        {
    //            // 记录日志
    //            LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", $"事务处理完成，库存状态更新：{isStockUpdated}，任务状态更新:{isTaskUpdated}");
    //            // 提交事务
    //            _unitOfWorkManage.CommitTran();
    //            // 返回成功结果
    //            return content.OK("任务完成成功");
    //        }
    //        else
    //        {
    //            // 记录日志
    //            LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", $"事务处理失败，库存状态更新：{isStockUpdated}，任务状态更新:{isTaskUpdated}");
    //            // 回滚事务
    //            _unitOfWorkManage.RollbackTran();
    //            // 返回失败结果
    //            return content.Error("任务或库存更新失败");
    //        }
    //    }
    //    catch (Exception err)
    //    {
    //        LogFactory.GetLog("任务完成").InfoFormat(true, $"系统异常，异常信息：{err.Message}", "");
    //        Console.WriteLine(err.Message);
    //        return content.Error(err.Message);
    //    }
    //}

    public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
    {
        WebResponseContent content = new WebResponseContent();
@@ -91,89 +189,126 @@
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
            {
                var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                     .FirstAsync(x => x.EquipmentName == task.Roadway);
                EquipmentParameterInfo info = JsonConvert.DeserializeObject<EquipmentParameterInfo>(process.ProcessValue);
                AgingOutputDto agingOutputDto = new AgingOutputDto()
                {
                    OpFlag = 1,
                    EquipmentCode = stock.LocationInfo.RoadwayNo,
                    TrayBarcode = stock.PalletCode,
                    SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto()
                    {
                        SlotNo = x.OrderNo.ToInt32(),
                        SerialNo = x.SerialNumber,
                        SerialNoResult = true,
                        ParameterInfo = new List<ParameterInfo>()
                        {
                             new ParameterInfo()
                             {
                                  LowerLomit =info.LowerControlLimit,
                                   UpperLimit = info.UpperControlLimit,
                                   ParameterResult = info.EquipmentAvailabilityFlag,
                                   ParameterCode = info.ParameterCode,
                                    ParameterDesc = info.Description,
                                     TargetValue = info.TargetValue,
                                      Value = info.TargetValue,
                                       DefectCode = info.UOMCode
                             }
                        }
                    }).ToList()
                };
                    .FirstAsync(x => x.EquipmentName == task.Roadway);
                var info = JsonConvert.DeserializeObject<EquipmentParameterInfo>(process.ProcessValue);

                var agingOutputDto = MapToAgingOutputDto(stock, info);
                content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
                ValidateResponse(content);
            }
            // 更新库存状态
            var loation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
            var detail = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);

            // 设置库位状态为空闲
            loation.LocationStatus = LocationEnum.Free.ObjToInt();


            // 更新任务状态
            task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
            task.CurrentAddress = task.NextAddress;
            task.NextAddress = task.TargetAddress;

            LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", "更新库存状态与任务状态");
            // 更新库存状态和任务状态
            (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);

            // 事务处理
            // 开始事务
            _unitOfWorkManage.BeginTran();
            // 删除库存信息
            var isStockUpdated = _stockInfoRepository.DeleteDataById(stock.Id);
            // 删除库存信息
            var isStockDetailUpdated = _stockInfoDetailRepository.DeleteDataByIds(detail.Select(x => (object)x.Id).ToArray());
            // 删除任务信息
            var isTaskUpdated = BaseDal.DeleteDataById(task.TaskId);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await UpdateLocationAsync(loc);
                await DeleteStockInfoAsync(stock.Id);
                await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
                await DeleteTaskAsync(task.TaskId);
            });

            // 如果库存信息和任务信息都更新成功
            if (isStockUpdated && isTaskUpdated && isStockDetailUpdated)
            {
                // 记录日志
                LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", $"事务处理完成，库存状态更新：{isStockUpdated}，任务状态更新:{isTaskUpdated}");
                // 提交事务
                _unitOfWorkManage.CommitTran();
                // 返回成功结果
                return content.OK("任务完成成功");
            }
            else
            {
                // 记录日志
                LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", $"事务处理失败，库存状态更新：{isStockUpdated}，任务状态更新:{isTaskUpdated}");
                // 回滚事务
                _unitOfWorkManage.RollbackTran();
                // 返回失败结果
                return content.Error("任务或库存更新失败");
            }
            return content.OK("任务完成成功");
        }
        catch (Exception err)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, $"系统异常，异常信息：{err.Message}", "");
            Console.WriteLine(err.Message);
            LogFactory.GetLog("任务完成").Error(true, $"系统异常，异常信息：{err.Message}");
            return content.Error(err.Message);
        }
    }

    #endregion 堆垛机出库任务完成
    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, EquipmentParameterInfo info)
    {
        return new AgingOutputDto
        {
            OpFlag = 1,
            EquipmentCode = stock.LocationInfo.RoadwayNo,
            TrayBarcode = stock.PalletCode,
            SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto
            {
                SlotNo = x.OrderNo.ToInt32(),
                SerialNo = x.SerialNumber,
                SerialNoResult = true,
                ParameterInfo = new List<ParameterInfo>
            {
                new ParameterInfo
                {
                    LowerLomit = info.LowerControlLimit,
                    UpperLimit = info.UpperControlLimit,
                    ParameterResult = info.EquipmentAvailabilityFlag,
                    ParameterCode = info.ParameterCode,
                    ParameterDesc = info.Description,
                    TargetValue = info.TargetValue,
                    Value = info.TargetValue,
                    DefectCode = info.UOMCode
                }
            }
            }).ToList()
        };
    }

    private void ValidateResponse(WebResponseContent content)
    {
        var result = JsonConvert.DeserializeObject<BasicResult>(content.ToString());
        if (!result.Success)
        {
            throw new Exception(result.MOMMessage);
        }
    }

    private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
    {
        var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
        var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);

        location.LocationStatus = LocationEnum.Free.ObjToInt();
        task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
        task.CurrentAddress = task.NextAddress;
        task.NextAddress = task.TargetAddress;

        LogFactory.GetLog("任务完成").Info(true, "更新库存状态与任务状态");
        return (location, task);
    }

    private async Task DeleteStockInfoAsync(int stockId)
    {
        var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
        if (!isStockUpdated)
        {
            throw new Exception("库存信息更新失败");
        }
    }

    private async Task UpdateLocationAsync(DtLocationInfo info)
    {
        var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
        if (!isStockUpdated)
        {
            throw new Exception("库存信息更新失败");
        }
    }

    private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
    {
        var ids = details.Select(x => (object)x.Id).ToArray();
        var isStockDetailUpdated = await _stockInfoDetailRepository.DeleteDataByIdsAsync(ids);
        if (!isStockDetailUpdated)
        {
            throw new Exception("库存详情信息更新失败");
        }
    }

    private async Task DeleteTaskAsync(int taskId)
    {
        var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(taskId);
        if (!isTaskUpdated)
        {
            throw new Exception("任务信息更新失败");
        }
    }

    #endregion 出库任务完成

    #region 移库任务完成

@@ -215,85 +350,187 @@
    /// </summary>
    /// <param name="task">任务数据合集</param>
    /// <returns>返回结果集</returns>
    //public async Task<WebResponseContent> CompleteInboundTaskAsync(Dt_Task task)
    //{
    //    WebResponseContent content = new WebResponseContent();
    //    try
    //    {
    //        var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
    //        var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

    //        locationInf.LocationStatus = (int)LocationEnum.InStock;

    //        // 创建历史任务实例模型
    //        var taskHty = CreateHistoricalTask(task);

    //        // 创建库存实例模型
    //        DtStockInfo stock;
    //        if (boxing == null)
    //        {
    //            // 空托盘

    //            stock = new DtStockInfo()
    //            {
    //                PalletCode = task.PalletCode,
    //                LocationCode = task.TargetAddress,
    //                CreateDate = DateTime.Now,
    //                Creater = "system",
    //                IsFull = boxing.IsFull,
    //                StockInfoDetails = new List<DtStockInfoDetail>()
    //                {
    //                    new DtStockInfoDetail()
    //                    {
    //                         MaterielCode = "空托盘",
    //                         Id = 0,
    //                    }
    //                }
    //            };
    //        }
    //        else
    //        {
    //            // 实盘
    //            var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
    //            // 创建库存实例模型
    //            stock = new DtStockInfo()
    //            {
    //                PalletCode = task.PalletCode,
    //                LocationCode = task.TargetAddress,
    //                CreateDate = DateTime.Now,
    //                Creater = "system",
    //                IsFull = boxing.IsFull,
    //                StockInfoDetails = boxDetail,
    //            };

    //            AgingInputDto agingInputDto = new AgingInputDto()
    //            {
    //                SerialNos = boxing.BoxingInfoDetails
    //                    .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
    //                    .ToList(),
    //                TrayBarcode = task.PalletCode,
    //                OpFlag = 1
    //            };
    //            var result = await _agingInOrOutInputService.GetOCVInputAsync(agingInputDto);
    //            stock.Remark = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString()).LinedProcessFeedbackTime;

    //            LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");

    //        }

    //        // 执行数据库事务
    //        bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
    //        if (isResult)
    //            content.OK("入库任务完成成功");
    //        else
    //            content.Error("入库任务完成失败");
    //    }
    //    catch (Exception err)
    //    {
    //        Console.WriteLine(err.Message.ToString());
    //    }
    //    return content;
    //}

    /// <summary>
    /// 完成入库任务
    /// </summary>
    /// <param name="task">任务数据合集</param>
    /// <returns>返回结果集</returns>
    public async Task<WebResponseContent> CompleteInboundTaskAsync(Dt_Task task)
    {
        // 初始化响应内容
        WebResponseContent content = new WebResponseContent();
        try
        {
            // 获取装箱信息和目标位置信息
            var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
            var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            // 更新目标位置状态为库存中
            locationInf.LocationStatus = (int)LocationEnum.InStock;

            // 创建历史任务实例模型
            var taskHty = CreateHistoricalTask(task);

            // 创建库存实例模型
            DtStockInfo stock;
            if (boxing == null)
            {
                // 空托盘

                stock = new DtStockInfo()
                {
                    PalletCode = task.PalletCode,
                    LocationCode = task.TargetAddress,
                    CreateDate = DateTime.Now,
                    Creater = "system",
                    IsFull = boxing.IsFull,
                    StockInfoDetails = new List<DtStockInfoDetail>()
                    {
                        new DtStockInfoDetail()
                        {
                             MaterielCode = "空托盘",
                             Id = 0,
                        }
                    }
                };
            }
            else
            {
                // 实盘
                var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
                // 创建库存实例模型
                stock = new DtStockInfo()
                {
                    PalletCode = task.PalletCode,
                    LocationCode = task.TargetAddress,
                    CreateDate = DateTime.Now,
                    Creater = "system",
                    IsFull = boxing.IsFull,
                    StockInfoDetails = boxDetail,
                };

                AgingInputDto agingInputDto = new AgingInputDto()
                {
                    SerialNos = boxing.BoxingInfoDetails
                        .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
                        .ToList(),
                    TrayBarcode = task.PalletCode,
                    OpFlag = 1
                };
                var result = await _agingInOrOutInputService.GetOCVInputAsync(agingInputDto);
                stock.Remark = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString()).LinedProcessFeedbackTime;


                LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");

            }
            // 根据是否有组盘信息创建库存实例模型
            DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);

            // 执行数据库事务
            bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
            if (isResult)
            {
                content.OK("入库任务完成成功");
            }
            else
            {
                content.Error("入库任务完成失败");
            }
        }
        catch (Exception err)
        {
            // 记录异常信息到控制台和日志
            Console.WriteLine(err.Message.ToString());
            LogFactory.GetLog("任务完成").Error(true, err);
        }
        return content;
    }

    /// <summary>
    /// 创建空托盘的库存实例模型
    /// </summary>
    private DtStockInfo CreateEmptyPalletStock(Dt_Task task, DtLocationInfo locationInf)
    {
        return new DtStockInfo()
        {
            PalletCode = task.PalletCode,
            LocationCode = task.TargetAddress,
            CreateDate = DateTime.Now,
            Creater = "system",
            IsFull = false,
            AreaCode = task.Roadway,
            StockInfoDetails = new List<DtStockInfoDetail>()
            {
                new DtStockInfoDetail()
                {
                    MaterielCode = "空托盘",
                    Id = 0,
                }
            }
        };
    }

    /// <summary>
    /// 创建实盘的库存实例模型并调用MOM入库
    /// </summary>
    private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)
    {
        var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
        var stock = new DtStockInfo()
        {
            PalletCode = task.PalletCode,
            LocationCode = task.TargetAddress,
            CreateDate = DateTime.Now,
            Creater = "system",
            IsFull = boxing.IsFull,
            AreaCode = task.Roadway,
            StockInfoDetails = boxDetail,
        };

        // 处理请求参数
        AgingInputDto agingInputDto = new AgingInputDto()
        {
            SerialNos = boxing.BoxingInfoDetails
                .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
                .ToList(),
            TrayBarcode = task.PalletCode,
            OpFlag = 1
        };
        var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
        stock.Remark = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString()).LinedProcessFeedbackTime;

        // 记录日志
        LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");

        return stock;
    }

    #endregion 入库任务完成
@@ -301,13 +538,15 @@
    #region 任务完成

    /// <summary>
    /// 任务完成
    /// 完成任务
    /// </summary>
    /// <param name="taskNum">任务号</param>
    /// <returns></returns>
    /// <param name="taskNum">任务编号</param>
    /// <returns>返回结果集</returns>
    public async Task<WebResponseContent> CompleteAsync(int taskNum)
    {
        // 初始化响应内容
        WebResponseContent content = new WebResponseContent();

        // 提取任务数据
        LogFactory.GetLog("任务完成").InfoFormat(true, "提取任务数据", $"任务号：{taskNum}");

@@ -321,61 +560,28 @@

        // 验证库存是否存在
        var stock = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
        if (stock == null)

        // 根据任务类型调用相应的完成任务方法
        switch (task.TaskType)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, "库存不存在存在，判断是否是入库任务", $"{task.TaskType}");
            if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
            {
            case (int)TaskInboundTypeEnum.Inbound:
            case (int)TaskInboundTypeEnum.InTray:
                LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务", "");
                return await CompleteInboundTaskAsync(task);
            }
            else if (task.TaskType == (int)TaskInboundTypeEnum.InTray)
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "空托盘入库", "");
                return await CompleteInboundTaskAsync(task);
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "任务状态异常", "");
                return content.Error("任务状态异常");
            }
        }
        LogFactory.GetLog("任务完成").InfoFormat(true, "验证库存是否存在", JsonConvert.SerializeObject(stock));

        if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
            if (task.TaskState == TaskOutStatusEnum.Line_OutFinish.ObjToInt())
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", "");
            case (int)TaskOutboundTypeEnum.OutTray:
            case (int)TaskOutboundTypeEnum.Outbound:
                LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
                return await CompleteStackTaskAsync(task, stock);
            }
            else if (task.TaskState == TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "库存不存在也不是入库任务", "");
                return content.Error("库存不存在");
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "任务状态异常", "");
                return content.Error("任务状态异常");
            }
        }
        else if (task.TaskType == (int)TaskTypeEnum.RelocationIn)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", "");
            return await CompleteTransferTaskAsync(task, stock);
        }
        else
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, $"任务状态异常", "无参数");
            return content.Error("任务状态异常");

            default:
                return content.Error("任务类型不存在");
        }
    }

    #endregion 任务完成

    #region 请求任务
    #region 请求任务入库

    /// <summary>
    /// 请求任务
@@ -505,64 +711,222 @@
        }
    }

    #endregion 请求任务
    #endregion 请求任务入库

    #region 请求空托盘
    #region 请求出库

    public async Task<WebResponseContent> RequestTrayTaskAsync(string position)
    //public async Task<WebResponseContent> RequestTrayTaskAsync(string position, int tag, string areaCdoe,List<string> roadways)
    //{
    //    WebResponseContent content = new WebResponseContent();
    //    try
    //    {
    //        // 1==实盘 2 ==空盘
    //        if (tag == 1)
    //        {
    //            // 查询库存信息
    //            DtStockInfo? stockInfo = _stockInfoRepository.QueryData(x => x.AreaCode == areaCdoe && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo)).OrderBy(x => x.CreateDate).FirstOrDefault();
    //            // 创建新任务实例
    //            var task = new Dt_Task()
    //            {
    //                Grade = 1,
    //                Roadway = stockInfo.LocationInfo.RoadwayNo,
    //                TargetAddress = position,
    //                Dispatchertime = DateTime.Now,
    //                MaterialNo = "",
    //                NextAddress = position,
    //                OrderNo = null,
    //                PalletCode = stockInfo.PalletCode,
    //                SourceAddress = stockInfo.LocationCode,
    //                TaskState = (int)TaskOutStatusEnum.OutNew,
    //                TaskType = (int)TaskOutboundTypeEnum.Outbound,
    //                TaskNum = await BaseDal.GetTaskNo(),
    //                Creater = "Systeam"
    //            };
    //            var taskId = await BaseDal.AddDataAsync(task);
    //            bool isResult = taskId > 0;
    //            if (isResult)
    //            {
    //                WMSTaskDTO taskDTO = new WMSTaskDTO()
    //                {
    //                    TaskNum = task.TaskNum.Value,
    //                    Grade = 1,
    //                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
    //                    RoadWay = task.Roadway,
    //                    SourceAddress = stockInfo.LocationCode,
    //                    TargetAddress = task.Roadway,
    //                    TaskState = (int)TaskOutStatusEnum.OutNew,
    //                    Id = 0,
    //                    TaskType = (int)TaskOutboundTypeEnum.OutTray
    //                };
    //                stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
    //                _locationRepository.UpdateData(stockInfo.LocationInfo);
    //                content.OK(data: taskDTO);
    //            }
    //        }
    //        else
    //        {
    //            var stockInfo = _stockInfoRepository.QueryData(x => x.AreaCode == areaCdoe && x.StockInfoDetails.Any(z => z.MaterielCode == "空托盘") && roadways.Contains(x.LocationInfo.RoadwayNo)).OrderBy(x => x.CreateDate).FirstOrDefault();
    //            // 创建新任务实例
    //            var task = new Dt_Task
    //            {
    //                CurrentAddress = stockInfo.LocationCode,
    //                Grade = 1,
    //                Roadway = stockInfo.LocationInfo.RoadwayNo,
    //                TargetAddress = position,
    //                Dispatchertime = DateTime.Now,
    //                MaterialNo = "",
    //                NextAddress = position,
    //                OrderNo = null,
    //                PalletCode = stockInfo.PalletCode,
    //                SourceAddress = stockInfo.LocationCode,
    //                TaskState = (int)TaskOutStatusEnum.OutNew,
    //                TaskType = (int)TaskOutboundTypeEnum.OutTray,
    //                TaskNum = await BaseDal.GetTaskNo(),
    //                Creater = "Systeam"
    //            };

    //            var taskId = await BaseDal.AddDataAsync(task);
    //            bool isResult = taskId > 0;
    //            if (isResult)
    //            {
    //                WMSTaskDTO taskDTO = new WMSTaskDTO()
    //                {
    //                    TaskNum = task.TaskNum.Value,
    //                    Grade = 1,
    //                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
    //                    RoadWay = task.Roadway,
    //                    SourceAddress = stockInfo.LocationCode,
    //                    TargetAddress = task.Roadway,
    //                    TaskState = (int)TaskOutStatusEnum.OutNew,
    //                    Id = 0,
    //                    TaskType = (int)TaskOutboundTypeEnum.OutTray
    //                };
    //                content.OK(data: taskDTO);
    //            }
    //        }
    //    }
    //    catch (Exception ex)
    //    {
    //        throw;
    //    }
    //    return content;
    //}

    /// <summary>
    /// 请求托盘任务
    /// </summary>
    /// <param name="position">目标位置</param>
    /// <param name="tag">托盘类型（1：实盘，2：空盘）</param>
    /// <param name="areaCode">区域编码</param>
    /// <param name="roadways">巷道编码集合</param>
    /// <returns>返回结果集</returns>
    public async Task<WebResponseContent> RequestTrayTaskAsync(string position, int tag, string areaCode, List<string> roadways)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "CH");
            // 根据托盘类型查询库存信息
            DtStockInfo stockInfo = tag == 1
                ? QueryStockInfoForRealTray(areaCode, roadways)
                : QueryStockInfoForEmptyTray(areaCode, roadways);

            var stockInfo = _stockInfoRepository.QueryData(x => x.LocationInfo.AreaId == area.AreaID && x.StockInfoDetails.Any(z => z.MaterielCode == "空托盘")).OrderBy(x => x.CreateDate).FirstOrDefault();
            // 创建新任务实例
            var task = new Dt_Task
            if (stockInfo == null)
            {
                CurrentAddress = stockInfo.LocationCode,
                Grade = 1,
                Roadway = stockInfo.LocationInfo.RoadwayNo,
                TargetAddress = position,
                Dispatchertime = DateTime.Now,
                MaterialNo = "",
                NextAddress = position,
                OrderNo = null,
                PalletCode = stockInfo.PalletCode,
                SourceAddress = stockInfo.LocationCode,
                TaskState = (int)TaskOutStatusEnum.OutNew,
                TaskType = (int)TaskOutboundTypeEnum.OutTray,
                TaskNum = await BaseDal.GetTaskNo(),
                Creater = "Systeam"
            };
                return content.Error("库存信息不存在");
            }

            // 创建新任务实例
            var task = CreateTask(stockInfo, position, tag);
            var taskId = await BaseDal.AddDataAsync(task);
            bool isResult = taskId > 0;
            if (isResult)
            if (!isResult)
            {
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskNum = task.TaskNum.Value,
                    Grade = 1,
                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
                    RoadWay = task.Roadway,
                    SourceAddress = stockInfo.LocationCode,
                    TargetAddress = task.Roadway,
                    TaskState = (int)TaskOutStatusEnum.OutNew,
                    Id = 0,
                    TaskType = (int)TaskOutboundTypeEnum.OutTray
                };
                content.OK(data: taskDTO);
                return content.Error("任务创建失败");
            }

            // 创建任务DTO
            WMSTaskDTO taskDTO = CreateTaskDTO(task);
            if (tag == 1)
            {
                // 更新库存位置状态为不可用
                stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
                await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
            }

            // 返回成功响应
            return content.OK(data: taskDTO);
        }
        catch (Exception ex)
        {
            // 记录异常信息并抛出
            LogFactory.GetLog("请求托盘任务").Error(true, ex);
            throw;
        }
        return content;
    }

    #endregion 请求空托盘
    /// <summary>
    /// 查询实盘库存信息
    /// </summary>
    private DtStockInfo QueryStockInfoForRealTray(string areaCode, List<string> roadways)
    {
        return _stockInfoRepository.QueryData(x => x.AreaCode == areaCode && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))
                                   .OrderBy(x => x.CreateDate)
                                   .FirstOrDefault();
    }

    /// <summary>
    /// 查询空盘库存信息
    /// </summary>
    private DtStockInfo QueryStockInfoForEmptyTray(string areaCode, List<string> roadways)
    {
        return _stockInfoRepository.QueryData(x => x.AreaCode == areaCode && x.StockInfoDetails.Any(z => z.MaterielCode == "空托盘") && roadways.Contains(x.LocationInfo.RoadwayNo))
                                   .OrderBy(x => x.CreateDate)
                                   .FirstOrDefault();
    }

    /// <summary>
    /// 创建任务实例
    /// </summary>
    private Dt_Task CreateTask(DtStockInfo stockInfo, string position, int tag)
    {
        return new Dt_Task
        {
            Grade = 1,
            Roadway = stockInfo.LocationInfo.RoadwayNo,
            TargetAddress = position,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            NextAddress = position,
            OrderNo = null,
            PalletCode = stockInfo.PalletCode,
            SourceAddress = stockInfo.LocationCode,
            TaskState = (int)TaskOutStatusEnum.OutNew,
            TaskType = tag == 1 ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
            TaskNum = BaseDal.GetTaskNo().Result,
            Creater = "System" // 修正拼写错误
        };
    }

    /// <summary>
    /// 创建任务DTO
    /// </summary>
    private WMSTaskDTO CreateTaskDTO(Dt_Task task)
    {
        return new WMSTaskDTO
        {
            TaskNum = task.TaskNum.Value,
            Grade = 1,
            PalletCode = task.PalletCode,
            RoadWay = task.Roadway,
            SourceAddress = task.SourceAddress,
            TargetAddress = task.TargetAddress,
            TaskState = task.TaskState.Value,
            Id = 0,
            TaskType = task.TaskType,
        };
    }

    #endregion 请求出库

    #region 陈化请求出库

@@ -573,8 +937,8 @@
        try
        {
            var area = _areaInfoRepository.QueryFirst(x => x.AreaName == "陈化区");
            // 查询库存信息

            // 查询库存信息
            var stockInfo = _stockInfoRepository.QueryData(x => x.AreaCode == area.AreaCode && Convert.ToDateTime(x.Remark) < DateTime.Now && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).OrderBy(x => x.CreateDate).FirstOrDefault();
            // 创建新任务实例
            var task = new Dt_Task()