2222

wanshenmean

2024-11-03 a15d996584733d60d0adddcd791f029d608c4fae

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

@@ -1,8 +1,8 @@
using WIDESEA_Common;
using WIDESEA_DTO;
using WIDESEA_IStorageTaskRepository;
using WIDESEA_Repository;
using WIDESEA_StorageTaskRepository;
using Mapster;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStoragIntegrationServices;
using WIDESEA_StorageBasicRepository;

namespace WIDESEA_StorageOutTaskServices;

@@ -22,6 +22,10 @@
    private readonly IPointStackerRelationRepository _pointStackerRelationRepository;
    private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
    private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
    private readonly IBoxingInfoRepository _boxingInfoRepository;
    private readonly ICellStateService _cellStateService;
    private readonly IProcessApplyService _processApplyService;
    private readonly IDt_AreaInfoRepository _areaInfoRepository;

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -36,7 +40,11 @@
                                IDt_WareAreaInfoRepository wareAreaInfoRepository,
                                IPointStackerRelationRepository pointStackerRelationRepository,
                                ITaskExecuteDetailRepository taskExecuteDetailRepository,
                                ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository) : base(BaseDal)
                                ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
                                IBoxingInfoRepository boxingInfoRepository,
                                ICellStateService cellStateService,
                                IProcessApplyService processApplyService,
                                IDt_AreaInfoRepository areaInfoRepository) : base(BaseDal)
    {
        _unitOfWorkManage = unitOfWorkManage;
        _outOrderRepository = outOrderRepository;
@@ -51,12 +59,18 @@
        _pointStackerRelationRepository = pointStackerRelationRepository;
        _taskExecuteDetailRepository = taskExecuteDetailRepository;
        _locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
        _boxingInfoRepository = boxingInfoRepository;
        _cellStateService = cellStateService;
        _processApplyService = processApplyService;
        _areaInfoRepository = areaInfoRepository;
    }

    #region 外部接口方法

    #region 堆垛机出库任务完成

    /// <summary>
    /// 堆垛机任务完成
    /// 堆垛机出库任务完成
    /// </summary>
    /// <param name="saveModel">任务数据合集</param>
    /// <returns>返回结果集</returns>
@@ -66,34 +80,46 @@
        try
        {
            // 更新库存状态
            // 设置库位状态为空闲
            stock.LocationInfo.LocationStatus = LocationEnum.Free.ObjToInt();
            // 设置库存状态为出库
            stock.StockInfoDetails.ForEach(x =>
            {
                x.Status = 2;
            });

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

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

            // 事务处理
            // 开始事务
            _unitOfWorkManage.BeginTran();
            // 更新库存信息
            var isStockUpdated = _stockInfoRepository.UpdateData(stock);
            // 更新任务信息
            var isTaskUpdated = await Update(task);

            // 如果库存信息和任务信息都更新成功
            if (isStockUpdated && isTaskUpdated)
            {
                // 记录日志
                LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", $"事务处理完成，库存状态更新：{isStockUpdated}，任务状态更新:{isTaskUpdated}");
                // 提交事务
                _unitOfWorkManage.CommitTran();
                // 返回成功结果
                return content.OK("任务完成成功");
            }
            else
            {
                // 记录日志
                LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", $"事务处理失败，库存状态更新：{isStockUpdated}，任务状态更新:{isTaskUpdated}");
                // 回滚事务
                _unitOfWorkManage.RollbackTran();
                // 返回失败结果
                return content.Error("任务或库存更新失败");
            }
        }
@@ -105,46 +131,9 @@
        }
    }

    /// <summary>
    /// 出库任务完成
    /// </summary>
    /// <param name="saveModel">任务数据合集</param>
    /// <returns>返回结果集</returns>
    public async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, DtStockInfo stock)
    {
        WebResponseContent content = new WebResponseContent();
    #endregion 堆垛机出库任务完成

        try
        {
            // 更新出库订单和库存货位信息
            var orderStock = await UpdateOrderAndStockAsync(stock, task.PalletCode);
            LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成", $"更新出库订单和库存货位信息:{JsonConvert.SerializeObject(orderStock)}");

            // 检查订单是否完成并处理后续操作
            if (IsOrderComplete(orderStock))
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成", $"订单出库完成");
                // 处理已完成订单
                await ProcessCompletedOrderAsync(orderStock, task);
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成", $"订单暂未出库完成");
                // 处理未完成订单
                await ProcessUpdateOrderAsync(orderStock, task);
            }

            content.OK("任务完成");
        }
        catch (Exception err)
        {
            // 记录异常信息
            Console.WriteLine(err.Message.ToString());
            content.Error("任务完成失败");
        }

        return content;
    }
    #region 移库任务完成

    /// <summary>
    /// 移库任务完成
@@ -159,7 +148,7 @@
            // 更新货位和库存信息
            (DtStockInfo updateStock, DtLocationInfo locationInf) = UpdateStockLocation(stock, task.NextAddress);
            var taskHty = CreateHistoricalTask(task);
            LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"修改后库存数据：{JsonConvert.SerializeObject(updateStock)}，原先货位数据：{locationInf}");
            LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"货位地址：{task.TargetAddress},修改后库存数据：{JsonConvert.SerializeObject(updateStock)}，原先货位数据：{locationInf}");

            // 执行数据库事务
            bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInf, task.TaskId);
@@ -174,6 +163,62 @@
        }
        return content;
    }

    #endregion 移库任务完成

    #region 入库任务完成

    /// <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 boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
            // 创建库存实例模型
            DtStockInfo stock = new DtStockInfo()
            {
                PalletCode = task.PalletCode,
                LocationCode = task.TargetAddress,
                CreateDate = DateTime.Now,
                Creater = "system",
                IsFull = boxing.IsFull,
                StockInfoDetails = boxDetail,
                LocationInfo = new DtLocationInfo()
            };

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

            // 修改货位信息为有货
            var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
            locationInf.LocationStatus = (int)LocationEnum.InStock;

            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;
    }

    #endregion 入库任务完成

    #region 任务完成

    /// <summary>
    /// 任务完成
@@ -198,22 +243,32 @@
        var stock = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == task.PalletCode);
        if (stock == null)
        {
            return content.Error("库存不存在");
            LogFactory.GetLog("任务完成").InfoFormat(true, "库存不存在存在，判断是否是入库任务", $"{task.TaskType}");
            if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
            {
                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)TaskTypeEnum.Outbound)
        if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
            if (task.TaskState == OutTaskStatusEnum.SC_OutExecuting.ObjToInt())
            if (task.TaskState == TaskOutStatusEnum.SC_OutExecuting.ObjToInt())
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "堆垛机出库完成", "");
                return await CompleteStackTaskAsync(task, stock);
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成", "");
                return await CompleteTaskAsync(task, stock);
                LogFactory.GetLog("任务完成").InfoFormat(true, "库存不存在也不是入库任务", "");
                return content.Error("库存不存在");
            }
        }
        else if (task.TaskType == (int)TaskTypeEnum.RelocationIn)
@@ -228,6 +283,10 @@
        }
    }

    #endregion 任务完成

    #region 请求任务

    /// <summary>
    /// 请求任务
    /// </summary>
@@ -235,39 +294,156 @@
    /// <returns>包含任务信息的响应内容</returns>
    public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
    {
        // 创建一个WebResponseContent对象
        WebResponseContent content = new WebResponseContent();

        try
        {
            // 根据托盘获取库存信息
            var stockInfo = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
            // 创建一个TrayCellsStatusDto对象，并赋值
            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            {
                TrayBarcode = input.PalletCode
            };

            // 获取仓库区域信息
            var areaInfo = await _wareAreaInfoRepository.QueryFirstAsync(x => x.WareAreaCode == input.AreaCode);
            // 调用GetTrayCellStatusAsync方法，获取整盘电芯
            content = await GetTrayCellStatusAsync(trayCells);
            // 如果状态为false，则返回content
            if (!content.Status) return content;

            // 查询是否已有任务
            // 调用GetProcessApplyAsync方法，获取工艺申请
            ProcessApplyDto process = await GetProcessApplyAsync(content);
            // 如果process为null，则返回content
            if (process == null) return content;

            // 调用GetProcessResponseAsync方法，获取工艺响应
            var processResponse = await GetProcessResponseAsync(process, input.Position);

            // 调用BaseDal.QueryFirstAsync方法，查询任务
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);

            if (task != null)
            {
                // 更新现有任务
                content = await UpdateExistingTask(input, areaInfo.AreaID, task);
            }
            else
            {
                // 创建新任务
                content = await CreateNewTask(input, areaInfo.AreaID);
            }
            // 如果task不为null，则调用UpdateExistingTask方法，更新任务；否则调用CreateNewTask方法，创建新任务
            content = task != null ? await UpdateExistingTask(input, task) : await CreateNewTask(processResponse, input);
        }
        catch (Exception err)
        {
            // 错误处理
            // 如果发生异常，则调用content.Error方法，记录错误信息，并输出错误信息
            content.Error(err.Message);
            Console.WriteLine(err.Message);
        }

        // 返回content
        return content;
    }

    // 获取托盘单元格状态
    private async Task<WebResponseContent> GetTrayCellStatusAsync(TrayCellsStatusDto trayCells)
    {
        // 调用_cellStateService.GetTrayCellStatusAsync方法，获取托盘单元格状态
        return await _cellStateService.GetTrayCellStatusAsync(trayCells);
    }

    // 获取工艺申请
    private async Task<ProcessApplyDto> GetProcessApplyAsync(WebResponseContent content)
    {
        // 如果状态为false，则返回null
        if (!content.Status) return null;

        // 将content.Data转换为ResultTrayCellsStatus对象
        var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
        // 创建一个ProcessApplyDto对象，并赋值
        return new ProcessApplyDto()
        {
            WipOrderNo = result.BindCode,
            SerialNos = result.SerialNos.Select(item => new SerialNos
            {
                SerialNo = item.SerialNo
            }).ToList()
        };
    }

    // 获取工艺响应
    private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
    {
        // 如果process为null，则返回null
        if (process == null) return null;

        // 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请
        WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
        // 如果状态为false，则返回null
        if (!content.Status) return null;

        // 将content.Data转换为ResultProcessApply对象
        var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
        // 根据position的值，返回不同的Dt_EquipmentProcess列表
        switch (position)
        {
            case "1088":
                return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                    .Where(x => x.EquipmentType == "陈化" && x.WipOrderNo == apply.WipOrderNo && x.ProductDesc == apply.ProductNo)
                    .ToList();

            default:
                return new List<Dt_EquipmentProcess>();
        }
    }

    #endregion 请求任务

    #region 请求空托盘

    public async Task<WebResponseContent> RequestTrayTaskAsync(string position)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "CH");

            var stockInfo = _stockInfoRepository.QueryData(x => x.Remark == area.AreaCode && x.StockInfoDetails.Any(z => z.MaterielCode == "空托盘")).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;
    }

    #endregion 请求空托盘

    #endregion 外部接口方法

@@ -425,12 +601,16 @@
    /// <returns>更新后的订单和库存信息</returns>
    private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(DtStockInfo stock, string barCode)
    {
        //根据PalletCode获取订单和库存信息
        var orderStock = await _outOrderAndStockRepository.GetOrderAndStock(palletCode: barCode);

        //完成数量增加
        orderStock.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);

        //订单详情完成数量增加
        orderStock.OrderList.OrderDetailList.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);

        //返回更新后的订单和库存信息
        return orderStock;
    }

@@ -439,141 +619,22 @@
    /// </summary>
    /// <param name="orderStock">订单和库存信息</param>
    /// <returns>是否完成</returns>
    // 判断订单是否完成
    private bool IsOrderComplete(Dt_OutOrderAndStock orderStock)
    {
        // 如果出库数量等于完成出库数量，则订单完成
        return orderStock.CompletedQuantity == orderStock.OutboundQuantity;
    }

    /// <summary>
    /// 处理已完成的订单
    /// 创建历史任务记录
    /// </summary>
    /// <param name="orderStock">订单和库存信息</param>
    /// <param name="task">任务数据</param>
    /// <returns>异步任务</returns>
    private async Task ProcessCompletedOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
    {
        // 创建历史订单记录
        var stockHty = CreateHistoricalOrder(orderStock);
        LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成,订单已完成", $"创建历史订单记录：{JsonConvert.SerializeObject(stockHty)}");

        // 创建获取历史任务
        var taskHty = CreateHistoricalTask(task);
        LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成,订单已完成", $"创建历史任务记录：{JsonConvert.SerializeObject(taskHty)}");

        _unitOfWorkManage.BeginTran();

        try
        {
            // 添加历史任务
            var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;

            // 删除任务数据
            var isTaskDelete = await Delete(task.TaskId);

            // 插入历史订单
            var isStockInsert = _outOrderAndStock_HtyRepository.InsertNav(stockHty);

            // 删除原订单
            var isOrderStockDelete = _outOrderAndStockRepository.DeleteNavOrderStock(orderStock);

            if (isStockInsert && isOrderStockDelete && isTaskHtyAdd && isTaskDelete)
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成,订单已完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},插入历史订单：{isStockInsert},删除原订单:{isOrderStockDelete}");
                _unitOfWorkManage.CommitTran();
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成,订单已完成", $"添加数据库失败,请检查数据是否正确,数据回滚。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},插入历史订单：{isStockInsert},删除原订单:{isOrderStockDelete}");
                _unitOfWorkManage.RollbackTran();
            }
        }
        catch (Exception ex)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, $"总任务出库完成,订单已完成,系统异常，异常信息：{ex.Message}", "无参数");
            _unitOfWorkManage.RollbackTran();
            throw; // 重新抛出异常以供外部捕获
        }
    }

    /// <summary>
    /// 处理未完成订单
    /// </summary>
    /// <param name="orderStock">订单和库存信息</param>
    /// <param name="task">任务数据</param>
    /// <returns>异步任务</returns>
    private async Task ProcessUpdateOrderAsync(Dt_OutOrderAndStock orderStock, Dt_Task task)
    {
        // 创建获取历史任务
        var taskHty = CreateHistoricalTask(task);

        _unitOfWorkManage.BeginTran();
        try
        {
            // 添加历史任务
            var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;

            // 删除任务数据
            var isTaskDelete = await Delete(task.TaskId);

            // 更新订单与库存
            var isOrderUpdated = _outOrderAndStockRepository.UpdateNavOrderStock(orderStock);
            if (isTaskDelete && isTaskHtyAdd && isOrderUpdated)
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成,订单暂未完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新订单与库存：{isOrderUpdated}");
                _unitOfWorkManage.CommitTran();
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "总任务出库完成,订单暂未完成", $"添加数据库失败,请检查数据是否正确,数据回滚。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新订单与库存：{isOrderUpdated}");
                _unitOfWorkManage.RollbackTran();
            }
        }
        catch (Exception err)
        {
            LogFactory.GetLog("任务完成").InfoFormat(true, $"总任务出库完成,订单暂未完成,系统异常，异常信息：{err.Message}", "无参数");
            Console.WriteLine(err.Message.ToString());
            _unitOfWorkManage.RollbackTran();
            throw; // 重新抛出异常以供外部捕获
        }
    }

    /// <summary>
    /// 创建历史订单记录
    /// </summary>
    /// <param name="orderStock">订单和库存信息</param>
    /// <returns>历史订单记录</returns>
    private Dt_OutOrderAndStock_Hty CreateHistoricalOrder(Dt_OutOrderAndStock orderStock)
    {
        var stockHty = _mapper.Map<Dt_OutOrderAndStock_Hty>(orderStock);

        //stockHty.StockList.FinishTime = DateTime.Now;
        //stockHty.StockList.OperateType = (int)OperateTypeEnum.自动完成;
        //stockHty.StockList.SourceId = orderStock.StockList.GroupId;
        //stockHty.StockList.GroupId = 0;

        //stockHty.StockList.StockDetailList.ForEach(x =>
        //{
        //    x.FinishTime = DateTime.Now;
        //    x.OperateType = (int)OperateTypeEnum.自动完成;
        //    x.GroupId = 0;
        //});

        stockHty.OrderList.FinishTime = DateTime.Now;
        stockHty.OrderList.OperateType = (int)OperateTypeEnum.自动完成;
        stockHty.OrderList.SourceId = orderStock.OrderList.Id;
        stockHty.OrderList.Id = 0;

        stockHty.OrderList.orderDetailList.FinishTime = DateTime.Now;
        stockHty.OrderList.orderDetailList.OperateType = (int)OperateTypeEnum.自动完成;
        stockHty.OrderList.orderDetailList.Id = 0;

        return stockHty;
    }

    /// <param name="task"></param>
    /// <returns></returns>
    private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
    {
        // 更新任务状态
        task.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
        task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
        task.CurrentAddress = task.NextAddress;

        // 创建历史任务
@@ -582,7 +643,7 @@
        taskHty.TaskId = 0;
        taskHty.OperateType = (int)OperateTypeEnum.自动完成;
        taskHty.SourceId = task.TaskId;
        taskHty.TaskState = OutTaskStatusEnum.OutFinish.ObjToInt();
        taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
        return taskHty;
    }

@@ -591,14 +652,20 @@
    /// </summary>
    /// <param name="stock">库存对象</param>
    /// <param name="toLocation">目标位置</param>
    // 更新库存和位置信息
    private (DtStockInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, string toLocation)
    {
        // 获取库存信息
        var locationInfo = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
        // 将库存状态设置为在库
        locationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();

        // 将库存位置设置为目标位置
        stock.LocationCode = toLocation;
        // 将库存状态设置为在库
        stock.LocationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();

        // 返回更新后的库存和位置信息
        return (stock, locationInfo);
    }

@@ -614,8 +681,17 @@
        _unitOfWorkManage.BeginTran();
        try
        {
            // 更新库存
            var isUpdateStock = await _stockInfoRepository.UpdateDataAsync(stock);
            var isUpdateStock = true;
            if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)
            {
                // 更新库存
                isUpdateStock = await _stockInfoRepository.UpdateDataAsync(stock);
            }
            else
            {
                // 添加库存
                isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
            }

            // 添加历史任务
            var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -629,13 +705,13 @@
            // 提交或回滚事务
            if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
                LogFactory.GetLog("任务完成").InfoFormat(true, "任务完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新或添加库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
                _unitOfWorkManage.CommitTran();
                return true;
            }
            else
            {
                LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"数据处理失败,请检查数据是否正确,数据回滚。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
                LogFactory.GetLog("任务完成").InfoFormat(true, "任务完成", $"数据处理失败,请检查数据是否正确,数据回滚。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
                _unitOfWorkManage.RollbackTran();
                return false;
            }
@@ -658,66 +734,77 @@
    /// <param name="task">任务实例</param>
    /// <param name="content">响应内容</param>
    /// <returns></returns>
    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, int areaId, Dt_Task task)
    private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
    {
        // 创建WebResponseContent对象
        WebResponseContent content = new WebResponseContent();
        // 定义变量
        string toAddress;
        int taskState;
        string original = task.CurrentAddress;
        DtLocationInfo location = new DtLocationInfo();
        int beforeStatus = 0;

        if (input.Type == (int)TaskTypeEnum.Outbound)
        {
            // 处理出库任务
            toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
            taskState = (int)OutTaskStatusEnum.SC_OutFinish;
        }
        else
        {
            // 处理入库任务
            location = await GetLocationDistributeAsync(areaId, task.Roadway);
            toAddress = location.LocationCode;
            taskState = (int)InTaskStatusEnum.Line_InFinish;
        // 根据任务类型判断是出库任务还是入库任务
        //if (input.Type == (int)TaskTypeEnum.Outbound)
        //{
        //    // 处理出库任务
        //    toAddress = await GetRoadWayAsync(areaId, task.Roadway, input.Direction, input.Area, input.Type);
        //    taskState = (int)TaskOutStatusEnum.SC_OutFinish;
        //}
        //else
        //{
        // 处理入库任务
        location = await GetLocationDistributeAsync(task.Roadway);
        toAddress = location.LocationCode;
        taskState = (int)TaskInStatusEnum.Line_InFinish;
        beforeStatus = location.LocationStatus;

            // 更新货位信息
            location.LocationStatus = (int)LocationEnum.Lock;
        }
        // 更新货位信息
        location.LocationStatus = (int)LocationEnum.Lock;
        //}

        // 更新任务信息
        task.SourceAddress = input.Position;
        //task.SourceAddress = input.Position;
        task.CurrentAddress = input.Position;
        task.TargetAddress = toAddress;
        task.NextAddress = toAddress;
        task.TaskState = taskState;

        // 开始事务
        _unitOfWorkManage.BeginTran();
        // 定义变量
        bool isUpdateLo = true;
        bool isUpdateChange = true;

        // 尝试更新任务
        bool isResult = await BaseDal.UpdateDataAsync(task);
        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, true, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, InTaskStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
        if (input.Type != (int)TaskTypeEnum.Outbound)
        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));

        // 创建LocationChangeRecordDto对象
        LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
        {
            DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
            {
                ChangeType = task.TaskType,
                LocationCode = location.LocationCode,
                LocationId = location.Id,
                Creater = "System",
                TaskNum = task.TaskNum,
                AfterStatus = location.LocationStatus,
                BeforeStatus = (int)LocationEnum.Free,
            };
            isUpdateChange = await _locationStatusChangeRecordRepository.AddDataAsync(dtLocationStatusChangeRecord) > 0;
            isUpdateLo = await _locationRepository.UpdateDataAsync(location);
        }
            // 设置变量
            AfterStatus = location.LocationStatus,
            BeforeStatus = beforeStatus,
            TaskNum = task.TaskNum.Value,
            LocationId = location.Id,
            LocationCode = location.LocationCode,
            ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
        };
        // 更新位置状态
        isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
        isUpdateLo = await _locationRepository.UpdateDataAsync(location);

        if (isResult && isUpdateLo && isTaskDetail)
        {
            // 提交事务
            _unitOfWorkManage.CommitTran();
            content.OK(data: task);
        }
        else
        {
            // 回滚事务
            _unitOfWorkManage.RollbackTran();
            content.Error("更新任务失败");
        }
@@ -731,11 +818,12 @@
    /// <param name="areaId">区域ID</param>
    /// <param name="content">响应内容</param>
    /// <returns></returns>
    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, int areaId)
    private async Task<WebResponseContent> CreateNewTask(List<Dt_EquipmentProcess> process, RequestTaskDto input)
    {
        WebResponseContent content = new WebResponseContent();
        List<string> strings = process.Select(x => x.EquipmentName).ToList();
        // 获取目标地址
        string ToAddress = await GetRoadWayAsync(areaId, input.Position, input.Direction, input.Area, input.Type);
        string ToAddress = await GetRoadWayAsync(strings);

        // 创建新任务实例
        var task = new Dt_Task
@@ -750,9 +838,9 @@
            OrderNo = null,
            PalletCode = input.PalletCode,
            SourceAddress = input.Position,
            TaskState = (int)InTaskStatusEnum.InNew,
            TaskState = (int)TaskInStatusEnum.InNew,
            TaskType = (int)TaskTypeEnum.Inbound,
            TaskNum = await BaseDal.GetTaskNo(), 
            TaskNum = await BaseDal.GetTaskNo(),
            Creater = "Systeam"
        };
        // 尝试添加新任务
@@ -761,9 +849,23 @@
        if (isResult)
        {
            task.TaskId = taskId;
            isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, InTaskStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
            isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
            if (isResult)
                content.OK(data: task);
            {
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    TaskNum = 0,
                    Grade = 1,
                    PalletCode = DateTime.Now.ToString("MMddHHmmss"),
                    RoadWay = task.Roadway,
                    SourceAddress = input.Position,
                    TargetAddress = task.Roadway,
                    TaskState = (int)TaskInStatusEnum.InNew,
                    Id = 0,
                    TaskType = (int)TaskInboundTypeEnum.Inbound,
                };
                content.OK(data: taskDTO);
            }
            else
                content.Error("添加任务失败");
        }
@@ -778,13 +880,13 @@
    /// <param name="areaId">区域主键</param>
    /// <param name="roadWay">巷道</param>
    /// <returns></returns>
    public async Task<DtLocationInfo> GetLocationDistributeAsync(int areaId, string roadWay)
    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)
    {
        #region 获取货位

        try
        {
            var locations = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
            var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
            if (locations == null)
            {
                return null;
@@ -809,36 +911,16 @@
    /// <param name="Direction">方向</param>
    /// <param name="area">关系区域</param>
    /// <returns></returns>
    public async Task<string> GetRoadWayAsync(int areaId, string position, string Direction, string area, int type)
    public async Task<string> GetRoadWayAsync(List<string> process)
    {
        var point = new PointStackerRelation();
        if (type == (int)TaskTypeEnum.Inbound)
        {
            point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && x.PointCode == position && x.Area == area);
            if (point == null) { return null; }
            var locationInfos = await _locationRepository.QueryDataAsync(x => x.AreaId == areaId && point.StackerCode.Contains(x.RoadwayNo));
            var groupWithMinCount = locationInfos.GroupBy(x => x.RoadwayNo).OrderBy(x => x.Count()).FirstOrDefault();
        var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
            .GroupBy(x => x.RoadwayNo)
             .OrderBy(g => g.Count()) // 根据每个组的元素数量排序
             .First(); // 取出数量最少的组

            if (groupWithMinCount != null)
                return groupWithMinCount.Key;
            else
                return null;
        }
        else if (type == (int)TaskTypeEnum.Outbound)
        {
            point = await _pointStackerRelationRepository.QueryFirstAsync(x => x.Direction == Direction && position == x.StackerCode && x.Area == area);
            if (point == null) { return null; }
        string minRoadwayNo = minGroup.Key; // 数量最少的组的Key

            string station = point.PointCodeList[0];

            var rList = point.PointCodeList;
            rList.Remove(station);
            rList.Add(station);

            point.PointCodeList = rList;
            return station;
        }
        else { return null; }
        return minRoadwayNo;
    }

    #endregion 任务请求方法