1

huangxiaoqiang

2025-12-02 aa201fcecc1ce93da4f660a833f7b1176fc037cb

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -3,6 +3,7 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
using NewLife;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
@@ -23,6 +24,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.Stock;
@@ -57,6 +59,8 @@
    private readonly IDt_StationManagerRepository _stationManagerRepository;
    private readonly ISys_ConfigService _configService;
    private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
    private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
    private readonly IDt_InventoryRecordRepository _inventoryRecordRepository;

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -71,7 +75,9 @@
                                IStockInfoDetailRepository stockInfoDetailRepository,
                                IDt_StationManagerRepository stationManagerRepository,
                                ISys_ConfigService configService,
                                IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
                                IDt_OrderOutDetailsRepository orderOutDetailsRepository,
                                IDt_WareAreaInfoRepository wareAreaInfoRepository,
                                IDt_InventoryRecordRepository inventoryRecordRepository) : base(BaseDal)
    {
        _unitOfWorkManage = unitOfWorkManage;
        _stockInfoRepository = stockInfoRepository;
@@ -86,6 +92,8 @@
        _stationManagerRepository = stationManagerRepository;
        _configService = configService;
        _orderOutDetailsRepository = orderOutDetailsRepository;
        _wareAreaInfoRepository = wareAreaInfoRepository;
        _inventoryRecordRepository = inventoryRecordRepository;
    }

    #region å¤–部接口方法
@@ -97,8 +105,12 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
            if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
            {
                var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
            }

            task.TaskState = (int)TaskOutStatusEnum.OutFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -107,57 +119,91 @@
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            stock.ModifyDate = DateTime.Now;
            stock.LocationCode = task.TargetAddress;
            var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
            var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
            var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);

            DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
            var orderDetails = _orderOutDetailsRepository.QueryData(x => x.PalletCode == task.PalletCode);
            List<Dt_OrderOutDetails_Hty> orderdetailshtys = new List<Dt_OrderOutDetails_Hty>();

            orderDetails.ForEach(item =>
            {
                orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
            });
            //盘点出库
            
            if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
        {
            orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
        });

            await ERPAllocateOut(stock);

            //调拨出库
            if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
            {
                if (orderDetails.Count > 0)
                    content = await ERPAllocate(orderDetails);
                    await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.调拨出库单).ToList());
            }
            //其他出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
            {
                if (orderDetails.Count > 0)
                    content = await ERPMixedSend(orderDetails);
                {
                    await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.其他出库单).ToList());
                }
            }
            //生产领料出库
            else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
            {
                if (orderDetails.Count > 0)
                    content = await ERPProduction(orderDetails);
                {
                    content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.生产领料单).ToList());
                }
            }
            await _unitOfWorkManage.UseTranAsync(async () =>

            var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == stock.PalletCode);
            if (boxingInfo != null)
            {
                var mergedDetails = boxingInfo.BoxingInfoDetails
                        .GroupBy(x => new { x.MaterielCode, x.MaterielName })
                        .Select(g => new DtBoxingInfoDetail
                        {
                            MaterielCode = g.Key.MaterielCode,
                            MaterielName = g.Key.MaterielName,
                            DemandClassification = g.FirstOrDefault().DemandClassification,
                            Warehouse = "WMS出库缓存区",
                            WareHouseId = "205",
                            OrderNo = g.FirstOrDefault().OrderNo,
                            Unit = g.FirstOrDefault().Unit,
                            Specs = g.FirstOrDefault().Specs,
                            Weight = g.FirstOrDefault().Weight,
                            DrawingNumber = g.FirstOrDefault().DrawingNumber,
                            Date = g.FirstOrDefault().Date,
                            Remark = g.FirstOrDefault().Remark,
                            Quantity = g.Sum(item => item.Quantity),
                        })
                        .ToList();
                boxingInfo.BoxingInfoDetails = mergedDetails;
            }

            //await _unitOfWorkManage.UseTranAsync(async () =>
            //{
            _unitOfWorkManage.BeginTran();
                await DeleteStockInfoAsync(stock.Id);
                _boxingInfoRepository.UpdateDataNav(boxingInfo);
                await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
                await AddStockInfoHtyAsync(stockInfo_Hty);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
                await _locationRepository.UpdateDataAsync(result2.Item2);
                await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
                await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();

                //_orderOutDetailsRepository.DeleteAndMoveIntoHty(orderDetails,OperateTypeEnum.自动删除);

                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
            _unitOfWorkManage.CommitTran();
            //});
            content.OK("出库完成");

        }
        catch (Exception ex)
        {
            _unitOfWorkManage.RollbackTran();
            task.ErrorMessage = ex.Message;
            await BaseDal.UpdateDataAsync(task);
            return content.Error(ex.Message);
        }
        return content;
@@ -186,14 +232,21 @@
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            stock.ModifyDate = DateTime.Now;
            stock.LocationCode = task.TargetAddress;
            var result = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
            if (stock != null)
            {
                stock.ModifyDate = DateTime.Now;
                stock.LocationCode = task.TargetAddress;
            }
            var result1 = UpdateLocationStatus(locationStart.LocationCode, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticRelocation);
            var result2 = UpdateLocationStatus(locationEnd.LocationCode, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticRelocation);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                _stockInfoRepository.UpdateData(stock);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
                await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
                await _locationRepository.UpdateDataAsync(result2.Item2);
                if (stock != null)
                    _stockInfoRepository.UpdateData(stock);
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
@@ -221,13 +274,20 @@
        try
        {
            var boxinfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
            var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            if (boxinfo == null)
            {
                return content.Error("未找到组盘数据");
            }

            if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
            {
                var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
            }

            

            var stock = CreateStock(boxinfo, task);

@@ -237,30 +297,24 @@
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, StatusChangeTypeEnum.AutomaticInbound);

            content = await ERPAllocate(stock);
            //if (!content.Status)
            //await _unitOfWorkManage.UseTranAsync(async () =>
            //{
            //    throw new Exception(content.Message);
            //}
            //stock.Remark = "";

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await _stockInfoRepository.AddDataNavAsync(stock);
            _unitOfWorkManage.BeginTran();
            await _stockInfoRepository.AddDataNavAsync(stock);
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
                await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationRepository.UpdateDataAsync(result2.Item2);
                await _locationRepository.UpdateDataAsync(result1.Item2);
            });
            _unitOfWorkManage.CommitTran();
            //});
            await ERPAllocate(boxinfo);
            content.OK("入库完成");
        }
        catch (Exception ex)
        {
            _unitOfWorkManage.RollbackTran();
            task.ErrorMessage = ex.Message;
            await BaseDal.UpdateDataAsync(task);
            return content.Error(ex.Message);
@@ -271,7 +325,31 @@
    public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
    {
        var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
        boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });
        boxDetail.ForEach(x =>
        {
            x.Status = (int)StockStateEmun.已入库;
        });
        var mergedDetails = boxDetail
                        .GroupBy(x => new { x.MaterielCode, x.MaterielName })
                        .Select(g => new DtStockInfoDetail
                        {
                            MaterielCode = g.Key.MaterielCode,
                            MaterielName = g.Key.MaterielName,
                            DemandClassification = g.FirstOrDefault().DemandClassification,
                            Warehouse = "智能立库",
                            WareHouseId = "107",
                            OrderNo = g.FirstOrDefault().OrderNo,
                            Unit = g.FirstOrDefault().Unit,
                            Specs = g.FirstOrDefault().Specs,
                            Weight = g.FirstOrDefault().Weight,
                            OutboundQuantity = g.FirstOrDefault().OutboundQuantity,
                            DrawingNumber = g.FirstOrDefault().DrawingNumber,
                            Date = g.FirstOrDefault().Date,
                            AllocateWarehouse = g.FirstOrDefault().AllocateWarehouse,
                            Remark = g.FirstOrDefault().Remark,
                            Quantity = g.Sum(item => item.Quantity),
                        })
                        .ToList();
        return new DtStockInfo()
        {
            PalletCode = task.PalletCode,
@@ -279,69 +357,11 @@
            CreateDate = DateTime.Now,
            Creater = "system",
            IsFullExit = boxingInfo.IsFullExit,
            StockInfoDetails = boxDetail,
            StockInfoDetails = mergedDetails,
            StockStatus = (int)StockStateEmun.已入库
        };
    }
    #endregion å…¥åº“任务完成

    #region AGV搬运任务完成
    public async Task<WebResponseContent> CompleteCarryTaskAsync(Dt_Task task,DtStockInfo stockInfo)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var Sourcelocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
            var Targetlocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

            //UpdateLocationStatus(Sourcelocation, LocationEnum.Free);
            //UpdateLocationStatus(Targetlocation, LocationEnum.InStock);

            task.TaskState = (int)TaskAGVCarryStatusEnum.CarryFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
        return content;
    }

    #endregion

    #region AGV跨楼层任务完成
    public async Task<WebResponseContent> CompleteAcrossFloorTaskAsync(Dt_Task task, DtStockInfo stockInfo)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryFinish;
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
            });
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
        return content;
    }

    #endregion

    #region ä»»åŠ¡å®Œæˆ

@@ -431,6 +451,12 @@
        WebResponseContent content = new WebResponseContent();
        try
        {
            var task = BaseDal.QueryFirst(x => x.PalletCode == taskDto.PalletCode);
            if (task != null)
            {
                return content.Error("该托盘已经存在任务，请勿重复下发");
            }

            var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.组盘暂存);

            if (boxingInfo == null)
@@ -438,14 +464,14 @@
                return content.Error("托盘信息不存在，请确认托盘已组盘成功");
            }

            foreach (var item in boxingInfo.BoxingInfoDetails)
            {
                var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_用友库存一览表_ST>().Where(x => x.仓库名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName).ToList().FirstOrDefault();
                if (ERPStock == null)
                {
                    return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
                }
            }
            //foreach (var item in boxingInfo.BoxingInfoDetails)
            //{
            //    var ERPStock = SqlSugarHelper.DBERP.Queryable<用友即时库存_ST>().Where(x => x.存储地点名称 == item.Warehouse && x.料号 == item.MaterielCode && x.品名 == item.MaterielName && x.库存数量 >= item.Quantity).ToList().FirstOrDefault();
            //    if (ERPStock == null)
            //    {
            //        return content.Error($"组盘数据未在ERP库存数据中，请人工确认数据是否正确");
            //    }
            //}

            var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
            if (StartAddress == null)
@@ -457,72 +483,48 @@
                return content.Error($"起点库位{StartAddress.LocationCode}搬运路径被占用，请人工确认再下发任务");
            }
            Dt_Task taskNew = new Dt_Task();
            DtLocationInfo Endlocation= new DtLocationInfo();
            if (taskDto.AreaId != 0)
            var area = _areaInfoRepository.QueryFirst(x => x.AreaID == taskDto.AreaId);
            if (area == null)
            {
                switch (taskDto.AreaId)
                {
                    case 1:
                        Endlocation = await GetEmptyLocation("SC1");
                        taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
                        break;
                    case 2:
                    case 3:
                    case 4:
                    case 5:
                    case 6:
                        Endlocation = await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress);
                        taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
                        break;
                    default:
                        return content.Error("请选择正确的区域信息");
                }
                return content.Error("请选择入库区域");
            }
            else if (taskDto.TargetAddress != null)

            var locationInfo = await _locationRepository.QueryDataAsync(x => x.AreaId == area.AreaID && x.EnalbeStatus == 1 && x.LocationStatus == (int)LocationEnum.Free);

            var taskArea = BaseDal.QueryData(x => x.TargetAddress == area.AreaName && x.TaskType == (int)TaskInboundTypeEnum.Inbound);

            if (locationInfo.Count - taskArea.Count <= 0)
            {
                Endlocation = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
                if (Endlocation != null && Endlocation.LocationStatus == (int)LocationEnum.Free && Endlocation.EnalbeStatus == 1)
                {
                    switch (Endlocation.AreaId)
                    {
                        case 1:
                            taskNew = InboundStakerArea(taskDto, StartAddress, Endlocation);
                            break;
                        case 2:
                        case 3:
                        case 4:
                        case 5:
                        case 6:
                            taskNew = InboundAGVCacheArea(taskDto, StartAddress, Endlocation);
                            break;
                        default:
                            return content.Error("货位区域未找到");
                    }
                }
                else
                {
                    return content.OK("目标库位不可用");
                }
                return content.Error("该区域无可用库位，请选择其他区域");
            }
            else

            switch (taskDto.AreaId)
            {
                return content.Error("请选择入库区域或终点地址");
                case 1:
                    taskNew = InboundStakerArea(taskDto, StartAddress, area);
                    break;
                case 2:
                case 3:
                case 4:
                case 5:
                case 6:
                case 7:
                    taskNew = InboundAGVCacheArea(taskDto, StartAddress, area);
                    break;
                default:
                    return content.Error("请选择正确的区域信息");
            }
            var taskDTO = CreateListTaskDTO(taskNew);
            
            var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
            var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

            var result = UpdateLocationStatus(StartAddress.LocationCode, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
                await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
                await _locationRepository.UpdateDataAsync(result1.Item2);
                await _locationRepository.UpdateDataAsync(result2.Item2);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                BaseDal.AddData(taskNew);
            });
            return content = await SendWCSTask(taskDTO);
            //return content.OK("成功");
        }
        catch (Exception err)
        {
@@ -530,18 +532,15 @@
        }
    }

    public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,DtLocationInfo EndLocation)
    public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,Dt_AreaInfo area)
    {
        var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
        if (EndLocation == null)
        {
            throw new Exception("无法获取货位信息");
        }

        return new Dt_Task
        {
            Grade = 1,
            Roadway = "SC1",
            TargetAddress = EndLocation.LocationCode,
            TargetAddress = area.AreaName,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            NextAddress = station.stationChildCode,
@@ -559,22 +558,18 @@
        };
    }

    public Dt_Task InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
    public Dt_Task InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
    {
        WebResponseContent content = new WebResponseContent();

        if (location == null)
        {
            throw new Exception("无法获取货位信息");
        }
        Dt_Task taskNew = new Dt_Task();
        if (StartAddress.Floor != location.Floor)
        if (StartAddress.Floor != area.Spare1)
        {
            taskNew = RequestAcrossFloorTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
            taskNew = RequestAcrossFloorTask(StartAddress, area, (int)TaskInboundTypeEnum.Inbound, taskDto);
        }
        else
        {
            taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto);
            taskNew = RequestAGVCarryTask(StartAddress, GetAGVEmptyCacheLocation(area.AreaID, StartAddress).Result, (int)TaskInboundTypeEnum.Inbound, taskDto);
        }
        return taskNew;

@@ -612,51 +607,15 @@
        return content;
    }

    public async Task<WebResponseContent> RequestLocationAsync(RequestTaskDto input)
    {
        await _semaphoreUpdate.WaitAsync();
        WebResponseContent content = new WebResponseContent();
        try
        {
            Dt_Task task = BaseDal.QueryFirst(x => x.PalletCode == input.PalletCode);
            if (task == null)
            {
                return content.Error("任务对象为空");
            }

            task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
            var location = await GetEmptyLocation(task.Roadway);
            if (location == null)
            {
                return content.Error("无法获取货位信息");
            }
            int beforeStatus = location.LocationStatus;

            location.LocationStatus = (int)LocationEnum.Lock;
            task.CurrentAddress = input.Position;
            task.TargetAddress = location.LocationCode;
            task.NextAddress = location.LocationCode;
            task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
            // å¼€å§‹äº‹åŠ¡
            var isResult = await UpdateTaskAsync(task, location, beforeStatus);
            if (!isResult)
            {
                _unitOfWorkManage.RollbackTran();
                return content.Error("更新任务失败");
            }
            return content.OK(data: task);
        }
        catch (Exception)
        {
            throw;
        }
        finally { _semaphoreUpdate.Release(); }
    }

    #endregion

    #region è¯·æ±‚出库
    public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
    /// <summary>
    /// æ‰‹åŠ¨å‡ºåº“至缓存区域
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode,string remark,int doubleTray)
    {
        WebResponseContent content = new WebResponseContent();
        try
@@ -683,35 +642,30 @@
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound, DoubleTray= doubleTray });
            List<Dt_InventoryRecord> records = new List<Dt_InventoryRecord>();
            stcok.StockInfoDetails.ForEach(x =>
            {
                outDetails.Add(new Dt_OrderOutDetails()
                records.Add(new Dt_InventoryRecord()
                {
                    OrderNo = "",
                    PalletCode = stcok.PalletCode,
                    OrderType = (int)OrderTypeEmun.盘点出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "WMS出库缓存区",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "205",
                    OutboundQuantity = x.Quantity,
                    Quantity = x.Quantity,
                    Status = (int)InventoryStatus.Normal,
                    Remark = remark,
                });
            });

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
            var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                BaseDal.AddData(taskNew);
                _stockInfoRepository.UpdateData(stcok);
                await BaseDal.AddDataAsync(taskNew);
                await _inventoryRecordRepository.AddDataAsync(records);
                await _stockInfoRepository.UpdateDataAsync(stcok);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                _orderOutDetailsRepository.AddData(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
@@ -721,36 +675,174 @@
        }
    }

    public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task,int StatusChangeTypeEnum)

    /// <summary>
    /// å…¶ä»–出库
    /// </summary>
    /// <param name="details"></param>
    /// <returns></returns>

    public async Task<WebResponseContent> OtherOutBoundTaskAsync(List<DtStockInfoDetail> details)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
            if (stock == null)
            {
                return content.Error("未找到库存表头信息");
            }
            if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
            {
                return content.Error("请确认库存货位状态是否为有货");
            }
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
            if (task != null)
            {
                return content.Error("该托盘已存在任务");
            }
            if (stock.LocationInfo.AreaId == 2)
            {
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });

            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
            {
                if (x.Quantity < x.OutboundQuantity)
                {
                    throw new Exception($"{x.MaterielName}{x.MaterielCode}出库数量不可大于库存数量");
                }
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.其他出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = "",
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = "",
                    OutboundQuantity = x.OutboundQuantity,
                });
            });
            stock.StockInfoDetails = details;

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await BaseDal.AddDataAsync(taskNew);
                await _stockInfoRepository.UpdateDataNavAsync(stock);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                await _orderOutDetailsRepository.AddDataAsync(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    /// <summary>
    /// æ‰‹åŠ¨è°ƒæ‹¨
    /// </summary>
    /// <param name="details"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> HandAllocateOutBoundTaskAsync(List<DtStockInfoDetail> details)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
            if (stock == null)
            {
                return content.Error("未找到库存表头信息");
            }
            if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
            {
                return content.Error("请确认库存货位状态是否为有货");
            }
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
            if (task != null)
            {
                return content.Error("该托盘已存在任务");
            }
            if (stock.LocationInfo.AreaId == 2)
            {
                return content.Error("该托盘库存已在出库缓存区");
            }

            Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutAllocate });

            List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
            details.Where(x=>x.OutboundQuantity>0).ForEach(x =>
            {
                if (x.Quantity < x.OutboundQuantity)
                {
                    throw new Exception($"{x.MaterielName}{x.MaterielCode}出库数量不可大于库存数量");
                }
                var wareinfo = _wareAreaInfoRepository.QueryFirst(y => y.WareAreaCode ==x.AllocateWarehouse);
                if (wareinfo == null)
                {
                    throw new Exception($"未找到调拨仓库{x.AllocateWarehouse}数据");
                }
                if (wareinfo.WareAreaCode == "205")
                {
                    throw new Exception($"不可调拨至WMS出库缓存区{x.AllocateWarehouse}数据");
                }
                outDetails.Add(new Dt_OrderOutDetails()
                {
                    OrderNo = "",
                    PalletCode = stock.PalletCode,
                    OrderType = (int)OrderTypeEmun.调拨出库单,
                    ERPOrderId = "",
                    MaterielCode = x.MaterielCode,
                    MaterielName = x.MaterielName,
                    AllocateWarehouse = wareinfo.WareAreaName,
                    Warehouse = "智能立库",
                    WareHouseId = "107",
                    AllocateWarehouseId = wareinfo.WareAreaCode ,
                    OutboundQuantity = x.OutboundQuantity,
                });
            });
           
            stock.StockInfoDetails = details;

            var taskDto = CreateListTaskDTO(taskNew);
            var result = GetlcoationState(taskNew, StatusChangeTypeEnum.AutomaticOutbound);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await BaseDal.AddDataAsync(taskNew);
                await _stockInfoRepository.UpdateDataNavAsync(stock);
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
                await _locationRepository.UpdateDataAsync(result.Item2);
                await _orderOutDetailsRepository.AddDataAsync(outDetails);
            });
            return content = await SendWCSTask(taskDto);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) GetlcoationState(Dt_Task task, StatusChangeTypeEnum StatusChangeTypeEnum)
    {
        List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
        List<DtLocationInfo> locations = new List<DtLocationInfo>();
        var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, StatusChangeTypeEnum);
        var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, StatusChangeTypeEnum);
        locationStatusChangeRecords.AddRange(result1.Item1);
        locationStatusChangeRecords.AddRange(result2.Item1);
        locations.AddRange(result1.Item2);
        locations.AddRange(result2.Item2);
        var result = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum);
        locationStatusChangeRecords.AddRange(result.Item1);
        locations.AddRange(result.Item2);

        return (locationStatusChangeRecords,locations);
    }

    public (List<DtLocationStatusChangeRecord>, List<DtLocationInfo>) GetlcoationState(List<Dt_Task> tasks, int StatusChangeTypeEnum)
    {
        List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
        List<DtLocationInfo> locations = new List<DtLocationInfo>();
        foreach (var item in tasks)
        {
            var result1 = UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, StatusChangeTypeEnum);
            var result2 = UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum);
            locationStatusChangeRecords.AddRange(result1.Item1);
            locationStatusChangeRecords.AddRange(result2.Item1);
            locations.AddRange(result1.Item2);
            locations.AddRange(result2.Item2);
        }
        return (locationStatusChangeRecords, locations);
    }


    /// <summary>
    /// è¯·æ±‚出库任务
@@ -772,68 +864,46 @@
        }
        if (!LocationIsOutBound(StartAddress))
        {
            throw new Exception($"起点库位{StartAddress.LocationCode}出库路径被占用，请人工确认再下发任务");
            throw new Exception($"起点库位{StartAddress.LocationCode}出库路径被占用，请稍后重试");
        }
        DtLocationInfo location = null;
        if (taskDto.AreaId != 0)
        {
            if (taskDto.AreaId == 1)
            {
                location = await GetEmptyLocation("SC1");
            }
            else
            {
                location = await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress);
            }

        }
        else if (taskDto.TargetAddress != null)
        {
            location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
        var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);

            if (location != null && location.LocationStatus != (int)LocationEnum.Free && location.EnalbeStatus == 1)
            {
                throw new Exception("目标库位不可用");
            }
        }
        else
        var locationInfo = await _locationRepository.QueryDataAsync(x => x.AreaId == area.AreaID && x.EnalbeStatus == 1 && x.LocationStatus == (int)LocationEnum.Free);

        var taskArea = BaseDal.QueryData(x => x.TargetAddress == area.AreaName && x.TaskType == (int)TaskInboundTypeEnum.Inbound);

        if (locationInfo.Count - taskArea.Count <= 0)
        {
            throw new Exception("请选择入库区域或终点地址");
            throw new Exception($"出库缓存区无可用库位，请清理库位后再试");
        }

        switch (StartAddress.AreaId)
        {
            case 1:
                return OutboundStakerArea(taskDto, StartAddress, location);
                return OutboundStakerArea(taskDto, StartAddress, area);
            case 2:
            case 3:
            case 4:
            case 5:
            case 6:
                return OutboundAGVCacheArea(taskDto, StartAddress, location);
            case 7:
                return OutboundAGVCacheArea(taskDto, StartAddress, area);
            default:
                throw new Exception("请选择正确的区域信息");
        }
    }


    public Dt_Task OutboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
    public Dt_Task OutboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
    {
        var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

        if (location == null)
        {
            throw new Exception("终点区域未找到空闲库位");
        }

        if (location.AreaId == 5 || location.AreaId == 6)
        {
            throw new Exception("当前区域不可出库，请联系管理员");
        }
        return new Dt_Task
        {
            Grade = Convert.ToInt32(StartAddress.Remark),
            Roadway = "SC1",
            TargetAddress = location.LocationCode,
            TargetAddress = area.AreaName,
            Dispatchertime = DateTime.Now,
            MaterialNo = taskDto.MaterielCode,
            NextAddress = station.stationChildCode,
@@ -851,25 +921,89 @@
        };
    }

    public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
    public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
    {
        if (location == null)
        {
            throw new Exception("起点未定义或终点区域未找到空闲库位");
        }
        Dt_Task taskNew = new Dt_Task();
        if (StartAddress.Floor != location.Floor)
        if (StartAddress.Floor != area.Spare1)
        {
            taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto);
            taskNew = RequestAcrossFloorTask(StartAddress, area, taskDto.TaskType, taskDto);
        }
        else
        {
            taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType,  taskDto);
            taskNew = RequestAGVCarryTask(StartAddress, GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress).Result, taskDto.TaskType,  taskDto);
        }
        return taskNew;

    }
    #endregion è¯·æ±‚出库（实盘&空盘）

    #region è¯·æ±‚移库任务
    public async Task<WebResponseContent> RequestRelocationTaskAsync(string SourceAddress,string TargetAddress)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var startLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == SourceAddress);
            var endLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == TargetAddress);

            if (!startLocation.IsNotEmptyOrNull() || !endLocation.IsNotEmptyOrNull())
            {
                return content.Error("库位信息不存在");
            }
            if (endLocation.LocationStatus != (int)LocationEnum.Free)
            {
                return content.Error($"终点库位{endLocation.LocationCode}未处于空闲状态，请人工确认库位状态");
            }
            if ((startLocation.AreaId == 1 || endLocation.AreaId == 1) && startLocation.AreaId != endLocation.AreaId)
            {
                return content.Error("移库起点库位与终点库位不在同一区域");
            }
            if (startLocation.Floor != endLocation.Floor)
            {
                return content.Error("移库起点库位与终点库位不在同一楼层");
            }

            var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == startLocation.LocationCode);
            var taskNew = new Dt_Task
            {
                Grade = startLocation.Floor == "1F" ? 10 : 1,
                Roadway = endLocation.RoadwayNo,
                TargetAddress = endLocation.LocationCode,
                Dispatchertime = DateTime.Now,
                MaterialNo = "",
                NextAddress = endLocation.LocationCode,
                OrderNo = null,
                PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
                SourceAddress = startLocation.LocationCode,
                CurrentAddress = startLocation.LocationCode,
                TaskState = startLocation.AreaId == 1 ? (int)TaskRelocationStatusEnum.RelocationNew : (int)TaskRelocationStatusEnum.RelocationNewAGV,
                TaskType = (int)TaskRelocationTypeEnum.Relocation,
                TaskNum = BaseDal.GetTaskNo().Result,
                CreateDate = DateTime.Now,
                TaskId = 0,
                AGVTaskNum = GenerateUniqueId(),
                Floor = startLocation.Floor,
            };


            var result = AddTaskAsync(new List<Dt_Task>() { taskNew });
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item2);
                await _locationRepository.UpdateDataAsync(result.Item1);
                await BaseDal.AddDataAsync(taskNew);
            });
            await SendWCSTask(CreateListTaskDTO(taskNew));
            return content.OK("成功");
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }


    #endregion

    #region è¯·æ±‚跨楼层2任务
    /// <summary>
@@ -894,14 +1028,15 @@
            {
                stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
            }
            content = await RequestLocation(taskDto.PalletCode);
            Dt_Task taskNew = new Dt_Task
            {
                Grade = 1,
                Roadway = "AGV",
                TargetAddress = task.TargetAddress,
                TargetAddress = content.Data.ToString(),
                Dispatchertime = DateTime.Now,
                MaterialNo = "",
                NextAddress = task.TargetAddress,
                NextAddress = content.Data.ToString(),
                OrderNo = null,
                PalletCode = task.PalletCode,
                SourceAddress = task.SourceAddress,
@@ -920,9 +1055,10 @@
            taskHty.FinishTime = DateTime.Now;
            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

            await UpdateStartLocationInfo(taskNew);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                
                await DeleteTaskAsync(task.TaskId);
                await AddTaskHtyAsync(taskHty);
                BaseDal.AddData(taskNew);
@@ -938,7 +1074,7 @@
    #endregion

    #region è¯·æ±‚跨楼层任务
    public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType,  RequestTaskDto taskDto)
    public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, Dt_AreaInfo area, int TaskType,  RequestTaskDto taskDto)
    {
        WebResponseContent content = new WebResponseContent();

@@ -947,7 +1083,7 @@
        {
            Grade = StartAddress.Column,
            Roadway = "AGV",
            TargetAddress = EndAddress.LocationCode,
            TargetAddress = area.AreaName,
            Dispatchertime = DateTime.Now,
            MaterialNo = taskDto.MaterielCode,
            NextAddress = next.stationChildCode,
@@ -963,6 +1099,7 @@
            Remark = StartAddress.AreaId.ToString(),
            AGVTaskNum = GenerateUniqueId(),
            Floor = StartAddress.Floor,
            DoubleTray = taskDto.DoubleTray,
        };

    }
@@ -1032,16 +1169,20 @@
            {
                return content.Error($"一深位异常锁定暂不可出库");
            }
            else if (locationLateral != null && locationLateral.LocationStatus == (int)LocationEnum.InStockDisable && locationLateral.EnalbeStatus == 1)
            else if (locationLateral != null && (locationLateral.LocationStatus == (int)LocationEnum.InStockDisable|| locationLateral.LocationStatus == (int)LocationEnum.InStock) && locationLateral.EnalbeStatus == 1)
            {
                var taskLateral = BaseDal.QueryFirst(x => x.SourceAddress == locationLateral.LocationCode);
                if (taskLateral != null)
                {
                    return content.OK(data: _mapper.Map<WMSTaskDTO>(taskLateral));
                }

                var TargetAddress = await GetEmptyLocation("SC1");

                if (TargetAddress == null)
                {
                    return content.Error($"未找到可分配货位,请查看是否还有空闲可使用货位");
                }

                //todo查询内侧库存信息
                var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == locationLateral.LocationCode);

                Dt_Task taskNew = new Dt_Task
@@ -1053,7 +1194,7 @@
                    MaterialNo = "",
                    NextAddress = TargetAddress.LocationCode,
                    OrderNo = null,
                    PalletCode = stock.PalletCode,
                    PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
                    SourceAddress = locationLateral.LocationCode,
                    CurrentAddress = locationLateral.LocationCode,
                    TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -1066,8 +1207,6 @@
                var taskDTO = CreateListTaskDTO(taskNew);

                var isResult = await AddTaskAsync(taskNew, locationLateral, TargetAddress);
                //UpdateLocationStatus(TargetAddress, LocationEnum.Lock);
                UpdateLocationStatus(TargetAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
                if (!isResult)
                {
                    _unitOfWorkManage.RollbackTran();
@@ -1101,12 +1240,13 @@

            if (location == null)
            {
                return content.Error("未找到货位或者该库位不是二深货位");
                return content.Error($"未找到货位信息{taskDto.Position}");
            }
            List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
            switch (location.AreaId)
            {
                case 2:
                case 7:
                    locationInfos = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark && x.AreaId == location.AreaId);
                    break;
                case 5:
@@ -1123,14 +1263,14 @@
            }

            List<WMSTaskDTO> taskDTO = new List<WMSTaskDTO>();

            List<Dt_Task> taskNew = new List<Dt_Task>();
            foreach (var item in locationInfos)
            {
                if ((item.LocationStatus == 0 || item.LocationStatus == (int)LocationEnum.FreeDisable) && item.EnalbeStatus == 1)
                if(item.LocationStatus == (int)LocationEnum.Lock)
                {
                    continue;
                    return content.Error($"{item.LocationCode}路径被占用，请稍后再试");
                }
                else
                if ((item.LocationStatus == (int)LocationEnum.InStockDisable || item.LocationStatus == (int)LocationEnum.InStock) && item.EnalbeStatus == 1)
                {
                    DtLocationInfo Targetlocation = await GetAGVEmptyCacheLocation(item.AreaId, item);

@@ -1138,41 +1278,51 @@
                    {
                        return content.Error("起点未定义或终点区域未找到空闲库位");
                    }
                    //todo查询移库库存信息
                    var stock = _stockInfoRepository.QueryFirst(x => x.LocationCode == item.LocationCode);

                    Dt_Task taskNew = new Dt_Task
                    var Relocationtask = BaseDal.QueryFirst(x => x.SourceAddress == item.LocationCode);
                    
                    if (Relocationtask != null)
                    {
                        Grade = item.Column,
                        Roadway = "AGV",
                        TargetAddress = Targetlocation.LocationCode,
                        Dispatchertime = DateTime.Now,
                        MaterialNo = "",
                        NextAddress = Targetlocation.LocationCode,
                        OrderNo = null,
                        PalletCode = _random.Next(0, 10000).ToString(),
                        SourceAddress = item.LocationCode,
                        CurrentAddress = item.LocationCode,
                        TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
                        TaskType = (int)TaskRelocationTypeEnum.Relocation,
                        TaskNum = BaseDal.GetTaskNo().Result,
                        CreateDate = DateTime.Now,
                        TaskId = 0,
                        AGVTaskNum = GenerateUniqueId(),
                        Floor = item.Floor,
                        Remark = item.AreaId.ToString(),
                    };
                    taskDTO.Add(CreateTaskDTO(taskNew));

                    var isResult = await AddTaskAsync(taskNew, item, Targetlocation);
                    UpdateLocationStatus(Targetlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
                    if (!isResult)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return content.Error("新增任务失败");
                        taskDTO.Add(CreateTaskDTO(Relocationtask));
                        continue;
                    }

                    else
                    {
                        taskNew.Add(new Dt_Task
                        {
                            Grade = item.Column,
                            Roadway = "AGV",
                            TargetAddress = Targetlocation.LocationCode,
                            Dispatchertime = DateTime.Now,
                            MaterialNo = "",
                            NextAddress = Targetlocation.LocationCode,
                            OrderNo = null,
                            PalletCode = stock == null ? "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000) : stock.PalletCode,
                            SourceAddress = item.LocationCode,
                            CurrentAddress = item.LocationCode,
                            TaskState = (int)TaskRelocationStatusEnum.RelocationNewAGV,
                            TaskType = (int)TaskRelocationTypeEnum.Relocation,
                            TaskNum = BaseDal.GetTaskNo().Result,
                            CreateDate = DateTime.Now,
                            TaskId = 0,
                            AGVTaskNum = GenerateUniqueId(),
                            Floor = item.Floor,
                            Remark = item.AreaId.ToString(),
                        });
                    }
                    
                }
            }
            taskDTO = CreateTaskDTO(taskNew);

            var result = AddTaskAsync(taskNew);
            await _unitOfWorkManage.UseTranAsync(async () =>
            {
                await _locationStatusChangeRecordRepository.AddDataAsync(result.Item2);
                await _locationRepository.UpdateDataAsync(result.Item1);
                await BaseDal.AddDataAsync(taskNew);
            });
            return content.OK(data: taskDTO);
        }
        catch (Exception ex)
@@ -1181,6 +1331,83 @@
        }
    }


    #endregion

    #region æ›´æ–°èµ·ç‚¹è´§ä½ä¿¡æ¯
    public async Task<WebResponseContent> UpdateStartLocationInfo(Dt_Task task)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (task == null)
                return content.OK();
            var result = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup ? (int)StatusChangeTypeEnum.AutomaticOutbound : (int)StatusChangeTypeEnum.AutomaticInbound);

            await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
            await _locationRepository.UpdateDataAsync(result.Item2);

            return content.OK();
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }


    #endregion

    #region èŽ·å–终点货位信息
    public async Task<WebResponseContent> RequestLocation(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
            if (task == null)
                return content.Error("未找到任务");
            var areaInfo = await _areaInfoRepository.QueryFirstAsync(x => x.AreaName == task.TargetAddress);
            if (areaInfo == null)
                return content.Error($"未找到终点区域信息{task.TargetAddress}请联系管理员");
            var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
            DtLocationInfo locationInfo = new DtLocationInfo();
            switch (areaInfo.AreaID)
            {
                case 1:
                    locationInfo = await GetEmptyLocation("SC1");
                    break;
                case 2:
                case 3:
                case 4:
                case 5:
                case 6:
                case 7:
                    locationInfo = await GetAGVEmptyCacheLocation(areaInfo.AreaID, location);
                    break;
                default:
                    return content.Error("请选择正确的区域信息");
            }
            if (locationInfo == null)
            {
                return content.Error("未找到可分配货位,请查看是否还有空闲可使用货位");
            }
            task.CurrentAddress = task.NextAddress;
            task.TargetAddress = locationInfo.LocationCode;
            task.NextAddress = locationInfo.LocationCode;

            var result = UpdateLocationStatus(locationInfo.LocationCode, LocationEnum.Lock, task.TaskNum.Value, task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup ? StatusChangeTypeEnum.AutomaticOutbound : StatusChangeTypeEnum.AutomaticInbound);
            await BaseDal.UpdateDataAsync(task);
            await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
            await _locationRepository.UpdateDataAsync(result.Item2);

            return content.OK(data: locationInfo.LocationCode);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }

    #endregion

@@ -1237,6 +1464,7 @@
        }
        return wcsBasez + address;
    }

    public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
    {
        WebResponseContent content = new WebResponseContent();
@@ -1282,14 +1510,14 @@
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                documentTypeCode = "LL20",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,
                issueList = orderOutDetails.Select(item => new issueList
                {
                    PickListID = item.MaterielID,
                    PickListID = item.ERPOrderId,
                    //存储地点
                    WhCode = item.WareHouseId,
                    WhCode = "205",
                    //领料数量
                    IssueQty = item.OutboundQuantity,
                }).ToList()
@@ -1300,12 +1528,12 @@

            var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (respone.d.ResultStatus)
            {
                return content.OK();
            }
            return content.Error(respone.ResultMsg);
            return content.Error(respone.d.ResultMsg);
        }
        catch (Exception ex)
        {
@@ -1318,11 +1546,64 @@
    /// <param name="palletCode"></param>
    /// <returns></returns>
    /// 
    public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
    public async Task ERPAllocate(DtBoxingInfo boxing)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (boxing == null)
            {
                throw new Exception("未找到组盘信息");
            }
            Allocate allocate = new Allocate
            {
                context = new Context
                {
                    CultureName = "zh-CN",
                    EntCode = "001",
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

                transferInList = boxing.BoxingInfoDetails.Select(item => new transferInList
                {
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = "107",
                    //调入数量
                    TransInQty = item.Quantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = item.WareHouseId,
                }).ToList()
            };
            var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                throw new Exception(respone.d.ResultMsg);
            }
            
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }

    public async Task ERPAllocateOut(DtStockInfo stock)
    {
        try
        {
            if (stock == null)
            {
                throw new Exception("未找到库存信息");
            }
            Allocate allocate = new Allocate
            {
                context = new Context
@@ -1341,51 +1622,62 @@
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = "107",
                    TransInWHCode = "205",
                    //调入数量
                    TransInQty = item.Quantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = item.WareHouseId,
                    TransOutWHCode = "107",
                }).ToList()
            };
            var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                return content.OK();
                throw new Exception(respone.d.ResultMsg);
            }
            return content.Error(respone.ResultMsg);

        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
            throw new Exception(ex.Message);
        }
    }


    public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            List<transferInList> transferInList=new List<transferInList>();
            orderOutDetails.ForEach(x =>
            if (orderOutDetails.Count <= 0)
            {
                throw new Exception($"未找到调拨出库数据");
            }
            List<transferInList> transferInList=new List<transferInList>();
            foreach (var item in orderOutDetails)
            {
                if (item.AllocateWarehouseId == "205")
                {
                    continue;
                }
                transferInList.Add(new transferInList
                {
                    //物料编码
                    ItemCode = x.MaterielCode,
                    ItemCode = item.MaterielCode,
                    //调入仓库地址
                    TransInWHCode = x.AllocateWarehouseId,
                    TransInWHCode = item.AllocateWarehouseId,
                    //调入数量
                    TransInQty = x.OutboundQuantity,
                    TransInQty = item.OutboundQuantity,
                    // è°ƒå‡ºä»“库编码
                    TransOutWHCode = x.WareHouseId,
                    TransOutWHCode = "205",
                });
            });
            }
            if (transferInList.Count <= 0)
            {
                return;
            }
            Allocate allocate = new Allocate
            {
                context = new Context
@@ -1404,16 +1696,15 @@
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                return content.OK();
                throw new Exception($"ERP调拨出库{respone.d.ResultMsg}");
            }
            return content.Error(respone.ResultMsg);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
            throw new Exception(ex.Message);
        }
    }
    /// <summary>
@@ -1421,11 +1712,14 @@
    /// </summary>
    /// <param name="palletCode"></param>
    /// <returns></returns>
    public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
    public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            if (orderOutDetails.Count <= 0)
            {
                throw new Exception($"未找到调拨出库数据");
            }
            MixedSend send = new MixedSend
            {
                context = new Context
@@ -1435,7 +1729,7 @@
                    OrgCode = "102",
                    UserCode = "MH0551"
                },
                documentTypeCode = "TransIn002",
                documentTypeCode = "MiscShip001",
                businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
                isApproved = true,

@@ -1444,9 +1738,10 @@
                    //物料编码
                    ItemCode = item.MaterielCode,
                    //存储地点编号
                    WhCode = item.WareHouseId,
                    WhCode = "205",
                    //杂发数量
                    Qty = item.OutboundQuantity,

                    BenefitDeptCode = "0505",
                }).ToList()
            };
@@ -1454,16 +1749,15 @@
            // å‘送请求并等待响应
            var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());

            var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
            if (respone.ResultStatus)
            var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
            if (!respone.d.ResultStatus)
            {
                return content.OK();
                throw new Exception($"ERP其他出库{respone.d.ResultMsg}");
            }
            return content.Error(respone.ResultMsg);
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
            throw new Exception(ex.Message);
        }
    }
    /// <summary>
@@ -1627,9 +1921,6 @@
                changeRecordDto.Add(dtLocationStatusChangeRecord);
            }
        }
        //_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);

        //_locationRepository.UpdateData(locations);
        return (changeRecordDto,locations);
    }

@@ -1654,20 +1945,12 @@
                {
                    item.LocationStatus = (int)LocationEnum.Lock;
                }
                else if (item.LocationStatus == (int)LocationEnum.Free)
                {
                    item.LocationStatus = (int)LocationEnum.FreeDisable;
                }
            }
            else if (locationStatus == LocationEnum.InStock)
            {
                if (item.LocationCode == location.LocationCode)
                {
                    item.LocationStatus = (int)LocationEnum.InStock;
                }
                else if (item.LocationStatus == (int)LocationEnum.FreeDisable)
                {
                    item.LocationStatus = (int)LocationEnum.Free;
                }
            }
            else if (locationStatus == LocationEnum.InStockDisable)
@@ -1676,21 +1959,10 @@
                {
                    item.LocationStatus = (int)LocationEnum.InStockDisable;
                }
                else if (item.LocationStatus == (int)LocationEnum.Free)
                {
                    item.LocationStatus = (int)LocationEnum.FreeDisable;
                }
            }
            else if (locationStatus == LocationEnum.Free)
            {
                if (item.LocationCode == location.LocationCode)
                {
                    item.LocationStatus = (int)LocationEnum.Free;
                }
                else if (item.LocationStatus == (int)LocationEnum.FreeDisable || item.LocationStatus == (int)LocationEnum.InStockDisable)
                {
                    item.LocationStatus = (int)LocationEnum.Free;
                }
                item.LocationStatus = (int)LocationEnum.Free;
            }
        }
        List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
@@ -1713,10 +1985,28 @@
                changeRecordDto.Add(dtLocationStatusChangeRecord);
            }
        }
        //_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);

        //_locationRepository.UpdateData(locations);
        return (changeRecordDto, locations);
    }

    public (DtLocationStatusChangeRecord, DtLocationInfo) UpdateLocationStatus(string locationCode, LocationEnum locationStatus, int taskNum, StatusChangeTypeEnum StatusChangeType)
    {
        var location = _locationRepository.QueryFirst(x => x.LocationCode == locationCode);
        int Beforelocation = location.LocationStatus;

        location.LocationStatus = (int)locationStatus;

        DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
        {
            ChangeType = (int)StatusChangeType,
            LocationCode = locationCode,
            LocationId = location.Id,
            Creater = "System",
            TaskNum = taskNum,
            AfterStatus = location.LocationStatus,
            BeforeStatus = Beforelocation,
        };

        return (dtLocationStatusChangeRecord, location);
    }

    public List<DtLocationInfo> GetGroupLocations(DtLocationInfo location)
@@ -1734,7 +2024,7 @@
                }
            }
        }
        else if (location.AreaId == 2)
        else if (location.AreaId == 2 || location.AreaId == 7)
        {
            var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark);
            if (locationLateral.Count > 0)
@@ -1770,7 +2060,9 @@
            TaskState = task.TaskState,
            Id = 0,
            TaskType = task.TaskType,
            Floor =task.Floor,
            AGVTaskNum = task.AGVTaskNum,
            DoubleTray = task.DoubleTray,
        } };
    }

@@ -1788,8 +2080,35 @@
            Id = 0,
            TaskType = task.TaskType,
            AGVTaskNum = task.AGVTaskNum,
            Remark= task.Remark
            Remark = task.Remark,
            Floor = task.Floor,
            DoubleTray = task.DoubleTray,
        };
    }
    private List<WMSTaskDTO> CreateTaskDTO(List<Dt_Task> task)
    {
        List<WMSTaskDTO> taskNews = new List<WMSTaskDTO>();
        foreach (var item in task)
        {
            taskNews.Add(new WMSTaskDTO
            {
                TaskNum = item.TaskNum.Value,
                Grade = item.Grade.Value,
                PalletCode = item.PalletCode,
                RoadWay = item.Roadway,
                SourceAddress = item.SourceAddress,
                TargetAddress = item.TargetAddress,
                TaskState = item.TaskState,
                Id = 0,
                TaskType = item.TaskType,
                AGVTaskNum = item.AGVTaskNum,
                Remark = item.Remark,
                Floor = item.Floor,
                DoubleTray = item.DoubleTray,
            });
        }

        return taskNews;
    }

    private async Task DeleteStockInfoAsync(int stockId)
@@ -1953,7 +2272,6 @@

    private async Task<bool> AddTaskAsync(Dt_Task task, DtLocationInfo StartAddress, DtLocationInfo EndAddress)
    {
        //UpdateLocationStatus
        bool isResult = await BaseDal.AddDataAsync(task) > 0;
        int SourcebeforeStatus = StartAddress.LocationStatus;

@@ -1972,7 +2290,7 @@
                TaskNum = task.TaskNum.Value,
                LocationId = StartAddress.Id,
                LocationCode = StartAddress.LocationCode,
                ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
                ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
            },
            new LocationChangeRecordDto()
            {
@@ -1981,7 +2299,7 @@
                TaskNum = task.TaskNum.Value,
                LocationId = EndAddress.Id,
                LocationCode = EndAddress.LocationCode,
                ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
                ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
            },
        };

@@ -1990,6 +2308,46 @@
        bool Target = await _locationRepository.UpdateDataAsync(EndAddress);

        return isResult && Source && Target;
    }

    private (List<DtLocationInfo>,List<DtLocationStatusChangeRecord>) AddTaskAsync(List<Dt_Task> task)
    {
        List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
        List<DtLocationInfo> locationos = new List<DtLocationInfo>();
        foreach (var item in task)
        {
            var SourceAddress = _locationRepository.QueryFirst(x => x.LocationCode == item.SourceAddress);
            var TargetAddress = _locationRepository.QueryFirst(x => x.LocationCode == item.TargetAddress);
            int SourcebeforeStatus = SourceAddress.LocationStatus;

            int TargetbeforeStatus = TargetAddress.LocationStatus;

            SourceAddress.LocationStatus = (int)LocationEnum.InStockDisable;
            TargetAddress.LocationStatus = (int)LocationEnum.Lock;
            changeRecordDto.Add(new DtLocationStatusChangeRecord()
            {
                ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
                LocationCode = TargetAddress.LocationCode,
                LocationId = TargetAddress.Id,
                Creater = "System",
                TaskNum = item.TaskNum,
                AfterStatus = TargetAddress.LocationStatus,
                BeforeStatus = TargetbeforeStatus,
            });
            changeRecordDto.Add(new DtLocationStatusChangeRecord
            {
                AfterStatus = TargetAddress.LocationStatus,
                BeforeStatus = TargetbeforeStatus,
                TaskNum = item.TaskNum.Value,
                Creater = "System",
                LocationId = TargetAddress.Id,
                LocationCode = TargetAddress.LocationCode,
                ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
            });
            locationos.Add(TargetAddress);
            locationos.Add(SourceAddress);
        }
        return (locationos, changeRecordDto);
    }

    /// <summary>
@@ -2043,6 +2401,7 @@
        switch (AreaId)
        {
            case 2:
            case 7:
                return await FromShallowToDeep(AreaId, loc);
            case 3:
                return await AGVLIKU(AreaId);
@@ -2079,6 +2438,11 @@
        foreach (var item in locations)
        {
            var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
            if (locationLateral.Count == 0)
            {
                locationInfos.Add(item);
                continue;
            }
            bool Isavailable = true;
            foreach (var lateral in locationLateral)
            {
@@ -2126,17 +2490,18 @@
                locationInfos.Add(item);
                continue;
            }
            foreach (var Lateral in locationLateral)
            bool Isavailable = true;
            foreach (var lateral in locationLateral)
            {
                if (locationInfos.Contains(Lateral))
                    continue;
                if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
                if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
                {
                    locationInfos.Add(item);
                    Isavailable = false;
                    continue;
                }
            }
            if (Isavailable)
                locationInfos.Add(item);
        }

        return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();

    }
@@ -2155,8 +2520,6 @@

    public bool LocationIsOutBound(DtLocationInfo location)
    {

        int sum = 0;
        if (location.AreaId == 1)
        {
            if (location.Depth == 2)
@@ -2170,7 +2533,7 @@
            }
        }

        else if (location.AreaId == 2)
        else if (location.AreaId == 2 || location.AreaId == 7)
        {
            var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column > location.Column && x.Remark == location.Remark);