MingHeZhiNeng/DuiDuoJiLiKu.git

			@@ -3,13 +3,20 @@
			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;
			using SixLabors.Fonts.Tables.AdvancedTypographic;
			using SqlSugar;
			using System;
			using System.Collections;
			using System.Collections.Generic;
			using System.Linq;
			using System.Linq.Expressions;
			using System.Reflection;
			using System.Reflection.Metadata;
			using System.Security.Policy;
			using System.Text.RegularExpressions;
			using System.Threading.Tasks;
			using WIDESEA_Cache;
			@@ -17,13 +24,19 @@
			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;
			using WIDESEA_DTO.WMS;
			using WIDESEA_IOrderRepository;
			using WIDESEA_IServices;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Basic;
			using WIDESEA_Model.Models.ERP;
			using WIDESEA_Model.Models.Order;
			using WIDESEA_OrderRepository;
			using WIDESEA_StorageTaskRepository;
			using WIDESEAWCS_BasicInfoRepository;
			using WIDESEAWCS_QuartzJob.Models;
			using static System.Collections.Specialized.BitVector32;
			@@ -45,6 +58,9 @@
			private readonly IDt_AreaInfoRepository _areaInfoRepository; //åºå
			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,
			@@ -58,7 +74,10 @@
			IDt_AreaInfoRepository areaInfoRepository,
			IStockInfoDetailRepository stockInfoDetailRepository,
			IDt_StationManagerRepository stationManagerRepository,
			ISys_ConfigService configService) : base(BaseDal)
			ISys_ConfigService configService,
			IDt_OrderOutDetailsRepository orderOutDetailsRepository,
			IDt_WareAreaInfoRepository wareAreaInfoRepository,
			IDt_InventoryRecordRepository inventoryRecordRepository) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_stockInfoRepository = stockInfoRepository;
			@@ -72,6 +91,9 @@
			_stockInfoDetailRepository = stockInfoDetailRepository;
			_stationManagerRepository = stationManagerRepository;
			_configService = configService;
			_orderOutDetailsRepository = orderOutDetailsRepository;
			_wareAreaInfoRepository = wareAreaInfoRepository;
			_inventoryRecordRepository = inventoryRecordRepository;
			}

			#region å¤é¨æ¥å£æ¹æ³
			@@ -88,20 +110,93 @@
			taskHty.FinishTime = DateTime.Now;
			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 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>());
			});

			await ERPAllocateOut(stock);

			//è°æ¨åºåº
			if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
			{
			if (orderDetails.Count > 0)
			await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.è°æ¨åºåºå).ToList());
			}
			//å¶ä»åºåº
			else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
			{
			if (orderDetails.Count > 0)
			{
			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.Where(x => x.OrderType == (int)OrderTypeEmun.çäº§é¢æå).ToList());
			}
			}

			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 () =>
			{
			await DeleteStockInfoAsync(stock.Id);
			_boxingInfoRepository.UpdateDataNav(boxingInfo);
			await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
			await AddStockInfoHtyAsync(stockInfo_Hty);
			await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
			await _locationRepository.UpdateDataAsync(result2.Item2);
			await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
			await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();

			await DeleteTaskAsync(task.TaskId);
			await AddTaskHtyAsync(taskHty);
			});
			content.OK("åºåºå®æ");

			}
			catch (Exception ex)
			{
			task.ErrorMessage = ex.Message;
			await BaseDal.UpdateDataAsync(task);
			return content.Error(ex.Message);
			}
			return content;
			}



			#endregion åºåºä»»å¡å®æ

			@@ -117,17 +212,34 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			// æ´æ°è´§ä½ååºåä¿¡æ¯
			(DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
			var taskHty = CreateHistoricalTask(task);
			LogFactory.GetLog("ä»»å¡å®æ").InfoFormat(true, "ç§»åºä»»å¡å®æ", $"è´§ä½å°åï¼{task.TargetAddress},ä¿®æ¹ååºåæ°æ®ï¼{JsonConvert.SerializeObject(updateStock)}ï¼ååè´§ä½æ°æ®ï¼{locationInForm}");
			var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
			var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);

			// æ§è¡æ°æ®åºäºå¡
			bool isResult = false;
			if (isResult)
			content.OK("ç§»åºä»»å¡å®ææå");
			else
			content.Error("ç§»åºä»»å¡å®æå¤±è´¥");
			task.TaskState = (int)TaskRelocationStatusEnum.AGV_RelocationFinish;
			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";

			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(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);
			});
			content.OK("ç§»åºå®æ");
			}
			catch (Exception err)
			{
			@@ -150,18 +262,15 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			var boxing = 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);
			var boxinfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);

			if (boxing == null)
			if (boxinfo == null)
			{
			return content.Error("æªæ¾å°ç»çæ°æ®");
			}
			await ERPAllocate(boxinfo);

			DtStockInfo stock = CreatePalletStock(task, boxing);
			DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
			boxingInfo_Hty.ModifyDate = DateTime.Now;
			var stock = CreateStock(boxinfo, task);

			task.TaskState = (int)TaskInStatusEnum.InFinish;
			var taskHty = task.Adapt<Dt_Task_Hty>();
			@@ -169,26 +278,66 @@
			taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.äººå·¥å®æ : (int)OperateTypeEnum.èªå¨å®æ;
			taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";

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

			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			await _stockInfoRepository.AddDataNavAsync(stock);
			await DeleteTaskAsync(task.TaskId);
			await AddTaskHtyAsync(taskHty);
			await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
			.Include(x => x.BoxingInfoDetails)
			.ExecuteCommandAsync();
			await AddBoxingHtyAsync(boxingInfo_Hty);
			await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
			await _locationRepository.UpdateDataAsync(result2.Item2);
			});
			content.OK("å¥åºå®æ");
			}
			catch (Exception ex)
			{
			task.ErrorMessage = ex.Message;
			await BaseDal.UpdateDataAsync(task);
			return content.Error(ex.Message);
			}
			return content;
			}


			public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
			{
			var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
			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,
			LocationCode = task.TargetAddress,
			CreateDate = DateTime.Now,
			Creater = "system",
			IsFullExit = boxingInfo.IsFullExit,
			StockInfoDetails = mergedDetails,
			StockStatus = (int)StockStateEmun.å·²å¥åº
			};
			}
			#endregion å¥åºä»»å¡å®æ

			#region AGVæ¬è¿ä»»å¡å®æ
			@@ -274,8 +423,7 @@


			// éªè¯åºåæ¯å¦åå¨
			//var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
			DtStockInfo stock = null;
			var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);

			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			@@ -297,6 +445,40 @@

			#endregion ä»»å¡å®æ

			#region åæ¶ä»»å¡
			public WebResponseContent TaskCancel(int taskNum)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task == null)
			{
			return content = WebResponseContent.Instance.Error("æªæ¾å°ä»»å¡ä¿¡æ¯");
			}
			_unitOfWorkManage.BeginTran();
			MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
			if (methodInfo != null)
			{
			WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
			if (responseContent != null)
			{
			if (responseContent != null)
			{

			}
			}
			}
			return content = WebResponseContent.Instance.Error("æªæ¾å°ä»»å¡ç±»åå¯¹åºä¸å¡å¤çé»è¾");
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return content = WebResponseContent.Instance.Error(ex.Message);
			}
			}
			#endregion

			#region è¯·æ±ä»»å¡å¥åº

			public async Task<WebResponseContent> RequestInboundTaskAsync(RequestTaskDto taskDto)
			@@ -304,7 +486,14 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode);
			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)
			{
			return content.Error("æçä¿¡æ¯ä¸åå¨ï¼è¯·ç¡®è®¤æçå·²ç»çæå");
			@@ -312,7 +501,7 @@

			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();
			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åºåæ°æ®ä¸ï¼è¯·äººå·¥ç¡®è®¤æ°æ®æ¯å¦æ£ç¡®");
			@@ -328,50 +517,48 @@
			{
			return content.Error($"èµ·ç¹åºä½{StartAddress.LocationCode}æ¬è¿è·¯å¾è¢«å ç¨ï¼è¯·äººå·¥ç¡®è®¤åä¸åä»»å¡");
			}
			if (taskDto.AreaId != 0)
			Dt_Task taskNew = new Dt_Task();
			var area = _areaInfoRepository.QueryFirst(x => x.AreaID == taskDto.AreaId);
			if (area == null)
			{
			switch (taskDto.AreaId)
			{
			case 1:
			return await InboundStakerArea(taskDto, StartAddress, await GetEmptyLocation("SC1"));
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			return await InboundAGVCacheArea(taskDto, StartAddress, await GetAGVEmptyCacheLocation(taskDto.AreaId, StartAddress));
			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)
			{
			var location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
			if (location != null && location.LocationStatus == (int)LocationEnum.Free && location.EnalbeStatus == 1)
			{
			switch (taskDto.AreaId)
			{
			case 1:
			return await InboundStakerArea(taskDto, location, StartAddress);
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			return await InboundAGVCacheArea(taskDto, location, StartAddress);
			default:
			return content.Error("è´§ä½åºåæªæ¾å°");
			}
			}
			else
			{
			return content.OK("ç®æ åºä½ä¸å¯ç¨");
			}
			return content.Error("è¯¥åºåæ å¯ç¨åºä½ï¼è¯·éæ©å¶ä»åºå");
			}
			else

			switch (taskDto.AreaId)
			{
			return content.OK("è¯·éæ©å¥åºåºåæç»ç¹å°å");
			case 1:
			taskNew = InboundStakerArea(taskDto, StartAddress, area);
			break;
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			taskNew = InboundAGVCacheArea(taskDto, StartAddress, area);
			break;
			default:
			return content.Error("è¯·éæ©æ£ç¡®çåºåä¿¡æ¯");
			}
			var taskDTO = CreateListTaskDTO(taskNew);

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

			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
			await _locationRepository.UpdateDataAsync(result.Item2);
			BaseDal.AddData(taskNew);
			});
			return content = await SendWCSTask(taskDTO);
			}
			catch (Exception err)
			{
			@@ -379,92 +566,47 @@
			}
			}

			public async Task<WebResponseContent> InboundStakerArea(RequestTaskDto taskDto,DtLocationInfo StartAddress, DtLocationInfo location)
			public Dt_Task InboundStakerArea(RequestTaskDto taskDto, DtLocationInfo StartAddress,Dt_AreaInfo area)
			{
			WebResponseContent content = new WebResponseContent();
			try
			var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

			return new Dt_Task
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

			if (location == null)
			{
			return content.Error("ç»ç¹åºåæªæ¾å°ç©ºé²åºä½");
			}
			Dt_Task taskNew = new Dt_Task
			{
			Grade = 1,
			Roadway = "SC1",
			TargetAddress = location.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = station.stationChildCode,
			OrderNo = null,
			PalletCode = taskDto.PalletCode,
			SourceAddress = taskDto.Position,
			CurrentAddress = taskDto.Position,
			TaskState = (int)TaskInStatusEnum.InNew,
			TaskType = (int)TaskInboundTypeEnum.Inbound,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			AGVTaskNum = GenerateUniqueId(),
			Floor = "1F",
			};
			var taskDTO = CreateListTaskDTO(taskNew);

			BaseDal.AddData(taskNew);

			UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
			UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);



			//return content.OK();
			return content = await SendWCSTask(taskDTO);
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			return content.Error(ex.Message);
			}
			Grade = 1,
			Roadway = "SC1",
			TargetAddress = area.AreaName,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = station.stationChildCode,
			OrderNo = null,
			PalletCode = taskDto.PalletCode,
			SourceAddress = taskDto.Position,
			CurrentAddress = taskDto.Position,
			TaskState = (int)TaskInStatusEnum.InNew,
			TaskType = (int)TaskInboundTypeEnum.Inbound,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			AGVTaskNum = GenerateUniqueId(),
			Floor = "1F",
			};
			}

			public async Task<WebResponseContent> InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
			public Dt_Task InboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
			{
			WebResponseContent content = new WebResponseContent();
			try

			Dt_Task taskNew = new Dt_Task();
			if (StartAddress.Floor != area.Spare1)
			{
			if (location == null)
			{
			return content.Error("èµ·ç¹æªå®ä¹æç»ç¹åºåæªæ¾å°ç©ºé²åºä½");
			}
			Dt_Task taskNew = new Dt_Task();
			if (StartAddress.Floor != location.Floor)
			{
			taskNew= RequestAcrossFloorTask(StartAddress,location, (int)TaskInboundTypeEnum.Inbound,taskDto.PalletCode);
			}
			else
			{
			taskNew = RequestAGVCarryTask(StartAddress, location, (int)TaskInboundTypeEnum.Inbound, taskDto.PalletCode);
			}

			var taskDTO = CreateListTaskDTO(taskNew);
			_unitOfWorkManage.BeginTran();

			UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
			UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);

			BaseDal.AddData(taskNew);

			_unitOfWorkManage.CommitTran();
			//return content.OK();
			return content = await SendWCSTask(taskDTO);
			taskNew = RequestAcrossFloorTask(StartAddress, area, (int)TaskInboundTypeEnum.Inbound, taskDto);
			}
			catch (Exception ex)
			else
			{
			_unitOfWorkManage.RollbackTran();
			return content.Error(ex.Message);
			taskNew = RequestAGVCarryTask(StartAddress, GetAGVEmptyCacheLocation(area.AreaID, StartAddress).Result, (int)TaskInboundTypeEnum.Inbound, taskDto);
			}
			return taskNew;

			}
			#endregion è¯·æ±ä»»å¡å¥åº

			@@ -485,29 +627,12 @@
			if (task == null)
			return content.Error("æªæ¾å°ä»»å¡");

			if (taskState == (int)TaskOutStatusEnum.Line_OutFinish \|\| taskState == (int)TaskInStatusEnum.SC_InFinish \|\| taskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish \|\| taskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
			{
			var taskHty = CreateHistoricalTask(task);
			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
			var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
			if (asb && asbHty)
			content.OK();
			else
			throw new Exception();
			});
			task.TaskState = taskState;
			var asb = await BaseDal.UpdateDataAsync(task);
			if (asb)
			content.OK();
			}
			else
			{
			task.TaskState = taskState;
			var asb = await BaseDal.UpdateDataAsync(task);
			if (asb)
			content.OK();
			else
			content.Error();
			}
			content.Error();
			}
			catch (Exception ex)
			{
			@@ -516,167 +641,387 @@
			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 è¯·æ±åºåº
			/// <summary>
			/// æå¨åºåºè³ç¼ååºå
			/// </summary>
			/// <param name="palletCode"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode,string remark)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			DtStockInfo stcok = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
			if (stcok == null)
			{
			return content.Error("æçä¿¡æ¯ä¸åå¨ï¼è¯·ç¡®è®¤æçå·²å¥åºæå");
			}

			if (stcok.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
			{
			return content.Error("è¯·ç¡®è®¤åºåè´§ä½ç¶ææ¯å¦ä¸ºæè´§");
			}
			var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
			if (task != null)
			{
			return content.Error("è¯¥æçå·²åå¨ä»»å¡");
			}

			var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
			if (location.AreaId == 2)
			{
			return content.Error("è¯¥æçåºåå·²å¨åºåºç¼ååº");
			}

			Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
			List<Dt_InventoryRecord> records = new List<Dt_InventoryRecord>();
			stcok.StockInfoDetails.ForEach(x =>
			{
			records.Add(new Dt_InventoryRecord()
			{
			PalletCode = stcok.PalletCode,
			MaterielCode = x.MaterielCode,
			MaterielName = x.MaterielName,
			Quantity = x.Quantity,
			Status = (int)InventoryStatus.Normal,
			Remark = remark,
			});
			});

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


			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 result = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum);
			locationStatusChangeRecords.AddRange(result.Item1);
			locations.AddRange(result.Item2);

			return (locationStatusChangeRecords,locations);
			}

			/// <summary>
			/// è¯·æ±åºåºä»»å¡
			/// </summary>
			/// <param name="taskDto"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> RequestOutboundTaskAsync(RequestTaskDto taskDto)
			public async Task<Dt_Task> RequestOutboundTaskAsync(RequestTaskDto taskDto)
			{
			WebResponseContent content = new WebResponseContent();
			try
			DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
			if (stcok == null)
			{
			//DtStockInfo stcok= await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
			//if (stcok == null)
			//{
			// return content.Error("æçä¿¡æ¯ä¸åå¨ï¼è¯·ç¡®è®¤æçå·²å¥åºæå");
			//}

			var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
			if (StartAddress == null)
			{
			return content.Error("èµ·ç¹åºä½æªæ¾å°");
			}
			if (!LocationIsOutBound(StartAddress))
			{
			return content.Error($"èµ·ç¹åºä½{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);

			if (location != null && location.LocationStatus != (int)LocationEnum.Free && location.EnalbeStatus == 1)
			{
			return content.OK("ç®æ åºä½ä¸å¯ç¨");
			}
			}
			else
			{
			return content.OK("è¯·éæ©å¥åºåºåæç»ç¹å°å");
			}

			switch (StartAddress.AreaId)
			{
			case 1:
			return await OutboundStakerArea(taskDto, StartAddress, location);
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			return await OutboundAGVCacheArea(taskDto, StartAddress, location);
			default:
			return content.Error("è¯·éæ©æ£ç¡®çåºåä¿¡æ¯");
			}
			throw new Exception("æçä¿¡æ¯ä¸åå¨ï¼è¯·ç¡®è®¤æçå·²å¥åºæå");
			}
			catch (Exception ex)

			var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
			if (StartAddress == null)
			{
			return content.Error(ex.Message);
			throw new Exception("èµ·ç¹åºä½æªæ¾å°");
			}
			if (!LocationIsOutBound(StartAddress))
			{
			throw new Exception($"èµ·ç¹åºä½{StartAddress.LocationCode}åºåºè·¯å¾è¢«å ç¨ï¼è¯·ç¨åéè¯");
			}

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

			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($"åºåºç¼ååºæ å¯ç¨åºä½ï¼è¯·æ¸çåºä½ååè¯");
			}

			switch (StartAddress.AreaId)
			{
			case 1:
			return OutboundStakerArea(taskDto, StartAddress, area);
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			return OutboundAGVCacheArea(taskDto, StartAddress, area);
			default:
			throw new Exception("è¯·éæ©æ£ç¡®çåºåä¿¡æ¯");
			}
			}

			public async Task<WebResponseContent> 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");

			return new Dt_Task
			{
			Grade = Convert.ToInt32(StartAddress.Remark),
			Roadway = "SC1",
			TargetAddress = area.AreaName,
			Dispatchertime = DateTime.Now,
			MaterialNo = taskDto.MaterielCode,
			NextAddress = station.stationChildCode,
			OrderNo = taskDto.OrderNo,
			PalletCode = taskDto.PalletCode,
			SourceAddress = taskDto.Position,
			CurrentAddress = taskDto.Position,
			TaskState = (int)TaskOutStatusEnum.OutNew,
			TaskType = taskDto.TaskType,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			AGVTaskNum = GenerateUniqueId(),
			Floor = "1F",
			};
			}

			public Dt_Task OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, Dt_AreaInfo area)
			{
			Dt_Task taskNew = new Dt_Task();
			if (StartAddress.Floor != area.Spare1)
			{
			taskNew = RequestAcrossFloorTask(StartAddress, area, taskDto.TaskType, taskDto);
			}
			else
			{
			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 station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
			var startLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == SourceAddress);
			var endLocation = await _locationRepository.QueryFirstAsync(x => x.LocationCode == TargetAddress);

			if (location == null)
			if (!startLocation.IsNotEmptyOrNull() \|\| !endLocation.IsNotEmptyOrNull())
			{
			return content.Error("ç»ç¹åºåæªæ¾å°ç©ºé²åºä½");
			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("ç§»åºèµ·ç¹åºä½ä¸ç»ç¹åºä½ä¸å¨åä¸æ¥¼å±");
			}

			if (location.AreaId == 5 \|\| location.AreaId == 6)
			var stock = await _stockInfoRepository.QueryFirstAsync(x => x.LocationCode == startLocation.LocationCode);
			var taskNew = new Dt_Task
			{
			return content.Error("å½ååºåä¸å¯åºåºï¼è¯·èç³»ç®¡çå");
			}
			Dt_Task taskNew = new Dt_Task
			{
			Grade = Convert.ToInt32(StartAddress.Remark),
			Roadway = "SC1",
			TargetAddress = location.LocationCode,
			Grade = startLocation.Floor == "1F" ? 10 : 1,
			Roadway = endLocation.RoadwayNo,
			TargetAddress = endLocation.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = station.stationChildCode,
			NextAddress = endLocation.LocationCode,
			OrderNo = null,
			PalletCode = taskDto.PalletCode,
			SourceAddress = taskDto.Position,
			CurrentAddress = taskDto.Position,
			TaskState = (int)TaskOutStatusEnum.OutNew,
			TaskType = taskDto.TaskType,
			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 = "1F",
			Floor = startLocation.Floor,
			};
			var taskDTO = CreateListTaskDTO(taskNew);

			UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
			UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);

			BaseDal.AddData(taskNew);
			//return content.OK();
			return content = await SendWCSTask(taskDTO);
			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)
			{
			@@ -684,40 +1029,8 @@
			}
			}

			public async Task<WebResponseContent> OutboundAGVCacheArea(RequestTaskDto taskDto, DtLocationInfo StartAddress, DtLocationInfo location)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			if (location == null)
			{
			return content.Error("èµ·ç¹æªå®ä¹æç»ç¹åºåæªæ¾å°ç©ºé²åºä½");
			}
			Dt_Task taskNew = new Dt_Task();
			if (StartAddress.Floor != location.Floor)
			{
			taskNew = RequestAcrossFloorTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
			}
			else
			{
			taskNew = RequestAGVCarryTask(StartAddress, location, taskDto.TaskType, taskDto.PalletCode);
			}

			var taskDTO = CreateListTaskDTO(taskNew);

			UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
			UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);

			BaseDal.AddData(taskNew);
			//return content.OK();
			return content = await SendWCSTask(taskDTO);
			}
			catch (Exception ex)
			{
			return content.Error(ex.Message);
			}
			}
			#endregion è¯·æ±åºåºï¼å®ç&ç©ºçï¼
			#endregion

			#region è¯·æ±è·¨æ¥¼å±2ä»»å¡
			/// <summary>
			@@ -742,14 +1055,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,
			@@ -763,16 +1077,18 @@
			Floor = stationManager.stationFloor,
			};
			var taskDTO = CreateTaskDTO(taskNew);

			task.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarryFinish;
			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 UpdateStartLocationInfo(taskNew);
			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			BaseDal.AddData(taskNew);
			await DeleteTaskAsync(task.TaskId);
			await AddTaskHtyAsync(taskHty);
			BaseDal.AddData(taskNew);
			});
			return content.OK(data: taskDTO);
			}
			@@ -785,73 +1101,62 @@
			#endregion

			#region è¯·æ±è·¨æ¥¼å±ä»»å¡
			public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress,DtLocationInfo EndAddress,int TaskType,string palletCode)
			public Dt_Task RequestAcrossFloorTask(DtLocationInfo StartAddress, Dt_AreaInfo area, int TaskType, RequestTaskDto taskDto)
			{
			WebResponseContent content = new WebResponseContent();
			try

			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == StartAddress.Floor);
			return new Dt_Task
			{
			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == StartAddress.Floor);
			return new Dt_Task
			{
			Grade = StartAddress.Column,
			Roadway = "AGV",
			TargetAddress = EndAddress.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = next.stationChildCode,
			OrderNo = null,
			PalletCode = palletCode,
			SourceAddress = StartAddress.LocationCode,
			CurrentAddress = StartAddress.LocationCode,
			TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
			TaskType = TaskType,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			Remark = StartAddress.AreaId.ToString(),
			AGVTaskNum = GenerateUniqueId(),
			Floor = StartAddress.Floor,
			};
			}
			catch (Exception ex)
			{
			return null;
			}
			Grade = StartAddress.Column,
			Roadway = "AGV",
			TargetAddress = area.AreaName,
			Dispatchertime = DateTime.Now,
			MaterialNo = taskDto.MaterielCode,
			NextAddress = next.stationChildCode,
			OrderNo = taskDto.OrderNo,
			PalletCode = taskDto.PalletCode,
			SourceAddress = StartAddress.LocationCode,
			CurrentAddress = StartAddress.LocationCode,
			TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew,
			TaskType = TaskType,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			Remark = StartAddress.AreaId.ToString(),
			AGVTaskNum = GenerateUniqueId(),
			Floor = StartAddress.Floor,
			};

			}
			#endregion

			#region è¯·æ±AGVæ¬è¿ä»»å¡
			public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, string palletCode)
			public Dt_Task RequestAGVCarryTask(DtLocationInfo StartAddress, DtLocationInfo EndAddress, int TaskType, RequestTaskDto taskDto)
			{
			WebResponseContent content = new WebResponseContent();
			try

			return new Dt_Task
			{
			return new Dt_Task
			{
			Grade = StartAddress.Column,
			Roadway = "AGV",
			TargetAddress = EndAddress.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = EndAddress.LocationCode,
			OrderNo = null,
			PalletCode = palletCode,
			SourceAddress = StartAddress.LocationCode,
			CurrentAddress = StartAddress.LocationCode,
			TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
			TaskType = TaskType,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			Remark = StartAddress.AreaId.ToString(),
			AGVTaskNum = GenerateUniqueId(),
			Floor = StartAddress.Floor,
			};
			}
			catch (Exception ex)
			{
			return null;
			}
			Grade = StartAddress.Column,
			Roadway = "AGV",
			TargetAddress = EndAddress.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = taskDto.MaterielCode,
			NextAddress = EndAddress.LocationCode,
			OrderNo = taskDto.OrderNo,
			PalletCode = taskDto.PalletCode,
			SourceAddress = StartAddress.LocationCode,
			CurrentAddress = StartAddress.LocationCode,
			TaskState = (int)TaskAGVCarryStatusEnum.CarryNew,
			TaskType = TaskType,
			TaskNum = BaseDal.GetTaskNo().Result,
			CreateDate = DateTime.Now,
			TaskId = 0,
			Remark = StartAddress.AreaId.ToString(),
			AGVTaskNum = GenerateUniqueId(),
			Floor = StartAddress.Floor,
			};
			}

			#endregion
			@@ -890,16 +1195,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
			@@ -911,7 +1220,7 @@
			MaterialNo = "",
			NextAddress = TargetAddress.LocationCode,
			OrderNo = null,
			PalletCode = taskDto.PalletCode + "001",
			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,
			@@ -924,8 +1233,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();
			@@ -959,7 +1266,7 @@

			if (location == null)
			{
			return content.Error("æªæ¾å°è´§ä½æèè¯¥åºä½ä¸æ¯äºæ·±è´§ä½");
			return content.Error($"æªæ¾å°è´§ä½ä¿¡æ¯{taskDto.Position}");
			}
			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			switch (location.AreaId)
			@@ -981,14 +1288,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);

			@@ -996,41 +1303,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)
			@@ -1039,6 +1356,82 @@
			}
			}


			#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:
			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

			@@ -1059,11 +1452,32 @@
			}
			#endregion

			#region è·åä»»å¡ä¿¡æ¯
			public WebResponseContent GetTaskInfo()
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Expression<Func<Dt_Task, bool>> expression = x => true;
			if (!App.User.IsSuperAdmin)
			{
			expression = x => x.Creater == App.User.UserName;
			}
			var task = BaseDal.Db.Queryable<Dt_Task>().OrderByDescending(x => x.CreateDate).Take(100).Select(x => new Dt_Task { TaskNum = x.TaskNum, PalletCode = x.PalletCode, TaskType = x.TaskType, SourceAddress = x.SourceAddress, TargetAddress = x.TargetAddress }).ToList();
			content = WebResponseContent.Instance.OK(data: task);
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			}
			return content;
			}
			#endregion

			#endregion å¤é¨æ¥å£æ¹æ³

			#region è°ç¨WCSæ¥å£
			private string GetAGVIPAddress(string baseIp, string name)
			private string GetWCSIPAddress(string baseIp, string name)
			{
			var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
			@@ -1074,10 +1488,11 @@
			}
			return wcsBasez + address;
			}

			public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
			{
			WebResponseContent content = new WebResponseContent();
			var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
			var AgvSendTaskAddrss = GetWCSIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
			// åéè¯·æ±å¹¶çå¾ååº
			var result = await HttpHelper.PostAsync(AgvSendTaskAddrss, taskDTO.ToJsonString());

			@@ -1087,13 +1502,381 @@
			}
			#endregion

			#region ERPæ¥å£è°ç¨
			public string GetERPIPAddress(string baseIp, string name)
			{
			var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
			var address = configz.Where(x => x.ConfigKey == name).FirstOrDefault()?.ConfigValue;
			if (wcsBasez == null \|\| address == null)
			{
			throw new InvalidOperationException("WMS IP æªéç½®");
			}
			return wcsBasez + address;
			}

			/// <summary>
			/// çäº§é¢æ
			/// </summary>
			/// <param name="palletCode"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			MaterialRequisition materialRequisition = new MaterialRequisition
			{
			context = new Context
			{
			CultureName = "zh-CN",
			EntCode = "001",
			OrgCode = "102",
			UserCode = "MH0551"
			},
			documentTypeCode = "LL20",
			businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
			isApproved = true,
			issueList = orderOutDetails.Select(item => new issueList
			{
			PickListID = item.ERPOrderId,
			//åå¨å°ç¹
			WhCode = "205",
			//é¢ææ°é
			IssueQty = item.OutboundQuantity,
			}).ToList()

			};
			var ERPProduction = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MaterialRequisition);
			// åéè¯·æ±å¹¶çå¾ååº

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

			var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
			if (respone.d.ResultStatus)
			{
			return content.OK();
			}
			return content.Error(respone.d.ResultMsg);
			}
			catch (Exception ex)
			{
			return content.Error(ex.Message);
			}
			}
			/// <summary>
			/// è°æ¨
			/// </summary>
			/// <param name="palletCode"></param>
			/// <returns></returns>
			///
			public async Task ERPAllocate(DtBoxingInfo boxing)
			{
			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
			{
			CultureName = "zh-CN",
			EntCode = "001",
			OrgCode = "102",
			UserCode = "MH0551"
			},
			documentTypeCode = "TransIn002",
			businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
			isApproved = true,

			transferInList = stock.StockInfoDetails.Select(item => new transferInList
			{
			//ç©æç¼ç
			ItemCode = item.MaterielCode,
			//è°å¥ä»åºå°å
			TransInWHCode = "205",
			//è°å¥æ°é
			TransInQty = item.Quantity,
			// è°åºä»åºç¼ç
			TransOutWHCode = "107",
			}).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 ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
			{
			try
			{
			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 = item.MaterielCode,
			//è°å¥ä»åºå°å
			TransInWHCode = item.AllocateWarehouseId,
			//è°å¥æ°é
			TransInQty = item.OutboundQuantity,
			// è°åºä»åºç¼ç
			TransOutWHCode = "205",
			});
			}
			if (transferInList.Count <= 0)
			{
			return;
			}
			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 = transferInList,
			};
			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($"ERPè°æ¨åºåº{respone.d.ResultMsg}");
			}
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}
			/// <summary>
			/// æå
			/// </summary>
			/// <param name="palletCode"></param>
			/// <returns></returns>
			public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
			{
			try
			{
			if (orderOutDetails.Count <= 0)
			{
			throw new Exception($"æªæ¾å°è°æ¨åºåºæ°æ®");
			}
			MixedSend send = new MixedSend
			{
			context = new Context
			{
			CultureName = "zh-CN",
			EntCode = "001",
			OrgCode = "102",
			UserCode = "MH0551"
			},
			documentTypeCode = "MiscShip001",
			businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
			isApproved = true,

			miscShipList = orderOutDetails.Select(item => new miscShipList
			{
			//ç©æç¼ç
			ItemCode = item.MaterielCode,
			//åå¨å°ç¹ç¼å·
			WhCode = "205",
			//æåæ°é
			Qty = item.OutboundQuantity,

			BenefitDeptCode = "0505",
			}).ToList()
			};
			var ERPMixedSend = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MixedSend);
			// åéè¯·æ±å¹¶çå¾ååº
			var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());

			var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
			if (!respone.d.ResultStatus)
			{
			throw new Exception($"ERPå¶ä»åºåº{respone.d.ResultMsg}");
			}
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}
			/// <summary>
			/// ææ¶
			/// </summary>
			/// <param name="palletCode"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> ERPMixedReceive(string palletCode)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
			MixedReceive allocate = new MixedReceive
			{
			context = new Context
			{
			CultureName = "zh-CN",
			EntCode = "001",
			OrgCode = "102",
			UserCode = "MH0551"
			},
			documentTypeCode = "TransIn002",
			businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
			isApproved = true,

			miscRcvList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscRcvList
			{
			ItemCode = item.MaterielCode,
			WhCode = item.Warehouse,
			Qty = item.OutboundQuantity,
			CostPrice = 0,
			}).ToList()
			};
			return content.OK(data: allocate);
			}
			catch (Exception ex)
			{
			return content.Error(ex.Message);
			}
			}
			/// <summary>
			/// éæ
			/// </summary>
			/// <param name="palletCode"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> ERPreturnMaterialList(string palletCode)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
			ReturnMaterials allocate = new ReturnMaterials
			{
			context = new Context
			{
			CultureName = "zh-CN",
			EntCode = "001",
			OrgCode = "102",
			UserCode = "MH0551"
			},
			documentTypeCode = "TransIn002",
			businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
			isApproved = true,

			returnMaterialList = stock.StockInfoDetails.Select(item => new returnMaterialList
			{
			PickListID = item.MaterielCode,
			WhCode = item.Warehouse,
			RecedeQty = item.OutboundQuantity,
			RecedeReason = 1,
			}).ToList()
			};
			return content.OK(data: allocate);
			}
			catch (Exception ex)
			{
			return content.Error(ex.Message);
			}
			}

			#endregion

			#region åé¨è°ç¨æ¹æ³

			public void UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
			public (List<DtLocationStatusChangeRecord>,List<DtLocationInfo>) UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
			{
			List<DtLocationInfo> locations = GetGroupLocations(location);

			List<DtLocationInfo> Beforelocation = locations;
			List<DtLocationInfo> Beforelocation = locations.Select(x => new DtLocationInfo
			{
			Id = x.Id,
			LocationCode = x.LocationCode,
			LocationStatus = x.LocationStatus
			}).ToList();

			foreach (var item in locations)
			{
			@@ -1142,26 +1925,112 @@
			}
			}
			}
			List<LocationChangeRecordDto> changeRecordDto = new List<LocationChangeRecordDto>();
			List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
			foreach (var item in Beforelocation)
			{
			var loc = locations.Where(x => x.LocationCode == item.LocationCode).FirstOrDefault();
			if (loc != null)
			{
			changeRecordDto.Add(new LocationChangeRecordDto()
			DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
			{
			ChangeType = StatusChangeType,
			LocationCode = item.LocationCode,
			LocationId = loc.Id,
			Creater = "System",
			TaskNum = taskNum,
			AfterStatus = loc.LocationStatus,
			BeforeStatus = item.LocationStatus,
			TaskNum = taskNum,
			LocationId = loc.Id,
			LocationCode = loc.LocationCode,
			ChangeType = StatusChangeType,
			});
			};

			changeRecordDto.Add(dtLocationStatusChangeRecord);
			}
			}
			_locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
			return (changeRecordDto,locations);
			}

			_locationRepository.UpdateData(locations);
			public (List<DtLocationStatusChangeRecord>, List<DtLocationInfo>) UpdateLocationStatus(string locationCode, LocationEnum locationStatus, int taskNum, int StatusChangeType)
			{
			var location = _locationRepository.QueryFirst(x => x.LocationCode == locationCode);

			List<DtLocationInfo> locations = GetGroupLocations(location);

			List<DtLocationInfo> Beforelocation = locations.Select(x => new DtLocationInfo
			{
			Id = x.Id,
			LocationCode = x.LocationCode,
			LocationStatus = x.LocationStatus
			}).ToList();

			foreach (var item in locations)
			{
			if (locationStatus == LocationEnum.Lock)
			{
			if (item.LocationCode == location.LocationCode)
			{
			item.LocationStatus = (int)LocationEnum.Lock;
			}
			}
			else if (locationStatus == LocationEnum.InStock)
			{
			if (item.LocationCode == location.LocationCode)
			{
			item.LocationStatus = (int)LocationEnum.InStock;
			}
			}
			else if (locationStatus == LocationEnum.InStockDisable)
			{
			if (item.LocationStatus == (int)LocationEnum.InStock)
			{
			item.LocationStatus = (int)LocationEnum.InStockDisable;
			}
			}
			else if (locationStatus == LocationEnum.Free)
			{
			item.LocationStatus = (int)LocationEnum.Free;
			}
			}
			List<DtLocationStatusChangeRecord> changeRecordDto = new List<DtLocationStatusChangeRecord>();
			foreach (var item in Beforelocation)
			{
			var loc = locations.Where(x => x.LocationCode == item.LocationCode).FirstOrDefault();
			if (loc != null)
			{
			DtLocationStatusChangeRecord dtLocationStatusChangeRecord = new DtLocationStatusChangeRecord()
			{
			ChangeType = StatusChangeType,
			LocationCode = item.LocationCode,
			LocationId = loc.Id,
			Creater = "System",
			TaskNum = taskNum,
			AfterStatus = loc.LocationStatus,
			BeforeStatus = item.LocationStatus,
			};

			changeRecordDto.Add(dtLocationStatusChangeRecord);
			}
			}
			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)
			@@ -1215,6 +2084,7 @@
			TaskState = task.TaskState,
			Id = 0,
			TaskType = task.TaskType,
			Floor =task.Floor,
			AGVTaskNum = task.AGVTaskNum,
			} };
			}
			@@ -1233,19 +2103,35 @@
			Id = 0,
			TaskType = task.TaskType,
			AGVTaskNum = task.AGVTaskNum,
			Remark= task.Remark
			Remark = task.Remark,
			Floor = task.Floor,
			};
			}

			private bool IsAcrossFloor(DtLocationInfo Sourcelocation,DtLocationInfo Targetlocation)
			private List<WMSTaskDTO> CreateTaskDTO(List<Dt_Task> task)
			{
			return Sourcelocation.Floor == Targetlocation.Floor;
			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,
			});
			}

			return taskNews;
			}

			private bool IsSamefloor(DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
			{
			return Sourcelocation.Floor == Targetlocation.Floor;
			}
			private async Task DeleteStockInfoAsync(int stockId)
			{
			var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
			@@ -1282,14 +2168,6 @@
			}
			}

			private async Task UpdateLocationAsync(DtLocationInfo info)
			{
			var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
			if (!isStockUpdated)
			{
			throw new Exception("åºä½ä¿¡æ¯æ´æ°å¤±è´¥");
			}
			}

			private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
			{
			@@ -1387,26 +2265,6 @@
			return taskHty;
			}

			/// <summary>
			/// æ´æ°åºåä½ç½®
			/// </summary>
			/// <param name="stock">åºåå¯¹è±¡</param>
			/// <param name="toLocation">ç®æ ä½ç½®</param>
			// æ´æ°åºååä½ç½®ä¿¡æ¯
			private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
			{
			//ä¿®æ¹æ¥æºåºä½å ç®æ åºä½ç¶æ
			var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
			fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
			var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
			toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();

			// å°åºåä½ç½®è®¾ç½®ä¸ºç®æ ä½ç½®
			stock.LocationCode = task.TargetAddress;

			// è¿åæ´æ°åçåºååä½ç½®ä¿¡æ¯
			return (stock, fromLocation, toLocation);
			}

			#region ä»»å¡è¯·æ±æ¹æ³

			@@ -1435,7 +2293,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;

			@@ -1454,7 +2311,7 @@
			TaskNum = task.TaskNum.Value,
			LocationId = StartAddress.Id,
			LocationCode = StartAddress.LocationCode,
			ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
			ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
			},
			new LocationChangeRecordDto()
			{
			@@ -1463,7 +2320,7 @@
			TaskNum = task.TaskNum.Value,
			LocationId = EndAddress.Id,
			LocationCode = EndAddress.LocationCode,
			ChangeType = (int)StatusChangeTypeEnum.AutomaticInbound,
			ChangeType = (int)StatusChangeTypeEnum.AutomaticRelocation,
			},
			};

			@@ -1474,80 +2331,105 @@
			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>
			/// è·åè´§ä½å·
			/// </summary>
			/// <returns></returns>
			public async Task<DtLocationInfo> GetEmptyLocation(string roadWay)
			{
			try
			List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.RoadwayNo == "SC1" && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
			if (locations.Count < 2)
			{
			List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.RoadwayNo == "SC1" && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
			if (locations.Count < 2)
			{
			return null;
			}

			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			var locationInside = locations.Where(x => x.Row == 3).ToList();

			if (locations.Where(x => x.Row == 2).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
			{
			return locations.Where(x => x.Row == 2).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			}
			else if (locationInside.Count > 0)
			{
			foreach (var item in locationInside)
			{
			var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Layer == item.Layer && x.Column == item.Column);
			if (locationLateral.LocationStatus == (int)LocationEnum.Free && locationLateral.EnalbeStatus == 1)
			{
			locationInfos.Add(item);
			}
			}

			return locationInfos.Distinct().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			}
			else if (locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
			{
			return locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			}
			else
			{
			return null;
			}
			return null;
			}
			catch (Exception ex)

			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			var locationInside = locations.Where(x => x.Row == 3).ToList();

			if (locations.Where(x => x.Row == 2).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
			{
			throw new Exception(ex.Message);
			return locations.Where(x => x.Row == 2).ToList().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			}
			else if (locationInside.Count > 0)
			{
			foreach (var item in locationInside)
			{
			var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Layer == item.Layer && x.Column == item.Column);
			if (locationLateral.LocationStatus == (int)LocationEnum.Free && locationLateral.EnalbeStatus == 1)
			{
			locationInfos.Add(item);
			}
			}

			return locationInfos.Distinct().OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			}
			else if (locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault() != null)
			{
			return locations.Where(x => x.Row == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			}
			else
			{
			return null;
			}
			}

			public async Task<DtLocationInfo> GetAGVEmptyCacheLocation(int AreaId, DtLocationInfo loc)
			{
			try
			if (loc == null)
			{
			if(loc==null)
			{
			return null;
			}
			switch (AreaId)
			{
			case 2:
			return await FromShallowToDeep(AreaId, loc);
			case 3:
			return await AGVLIKU(AreaId);
			case 5:
			case 6:
			return await FromDeepToShallow(AreaId, loc);
			default:
			return null;
			}

			return null;
			}
			catch (Exception ex)
			switch (AreaId)
			{
			throw new Exception(ex.Message);
			case 2:
			return await FromShallowToDeep(AreaId, loc);
			case 3:
			return await AGVLIKU(AreaId);
			case 5:
			case 6:
			return await FromDeepToShallow(AreaId, loc);
			default:
			return null;
			}
			}

			@@ -1558,45 +2440,43 @@
			/// <returns></returns>
			public async Task<DtLocationInfo> FromDeepToShallow(int AreaId, DtLocationInfo loc)
			{
			try
			{
			List<DtLocationInfo> locations = new List<DtLocationInfo>();
			List<DtLocationInfo> locations = new List<DtLocationInfo>();

			if (AreaId == loc.AreaId)
			if (AreaId == loc.AreaId)
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
			}
			else
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
			}
			if (locations.Count == 0)
			{
			return null;
			}
			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			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)
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
			locationInfos.Add(item);
			continue;
			}
			else
			bool Isavailable = true;
			foreach (var lateral in locationLateral)
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
			}
			if (locations.Count == 0)
			{
			return null;
			}
			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			foreach (var item in locations)
			{
			var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
			bool Isavailable = true;
			foreach (var lateral in locationLateral)
			if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
			{
			if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
			{
			Isavailable = false;
			continue;
			}
			Isavailable = false;
			continue;
			}
			if(Isavailable)
			locationInfos.Add(item);
			}
			if (Isavailable)
			locationInfos.Add(item);
			}

			return locationInfos.Distinct().OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			return locationInfos.Distinct().OrderByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
			}

			/// <summary>
			@@ -1606,143 +2486,103 @@
			/// <returns></returns>
			public async Task<DtLocationInfo> FromShallowToDeep(int AreaId, DtLocationInfo loc)
			{
			try
			List<DtLocationInfo> locations = new List<DtLocationInfo>();

			if (AreaId == loc.AreaId)
			{
			List<DtLocationInfo> locations = new List<DtLocationInfo>();
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
			}
			else
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
			}

			if (AreaId == loc.AreaId)
			if (locations.Count == 0)
			{
			return null;
			}
			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			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)
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1 && x.Row != loc.Row);
			locationInfos.Add(item);
			continue;
			}
			else
			bool Isavailable = true;
			foreach (var lateral in locationLateral)
			{
			locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1);
			}

			if (locations.Count == 0)
			{
			return null;
			}
			List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
			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)
			if (lateral.LocationStatus != (int)LocationEnum.Free && lateral.EnalbeStatus == 1)
			{
			locationInfos.Add(item);
			Isavailable = false;
			continue;
			}
			foreach (var Lateral in locationLateral)
			{
			if (locationInfos.Contains(Lateral))
			continue;
			if (Lateral.LocationStatus == (int)LocationEnum.Free && Lateral.EnalbeStatus == 1)
			{
			locationInfos.Add(item);
			}
			}
			}
			if (Isavailable)
			locationInfos.Add(item);
			}
			return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();

			return locationInfos.Distinct().OrderBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}


			public async Task<DtLocationInfo> AGVLIKU(int AreaId)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
			var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			return location;
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}

			List<DtLocationInfo> locations = await _locationRepository.QueryDataAsync(x => x.AreaId == AreaId && x.LocationStatus == 0 && x.EnalbeStatus == 1);
			var location = locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).FirstOrDefault();
			return location;

			}


			public bool LocationIsOutBound(DtLocationInfo location)
			{
			try
			if (location.AreaId == 1)
			{
			int sum = 0;
			if (location.AreaId == 1)
			if (location.Depth == 2)
			{
			if (location.Depth == 2)
			{
			var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == location.Column && x.Layer == location.Layer);
			var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == location.Column && x.Layer == location.Layer);

			if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
			{
			return false;
			}
			if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
			{
			return false;
			}
			}

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

			foreach (var Lateral in locationLateral)
			{
			if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
			{
			return false;
			}
			}
			}

			else if (location.AreaId == 5 \|\| location.AreaId == 6)
			{
			var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column < location.Column && x.Remark == location.Remark);

			foreach (var lateral in locationLateral)
			{
			if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
			{
			return false;
			}
			}
			}

			return true;
			}
			catch (Exception)

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

			foreach (var Lateral in locationLateral)
			{
			if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
			{
			return false;
			}
			}
			}

			else if (location.AreaId == 5 \|\| location.AreaId == 6)
			{
			var locationLateral = _locationRepository.QueryData(x => x.Row == location.Row && x.Column < location.Column && x.Remark == location.Remark);

			foreach (var lateral in locationLateral)
			{
			if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
			{
			return false;
			}
			}
			}

			return true;

			}

			private DtStockInfo CreatePalletStock(Dt_Task task, DtBoxingInfo boxing)
			{
			var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
			if (loation == null)
			throw new Exception("æªæ¾å°å¯¹åºä½ç½®ä¿¡æ¯");


			var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
			boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.å·²å¥åº; });
			var stock = new DtStockInfo()
			{
			PalletCode = task.PalletCode,
			LocationCode = task.TargetAddress,
			CreateDate = DateTime.Now,
			Creater = "system",
			IsFull = boxing.IsFull,
			StockInfoDetails = boxDetail,
			};

			stock.StockStatus = 1;

			return stock;
			}

			#endregion ä»»å¡è¯·æ±æ¹æ³