百步立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
肖洋
2024-11-22 5b2265e68c0a493c52ea336f77f8dbcd7655d34a 
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs


@@ -13,7 +13,7 @@




namespace WIDESEA_StorageOutTaskServices;




public class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService


public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService


{


    private readonly LogFactory LogFactory = new LogFactory();


    private readonly IUnitOfWorkManage _unitOfWorkManage;


@@ -93,11 +93,11 @@


        {


            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)


            {


                var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()


                    .FirstAsync(x => x.EquipmentName == task.Roadway);


                var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);


                //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()


                //    .FirstAsync(x => x.EquipmentName == task.Roadway);


                //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);




                var agingOutputDto = MapToAgingOutputDto(stock, info);


                var agingOutputDto = MapToAgingOutputDto(stock);


                content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);


                ValidateResponse(content);


            }


@@ -123,31 +123,37 @@


        }


    }




    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info)


    private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)


    {


        // TODO Value值根据MOM下发的静置时间到当前时间的分钟数


        var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);


        if (area == null)


        {


            throw new Exception("未找到对应的库区信息");


        }


        return new AgingOutputDto


        {


            OpFlag = 1,


            Software = "WMS",


            EquipmentCode = "ECH001-B",


            Software = area.Spare3,


            EquipmentCode = area.Spare2,


            TrayBarcode = stock.PalletCode,


            SerialNos = stock.StockInfoDetails.Select(x => new SerialNoOutDto


            {


                SlotNo = x.OrderNo.ToInt32(),


                SerialNo = x.SerialNumber,


                SerialNoResult = true,


                ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()


                {


                    LowerLomit = y.LowerControlLimit,


                    UpperLimit = y.UpperControlLimit,


                    ParameterResult = y.EquipmentAvailabilityFlag,


                    ParameterCode = y.ParameterCode,


                    ParameterDesc = y.Description,


                    TargetValue = y.TargetValue,


                    Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),


                    DefectCode = y.UOMCode


                }).ToList()


                ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }


                //ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()


                //{


                //    LowerLomit = y.LowerControlLimit,


                //    UpperLimit = y.UpperControlLimit,


                //    ParameterResult = y.EquipmentAvailabilityFlag,


                //    ParameterCode = y.ParameterCode,


                //    ParameterDesc = y.Description,


                //    TargetValue = y.TargetValue,


                //    Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),


                //    DefectCode = y.UOMCode


                //}).ToList()


            }).ToList()


        };


    }


@@ -164,7 +170,7 @@


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


        //var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);




        location.LocationStatus = (int)LocationEnum.Free;


        task.TaskState = (int)TaskOutStatusEnum.OutFinish;


@@ -254,91 +260,6 @@


    /// </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)


    {


        // 初始化响应内容


@@ -374,6 +295,7 @@


            // 记录异常信息到控制台和日志


            Console.WriteLine(err.Message.ToString());


            LogFactory.GetLog("任务完成").Error(true, err);


            content.Error(err.Message);


        }


        return content;


    }


@@ -383,6 +305,8 @@


    /// </summary>


    private DtStockInfo CreateEmptyPalletStock(Dt_Task task, DtLocationInfo locationInf)


    {


        var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);


        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);


        return new DtStockInfo()


        {


            PalletCode = task.PalletCode,


@@ -390,7 +314,8 @@


            CreateDate = DateTime.Now,


            Creater = "system",


            IsFull = false,


            AreaCode = task.Roadway,


            AreaCode = area.AreaCode,


            LocationId = loation.Id,


            StockInfoDetails = new List<DtStockInfoDetail>()


            {


                new DtStockInfoDetail()


@@ -408,6 +333,12 @@


    /// </summary>


    private DtStockInfo CreateFullPalletStock(Dt_Task task, DtLocationInfo locationInf, DtBoxingInfo boxing)


    {


        var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);


        if (loation == null)


            throw new Exception("未找到对应位置信息");


        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);


        if (area == null)


            throw new Exception("未找到对应区域信息");


        var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();


        boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });


        var stock = new DtStockInfo()


@@ -417,7 +348,8 @@


            CreateDate = DateTime.Now,


            Creater = "system",


            IsFull = boxing.IsFull,


            AreaCode = task.Roadway,


            AreaCode = area.AreaCode,


            LocationId = loation.Id,


            StockInfoDetails = boxDetail,


        };




@@ -429,13 +361,16 @@


                .ToList(),


            TrayBarcode = task.PalletCode,


            OpFlag = 1,


            EquipmentCode = "ECH001-B",


            Software = "WMS"


            EquipmentCode = area.Spare2,


            Software = area.Spare3


        };


        var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;


        var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());


        stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;


        stock.SpecialParameterDuration = respone.SpecialParameterDuration;


        //2024年11月16日：新增字段计算应出库时间


        stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));


        stock.ProductionLine = respone.ProductionLine;




        // 记录日志


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


@@ -527,13 +462,18 @@


                    return content.OK(data: taskDTO);


                }


            }




            var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));


            if (area == null)


                return content.Error("改点位不在区域列表中存在");




            // 创建一个TrayCellsStatusDto对象，并赋值


            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()


            {


                Software = "WMS",


                Software = area.Spare3,


                TrayBarcode = input.PalletCode,


                //EquipmentCode = "EQ_CWJZ01"


                EquipmentCode = "ECH001-B"


                EquipmentCode = area.Spare2


            };




            // 调用GetTrayCellStatusAsync方法，获取整盘电芯


@@ -562,6 +502,12 @@




            // 如果process为null，则返回content


            if (process == null) return content;




            // 并赋值上位软件名称和设备编码


            process.Software = area.Spare3;


            process.EquipmentCode = area.Spare2;




            // 调用GetProcessApplyAsync方法，获取工艺申请




            // 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请


            content = await _processApplyService.GetProcessApplyAsync(process);


@@ -690,8 +636,6 @@


        // 创建一个ProcessApplyDto对象，并赋值


        return new ProcessApplyDto()


        {


            EquipmentCode = "ECH001-B",


            Software = "WMS",


            //WipOrderNo = result.BindCode,


            SerialNos = content.SerialNos.Select(item => new SerialNos


            {


@@ -801,19 +745,19 @@


    /// </summary>


    private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)


    {


        // TODO时间根据MOM系统配置的出库时间来获取,暂时不知道MOM返回的时间是什么所以这里测试时候在改


        //return _stockInfoRepository.QueryFirstNavAsync(x => x.AreaCode == areaCode && Convert.ToDateTime(x.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(x.SpecialParameterDuration)) < DateTime.Now


        //                        && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo) && x.StockInfoDetails.Any(x => x.Status == (int)StockStateEmun.已入库) && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).Result;


        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);




        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>().Where(x =>


            x.AreaCode == areaCode &&


            Convert.ToDateTime(x.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(x.SpecialParameterDuration)) < DateTime.Now)


            .Includes(x => x.LocationInfo)


            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))


            .Includes(x => x.StockInfoDetails)


            .Where(x => x.StockInfoDetails.Any(detail => detail.Status == (int)StockStateEmun.已入库))


            .OrderBy(x => x.CreateDate)


            .FirstAsync();


        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()


            .Includes(x => x.LocationInfo) // 预加载LocationInfo


            .Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails


            .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件


            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 过滤条件


            .OrderBy(x => x.OutboundTime) // 排序


            .FirstAsync(); // 获取第一个元素




        //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 查找第一个匹配的元素


        //var firstOrDefault = result[0]; // 查找第一个匹配的元素


        //return firstOrDefault;


        return result;


    }




@@ -822,14 +766,19 @@


    /// </summary>


    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)


    {


        //return _stockInfoRepository.QueryFirstNavAsync(x => x.StockInfoDetails.Any(x => x.MaterielCode == "空托盘") && roadways.Contains(x.LocationInfo.RoadwayNo) && x.StockInfoDetails.Any(x => x.Status == (int)StockStateEmun.已入库) && x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).Result;


        var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);




        var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()


            .Includes(x => x.LocationInfo)


            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && roadways.Contains(x.LocationInfo.RoadwayNo))


            .Includes(x => x.StockInfoDetails)


            .Where(x => x.StockInfoDetails.Any(detail => detail.Status == (int)StockStateEmun.已入库 && detail.MaterielCode == "空托盘"))


            .OrderBy(x => x.CreateDate)


            .FirstAsync();


            .Includes(x => x.LocationInfo) // 预加载LocationInfo


            .Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails


            .Where(x => x.AreaCode == areaCode && x.IsFull == false)


            .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "空托盘"))


            .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 过滤条件


            .OrderBy(x => x.CreateDate) // 排序


            .FirstAsync(); // 转换为列表




        //var firstOrDefault = result[0]; // 查找第一个匹配的元素


        //return firstOrDefault;


        return result;


    }




@@ -895,7 +844,7 @@


            if (task == null)


                return content.Error("未找到任务");




            if (taskState == (int)TaskOutStatusEnum.Line_OutFinish)


            if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish)


            {


                var taskHty = CreateHistoricalTask(task);


                await _unitOfWorkManage.UseTranAsync(async () =>


@@ -1056,7 +1005,7 @@


    /// <returns>是否更新成功</returns>


    public async Task<bool> Update(Dt_Task model)


    {


        return await BaseDal.Update(model);


        return await BaseDal.UpdateDataAsync(model);


    }




    /// <summary>


@@ -1066,7 +1015,7 @@


    /// <returns>是否更新成功</returns>


    public async Task<bool> Update(List<Dt_Task> models)


    {


        return await BaseDal.Update(models);


        return await BaseDal.UpdateDataAsync(models);


    }




    /// <summary>


@@ -1086,7 +1035,7 @@


    /// <returns></returns>


    public async Task<Dt_Task> GetByLocation(string locationID)


    {


        return await Db.Queryable<Dt_Task>().Where(x => x.SourceAddress == locationID).FirstAsync();


        return await BaseDal.QueryFirstAsync(x => x.SourceAddress == locationID);


    }




    /// <summary>


@@ -1096,7 +1045,7 @@


    /// <returns></returns>


    public async Task<Dt_Task> GetByTaskNum(int taskNum)


    {


        return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();


        return await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);


    }




    #endregion 内部调用方法


@@ -1186,12 +1135,13 @@


    /// <param name="taskHty">历史任务对象</param>


    /// <param name="taskId">任务ID</param>


    /// <returns></returns>


    private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)


    private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, DtBoxingInfo boxingInfo = null)


    {


        _unitOfWorkManage.BeginTran();


        try


        {


            var isUpdateStock = true;


            var isDeleteBoxing = true;


            if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)


            {


                // 更新库存


@@ -1201,6 +1151,9 @@


            {


                // 添加库存


                isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);


                isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)


                   .Include(x => x.BoxingInfoDetails)


                   .ExecuteCommandAsync();


            }






@@ -1215,7 +1168,7 @@


            var isTaskDelete = await Delete(taskId);




            // 提交或回滚事务


            if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)


            if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteBoxing)


            {


                LogFactory.GetLog("任务完成").InfoFormat(true, "任务完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新或添加库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");


                _unitOfWorkManage.CommitTran();


@@ -1230,7 +1183,7 @@


        }


        catch (Exception err)


        {


            LogFactory.GetLog("任务完成").InfoFormat(true, $"移库任务完成,系统异常，异常信息：{err.Message}", "无参数");


            LogFactory.GetLog("任务完成").InfoFormat(true, $"任务完成,系统异常，异常信息：{err.Message}", "无参数");


            _unitOfWorkManage.RollbackTran();


            throw; // 抛出异常以便外部捕获


        }


@@ -1246,46 +1199,140 @@


    /// <param name="task">任务实例</param>


    /// <param name="content">响应内容</param>


    /// <returns></returns>


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




    //    // 处理入库任务


    //    location = await GetLocationDistributeAsync(task.Roadway);


    //    toAddress = location.LocationCode;


    //    taskState = (int)TaskInStatusEnum.Line_InFinish;


    //    beforeStatus = location.LocationStatus;




    //    // 更新货位信息


    //    location.LocationStatus = (int)LocationEnum.Lock;




    //    // 更新任务信息


    //    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, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));




    //    // 创建LocationChangeRecordDto对象


    //    LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()


    //    {


    //        // 设置变量


    //        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("更新任务失败");


    //    }


    //    return content;


    //}




    // 更新任务货位




    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 (task == null)


        {


            return new WebResponseContent().Error("任务对象为空");


        }




        // 处理入库任务


        location = await GetLocationDistributeAsync(task.Roadway);


        toAddress = location.LocationCode;


        taskState = (int)TaskInStatusEnum.Line_InFinish;


        beforeStatus = location.LocationStatus;


        try


        {


            // 创建WebResponseContent对象


            var content = new WebResponseContent();




        // 更新货位信息


        location.LocationStatus = (int)LocationEnum.Lock;


            // 获取目标地址和更新任务状态


            var location = await GetLocationDistributeAsync(task.Roadway);


            if (location == null)


            {


                return content.Error("无法获取货位信息");


            }




        // 更新任务信息


            string toAddress = location.LocationCode;


            int taskState = (int)TaskInStatusEnum.Line_InFinish;


            int beforeStatus = location.LocationStatus;




            // 更新货位信息


            location.LocationStatus = (int)LocationEnum.Lock;




            // 更新任务信息


            MapTaskProperties(task, input, toAddress, taskState);




            // 开始事务


            var isResult = await UpdateTaskAsync(task, location, beforeStatus);


            if (!isResult)


            {


                _unitOfWorkManage.RollbackTran();


                return content.Error("更新任务失败");


            }




            // 提交事务


            _unitOfWorkManage.CommitTran();


            return content.OK(data: task);


        }


        catch (Exception ex)


        {


            // 回滚事务


            _unitOfWorkManage.RollbackTran();


            // 这里可以添加日志记录


            return new WebResponseContent().Error($"更新任务时发生错误: {ex.Message}");


        }


    }




    private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)


    {


        task.CurrentAddress = input.Position;


        task.TargetAddress = toAddress;


        task.NextAddress = toAddress;


        task.TaskState = taskState;


    }




        // 开始事务


        _unitOfWorkManage.BeginTran();


        // 定义变量


        bool isUpdateLo = true;


        bool isUpdateChange = true;




        // 尝试更新任务


    // 修改任务


    private async Task<bool> UpdateTaskAsync(Dt_Task task, DtLocationInfo location, int beforeStatus)


    {


        bool isResult = await BaseDal.UpdateDataAsync(task);


        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));


        bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, task.CurrentAddress, task.TargetAddress, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));




        // 创建LocationChangeRecordDto对象


        LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()


        {


            // 设置变量


            AfterStatus = location.LocationStatus,


            BeforeStatus = beforeStatus,


            TaskNum = task.TaskNum.Value,


@@ -1293,23 +1340,11 @@


            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("更新任务失败");


        }


        return content;


        bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);


        bool isUpdateLo = await _locationRepository.UpdateDataAsync(location);




        return isResult && isUpdateLo && isTaskDetail;


    }




    /// <summary>


@@ -1381,16 +1416,25 @@


    /// <summary>


    /// 查找货位


    /// </summary>


    /// <param name="areaId">区域主键</param>


    /// <param name="IsFull">区域主键</param>


    /// <param name="roadWay">巷道</param>


    /// <returns></returns>


    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay)


    public async Task<DtLocationInfo> GetLocationDistributeAsync(string roadWay, bool IsFull = true)


    {


        #region 获取货位




        try


        {


            var locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);


            List<DtLocationInfo> locations;


            if (IsFull)


            {


                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);


            }


            else


            {


                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /*&& x.LocationType ==*/);


            }




            if (locations == null)


            {


                return null;


@@ -1418,7 +1462,7 @@


    public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)


    {


        var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)


            .GroupBy(x => x.RoadwayNo)


             .GroupBy(x => x.RoadwayNo)


             .OrderByDescending(g => g.Count()) // 根据每个组的元素数量排序


             .First(); // 取出数量最多的组