ZhiHuiQiCe/GuoDianLiKu.git

			@@ -16,10 +16,12 @@
			#endregion << ç æ¬ æ³¨ é >>

			using AutoMapper;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
			using SqlSugar;
			using SqlSugar.Extensions;
			using System;
			using System.Collections;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Diagnostics.CodeAnalysis;
			@@ -53,6 +55,7 @@
			private readonly ILocationInfoRepository _locationInfoRepository;
			private readonly IMapper _mapper;
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly ITaskRepository _taskRepository;

			private Dictionary<string, OrderByType> _taskOrderBy = new()
			{
			@@ -70,7 +73,7 @@

			public List<int> TaskOtherboundTypes => typeof(TaskOtherTypeEnum).GetEnumIndexList();

			public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ILocationInfoRepository locationInfoRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
			public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ILocationInfoRepository locationInfoRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository) : base(BaseDal)
			{
			_routerService = routerService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -78,6 +81,7 @@
			_mapper = mapper;
			_locationInfoRepository = locationInfoRepository;
			_unitOfWorkManage = unitOfWorkManage;
			_taskRepository = taskRepository;
			}

			/// <summary>
			@@ -147,7 +151,9 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			// ServiceLogger.WriteLogToFile("");
			string inparam = JsonConvert.SerializeObject(taskDTO);

			ServiceLogger.WriteDebug("ReceiveTask", $"ReceiveMESTaskæ¹æ³å¥å{inparam}");
			Dt_Task task = new Dt_Task();
			Dt_Task taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id);
			if(taskDTO.cmd==101)//å¦ææ¯101ææ§çä»»å¡å·å»æ¥
			@@ -157,6 +163,7 @@

			if (taskDTO.cmd!=3001&& taskDTO.cmd != 101 && taskinfo != null)
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"ä»»å¡å·éå¤ï¼ä»»å¡å·ï¼{taskDTO.task_id}");
			return content = WebResponseContent.Instance.Error($"ä»»å¡å·éå¤ï¼ä»»å¡å·ï¼{taskDTO.task_id}");
			}
			Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.src_station.ToString());
			@@ -175,10 +182,11 @@
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"WCSæªæ¥è¯¢å°æºç«ç¹å¯¹åºçåºä½ï¼æºç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°æºç«ç¹å¯¹åºçåºä½ï¼æºç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			}
			break;
			case 3001://AGVæ¾è´§å®æ WMSå3001çåæ¶ä¼åæåä¿¡å·
			case 3001://AGVæ¾è´§å®æ WMSå3001çåæ¶WCSéå¨jobä¸åæåä¿¡å·
			if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id) == null)//æå¨å¥åºç´æ¥å3001ï¼éè¦çæä»»å¡ï¼å ä¸ºæ²¡æ1001ç¯è
			{

			@@ -193,6 +201,7 @@
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"WCSæªæ¥è¯¢å°æºç«ç¹å¯¹åºçåºä½ï¼æºç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°æºç«ç¹å¯¹åºçåºä½ï¼æºç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			}
			}
			@@ -202,6 +211,7 @@
			{
			UpdateTaskStatus(taskinfo.TaskId, (int)TaskInStatusEnum.AGV_InExecuting);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGVå¥åºæ§è¡ä¸");
			ServiceLogger.WriteDebug("ReceiveTask", $"AGVå¥åºæ§è¡ä¸ï¼èªå¨3001ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			return content = WebResponseContent.Instance.OK($"AGVå¥åºæ§è¡ä¸ï¼èªå¨3001ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			}
			else
			@@ -217,10 +227,12 @@
			//æ´æ°ä»»å¡è¡¨ä¸NextAddressåæ®µä¸ºæ°çä»»å¡å· taskDTO.weight-æ§çä»»å¡å· taskDTO.task_id-æ°çä»»å¡å·
			UpdateTaskStatus(taskinfo.TaskId, taskDTO.task_id, (int)TaskInStatusEnum.AGV_InFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGVæ¬è¿å®æ");
			ServiceLogger.WriteDebug("ReceiveTask", $"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			return content = WebResponseContent.Instance.OK($"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææ¶ï¼æ¥è¯¢ä¸å°ä»»å¡å·");
			return content = WebResponseContent.Instance.Error($"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææ¶ï¼æ¥è¯¢ä¸å°ä»»å¡å·");
			}
			break;
			@@ -252,7 +264,8 @@
			}
			else
			{
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			ServiceLogger.WriteDebug("ReceiveTask", $"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			}
			break;
			case 104://ç»ç«æºä¸æ æåä½-->ç»ç«æº
			@@ -270,7 +283,8 @@
			}
			else
			{
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{task.TargetAddress.ToString()}");
			ServiceLogger.WriteDebug("ReceiveTask", $"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{task.TargetAddress.ToString()}");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{task.TargetAddress.ToString()}");
			}
			//æ ¹æ®ç®æ å°åï¼ç»ç«æºï¼æ¥è¯¢é»è®¤çæ§è¡ä»»å¡çå°å åæºç¼å·
			Dt_LocationInfo locationtemp2 = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
			@@ -280,6 +294,8 @@
			}
			else
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"WCSæªæ¥è¯¢å°ç»ç«æºå¯¹åºçé»è®¤å°å åæºéç½®");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°ç»ç«æºå¯¹åºçé»è®¤å°å åæºéç½®");
			}

			@@ -292,7 +308,7 @@

			task.TaskNum = taskDTO.task_id;
			task.PalletCode = taskDTO.CarId;
			task.Roadway = "SC01";

			if (string.IsNullOrEmpty(task.SourceAddress))//å¦æä¸æ¯ç«ç¹ï¼ç´æ¥åè¡åå±
			{
			task.SourceAddress = $"SC01-{taskDTO.src_rack.ToString().PadLeft(3, '0')}-{taskDTO.src_col.ToString().PadLeft(3, '0')}-{taskDTO.src_row.ToString().PadLeft(3, '0')}";
			@@ -310,10 +326,12 @@
			{
			if (srcLocation.EnableStatus == (int)EnableStatusEnum.Disable)
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"æºå°åå·²ç¦ç¨ï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"æºå°åå·²ç¦ç¨ï¼{srcLocation.LocationCode}");
			}
			if (tarLocation.EnableStatus == (int)EnableStatusEnum.Disable)
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"ç®æ å°åå·²ç¦ç¨ï¼{tarLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç®æ å°åå·²ç¦ç¨ï¼{tarLocation.LocationCode}");
			}
			if (taskDTO.cmd != 101)//å¥åºæ¶ä¸éè¦å¤ææ¯å¦éå®ï¼éå®ç¶ææ¯å¨çæä»»å¡æ¶éå®
			@@ -323,10 +341,13 @@
			{
			if (srcLocation.LocationStatus == (int)LocationStatusEnum.Lock)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"æºå°åå·²éå®ï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"æºå°åå·²éå®ï¼{srcLocation.LocationCode}");
			}
			if (tarLocation.LocationStatus == (int)LocationStatusEnum.Lock)
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"ç®æ å°åå·²éå®ï¼{tarLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç®æ å°åå·²éå®ï¼{tarLocation.LocationCode}");
			}
			}
			@@ -336,6 +357,8 @@
			//WCSæ¥è¯¢åºä½ç¶ææ¯å¦ä¸ºâç©ºé²âå¹¶ä¸æªç¦ç¨ï¼éå®åºä½ä¿®æ¹åºä½ç¶æä¸ºâéå®âï¼çæWCSäº§åå¥åºä»»å¡ï¼å å¥WCSä»»å¡éåä¸ã
			if (tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"å¥åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{tarLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"å¥åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{tarLocation.LocationCode}");
			}
			//srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			@@ -354,10 +377,14 @@
			//WCSæ¥è¯¢åºä½ç¶ææ¯å¦ä¸ºâæè´§âï¼åºä½/æååºä½æ¯å¦âç©ºé²â
			if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"ç§»åº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç§»åº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			}
			if(tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"ç§»åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç§»åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{srcLocation.LocationCode}");
			}
			srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			@@ -369,6 +396,8 @@
			//WCSæ¥è¯¢åºä½ç¶ææ¯å¦ä¸ºâæè´§â
			if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"å¼å¸¸åºåº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"å¼å¸¸åºåº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			}
			srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			@@ -384,6 +413,8 @@
			//WCSæ¥è¯¢æååºä½æ¯å¦âæè´§â
			if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"ç©ºè½¦åºåº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç©ºè½¦åºåº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			}
			//srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			@@ -398,6 +429,8 @@
			//WCSæ¥è¯¢æååºä½æ¯å¦âæè´§â
			if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
			{

			ServiceLogger.WriteDebug("ReceiveTask", $"ä¸æä»»å¡-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ä¸æä»»å¡-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			}
			//srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			@@ -408,6 +441,7 @@
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"åºä½å°åä¸åå¨ï¼ä»»å¡å·:{task.TaskNum}");
			return content = WebResponseContent.Instance.Error($"åºä½å°åä¸åå¨ï¼ä»»å¡å·:{task.TaskNum}");
			}

			@@ -431,12 +465,13 @@
			_unitOfWorkManage.RollbackTran();
			throw;
			}

			content = WebResponseContent.Instance.OK("æå",task);
			ServiceLogger.WriteDebug("ReceiveTask", $"æ¥æ¶ä»»å¡æåï¼ä»»å¡å·:{task.TaskNum}");
			content = WebResponseContent.Instance.OK($"æ¥æ¶ä»»å¡æåï¼ä»»å¡å·:{task.TaskNum}", task);

			}
			catch (Exception ex)
			{
			ServiceLogger.WriteDebug("ReceiveTask", $"ä»»å¡æ¥æ¶éè¯¯,éè¯¯ä¿¡æ¯:{ex.StackTrace}");
			content = WebResponseContent.Instance.Error($"ä»»å¡æ¥æ¶éè¯¯,éè¯¯ä¿¡æ¯:{ex.Message}");
			}
			return content;
			@@ -646,7 +681,7 @@

			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);

			content = WebResponseContent.Instance.OK();

			}
			catch (Exception ex)
			{
			@@ -668,6 +703,245 @@
			task.Modifier = "System";
			task.ModifyDate = DateTime.Now;
			BaseDal.UpdateData(task);
			}

			/// <summary>
			/// ä»»å¡å¼ºå¶å®æ å åæºå®éå·²å®æä»»å¡ï¼WCSæªæ¶å°å®æä¿¡å·æå¶ä»æªç¥åå å¯¼è´WCSä»»å¡æªå®æï¼å¯ä»¥æ§è¡è¯¥æ¹æ³å¼ºå¶å®æä»»å¡
			/// </summary>
			/// <param name="taskNum"></param>
			/// <returns></returns>
			public WebResponseContent ForceCompleteTask(int taskNum)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			bool isBack = false;
			//1ï¼åæ¥è¯¢ä»»å¡ï¼æ ¹æ®ä¸åçä»»å¡ç±»ååä»»å¡å¼ºå¶å®ææä½
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
			if (task == null) return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»»å¡ä¿¡æ¯,ä»»å¡å·:ã{taskNum}ã");

			Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
			Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
			if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			if (task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
			{
			task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
			//éè¦å°ç®æ å°åæ¹ä¸ºæè´§ç¶æ
			locationdsc.LocationStatus = (int)LocationStatusEnum.InStock;

			//æ´æ°ç¶æä¸ºä»»å¡å®æ
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºå¥åºå®æ");
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å¥åºä»»å¡å®æ");
			//æ´æ°è´§ä½
			_locationInfoRepository.UpdateData(locationdsc);
			isBack = true;

			}
			else
			{
			return content = WebResponseContent.Instance.Error("è¯¥ä»»å¡ç®åç¶æï¼ä¸åè®¡å¼ºå¶å®æï¼");
			}

			}
			else
			{
			if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
			{

			if (task.TaskType == (int)TaskOutboundTypeEnum.OutInventory \|\| task.TaskType == (int)TaskOutboundTypeEnum.OutPick)//å¼å¸¸åºåº ç©ºè½¦åºåº
			{
			task.TaskState = (int)TaskOutStatusEnum.OutFinish;
			//æºå°åæ´æ°ä¸ºç©ºé²
			locationsrc.LocationStatus = (int)LocationStatusEnum.Free;

			//æ´æ°ç¶æä¸ºä»»å¡å®æ
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºå®æ");
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"åºåºä»»å¡å®æ");
			//æ´æ°è´§ä½
			_locationInfoRepository.UpdateData(locationsrc);
			isBack = true;
			}
			else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)//ç§»åº
			{
			task.TaskState = (int)TaskOutStatusEnum.OutFinish;
			//æºå°åæ´æ°ä¸ºç©ºé²
			locationsrc.LocationStatus = (int)LocationStatusEnum.Free;
			//ç®æ å°åæ´æ°ä¸ºæè´§
			locationdsc.LocationStatus = (int)LocationStatusEnum.InStock;


			//æ´æ°ç¶æä¸ºä»»å¡å®æ
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºå®æ");
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"åºåºä»»å¡å®æ");
			//æ´æ°è´§ä½
			_locationInfoRepository.UpdateData(locationsrc);
			_locationInfoRepository.UpdateData(locationdsc);
			isBack = true;


			}
			else
			{
			return WebResponseContent.Instance.Error($"ä¸æä»»å¡ä¸åè®¡å¼ºå¶å®æï¼");
			}
			}
			else
			{
			return WebResponseContent.Instance.Error($"è¯¥ä»»å¡ç¶æä¸åè®¡å¼ºå¶å®æï¼");
			}
			}

			//ä»»å¡å¼ºå¶å®æåè°MES
			if (isBack)
			{

			if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)//å¥åºæ¶åä¼ éä¼ æ°ä»»å¡å·
			{
			task.TaskNum =int.Parse(task.NextAddress);
			}
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("ForceCompleteTask", $"ä»»å¡å¼ºå¶å®æååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"ä»»å¡å¼ºå¶å®æååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			else
			{
			ServiceLogger.WriteDebug("ForceCompleteTask", $"ä»»å¡å¼ºå¶å®æååä¼ MESæåï¼,ä»»å¡å·:ã{taskNum}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æååä¼ MESæåï¼,ä»»å¡å·:ã{taskNum}ã");
			}
			}
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			}
			return content;

			}

			/// <summary>
			/// ä»»å¡åæ¶
			/// </summary>
			/// <param name="taskid"></param>
			/// <returns></returns>
			public WebResponseContent CancelTask(int taskNum)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			//1ï¼åæ¥è¯¢ä»»å¡ï¼æ ¹æ®ä¸åçä»»å¡ç±»ååä»»å¡åæ¶æä½
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
			if (task == null) return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»»å¡ä¿¡æ¯,ä»»å¡å·:ã{taskNum}ã");

			Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
			Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
			bool isBack = false;
			//å¦ææ¯å¥åºåèªå¨åæå¨ä¸¤ç§æåµå¤ç
			if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			if (task.WMSId == 0 && task.TaskState == (int)TaskInStatusEnum.InNew)//èªå¨å¥åºï¼1001-AGVè¯·æ±æ¯å¦åè®¡è¿å¥ï¼ä»»å¡ç¶æä¸ºâæ°å»ºå¥åºä»»å¡200âä¹åå¯ä»¥åæ¶
			{
			task.TaskState = (int)TaskInStatusEnum.InCancel;
			//éè¦å°ç®æ å°åæ¢å¤ä¸ºç©ºé²ç¶æ
			locationdsc.LocationStatus = (int)LocationStatusEnum.Free;
			//æ´æ°ç¶æä¸ºä»»å¡åæ¶
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å¥åºä»»å¡åæ¶");
			_locationInfoRepository.UpdateData(locationdsc);
			isBack = true;
			}
			else if (task.WMSId == 1 && task.TaskState == (int)TaskInStatusEnum.AGV_InExecuting)//æå¨å¥åºï¼3001-AGVæ¾è´§å®æï¼ä»»å¡ç¶æä¸ºâAGVå¥åºæ§è¡ä¸210âä¹åå¯ä»¥åæ¶
			{
			task.TaskState = (int)TaskInStatusEnum.InCancel;
			//éè¦å°ç®æ å°åæ¢å¤ç©ºé²ç¶æ
			locationdsc.LocationStatus = (int)LocationStatusEnum.Free;
			//æ´æ°ç¶æä¸ºä»»å¡åæ¶
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å¥åºä»»å¡åæ¶");
			_locationInfoRepository.UpdateData(locationdsc);
			isBack = true;
			}
			else
			{
			return WebResponseContent.Instance.Error($"è¯¥ä»»å¡ç¶æä¸åè®¡åæ¶ï¼");
			}
			}
			else//å¶ä»ä»»å¡ï¼ä»»å¡ç¶æâæ°å»ºåºåºä»»å¡âä¹åï¼æå¯ä»¥åæ¶
			{
			if (task.TaskState == (int)TaskOutStatusEnum.OutNew)
			{
			if(task.TaskType == (int)TaskOutboundTypeEnum.OutInventory\|\| task.TaskType == (int)TaskOutboundTypeEnum.OutPick)//å¼å¸¸åºåº ç©ºè½¦åºåº
			{
			task.TaskState = (int)TaskOutStatusEnum.OutCancel;
			//æºå°åæ¢å¤å°æè´§
			locationsrc.LocationStatus = (int)LocationStatusEnum.InStock;

			//æ´æ°ç¶æä¸ºä»»å¡åæ¶
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"åºåºä»»å¡åæ¶");
			_locationInfoRepository.UpdateData(locationsrc);
			isBack = true;
			}
			else if(task.TaskType == (int)TaskRelocationTypeEnum.Relocation)//ç§»åº
			{
			task.TaskState = (int)TaskOutStatusEnum.OutCancel;
			//æºå°åæ¢å¤å°æè´§
			locationsrc.LocationStatus = (int)LocationStatusEnum.InStock;
			//éè¦å°ç®æ å°åæ¢å¤ç©ºé²ç¶æ
			locationdsc.LocationStatus = (int)LocationStatusEnum.Free;
			//æ´æ°ç¶æä¸ºä»»å¡åæ¶
			UpdateTaskStatus(task.TaskId, task.TaskState);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"åºåºä»»å¡åæ¶");
			_locationInfoRepository.UpdateData(locationsrc);
			_locationInfoRepository.UpdateData(locationdsc);
			isBack = true;
			}
			else
			{
			return WebResponseContent.Instance.Error($"ä¸æä»»å¡ä¸åè®¡åæ¶ï¼");
			}
			}
			else
			{
			return WebResponseContent.Instance.Error($"è¯¥ä»»å¡ç¶æä¸åè®¡åæ¶ï¼");
			}
			}



			//ä»»å¡åæ¶åè°MES
			if (isBack)
			{
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 3 };
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("ForceCompleteTask", $"ä»»å¡åæ¶åä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"ä»»å¡åæ¶åä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			else
			{
			ServiceLogger.WriteDebug("ForceCompleteTask", $"ä»»å¡åæ¶åä¼ MESæåï¼,ä»»å¡å·:ã{taskNum}ã");
			content = WebResponseContent.Instance.Error($"ä»»å¡åæ¶åä¼ MESæåï¼,ä»»å¡å·:ã{taskNum}ã");
			}
			}
			else
			{

			}

			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			}
			return content;
			}


			@@ -840,17 +1114,34 @@
			_unitOfWorkManage.CommitTran();
			//åºåºå®æï¼åä¼ WMS
			//åä¼ å°WMS
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			if (task.TaskType == (int)TaskOutboundTypeEnum.OutPick)
			{
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æç©ºè½¦åºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æç©ºè½¦åºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}

			}
			else
			{
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¼å¸¸åºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æå¼å¸¸åºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			}

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			//ä»»å¡æ§è¡å¤±è´¥ï¼è´§ä½ç¶æè¿å
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}

			@@ -880,16 +1171,25 @@

			//å¥åºå®æï¼åä¼ MES å¥åºå®æåä¼ task.NextAddress ä¹å101è¯·æ±æ¶åçæ°ä»»å¡å·
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = int.Parse(task.NextAddress), status = 6 };
			string inparam = JsonConvert.SerializeObject(sendcmd);
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESå¥å:{inparam}");
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{

			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESæåï¼,ä»»å¡å·:ã{taskNum}ã");
			}

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºæ§è¡å¥åºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºæ§è¡å¥åºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}
			}
			@@ -902,7 +1202,7 @@
			srcLocation.LocationStatus = (int)LocationStatusEnum.Free;

			Dt_LocationInfo tarLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			srcLocation.LocationStatus = (int)LocationStatusEnum.InStock;
			tarLocation.LocationStatus = (int)LocationStatusEnum.InStock;
			UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºå®æ");

			@@ -917,9 +1217,12 @@
			//ç§»åºå®æï¼åä¼ MES
			//åä¼ å°WMS
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
			string inparam = JsonConvert.SerializeObject(sendcmd);
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æåºåºä»»å¡ååä¼ MESå¥å:{inparam}");
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}

			@@ -927,6 +1230,7 @@
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}
			}
			@@ -935,7 +1239,7 @@
			{
			try
			{
			Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			//Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			//srcLocation.LocationStatus = (int)LocationStatusEnum.Free;


			@@ -950,59 +1254,72 @@
			_unitOfWorkManage.CommitTran();
			//ä¸æå®æï¼åä¼ WMS
			MESSendCMD sendcmd = new MESSendCMD { cmd = 201, task_id = task.TaskNum, status = 6 };
			string inparam = JsonConvert.SerializeObject(sendcmd);
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡åä¼ MESå¥å{inparam}");
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å°å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			else
			{
			//å¤ææ¯å¦å®æçæåä¸å±ï¼èªå¨çæç©ºè½¦åºåºä»»å¡
			string[] Levels = task.Remark.Split("-");
			if (Levels.Length == 2)
			{
			if (!string.IsNullOrEmpty(Levels[0])&& !string.IsNullOrEmpty(Levels[1]))
			{
			//å¦æå½åæåå±æ°çäºæ»å±æï¼åè¡¨ç¤ºæè½¦ææçå±æ°åå®
			if(Convert.ToInt16(Levels[0])== Convert.ToInt16(Levels[1]))
			{
			string[] SourceCodes = task.SourceAddress.Split("-");
			string startPlan = "";
			if (SourceCodes.Length == 4)
			{
			startPlan= "101"+ SourceCodes[2].Substring(1,2);
			}
			DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
			ApiInvoke.DeliveryPlanCMD(send);//åè°MESæ¥å£çæç©ºè½¦åºåºä»»å¡

			}

			}
			//else
			//{
			// //å¤ææ¯å¦å®æçæåä¸å±ï¼èªå¨çæç©ºè½¦åºåºä»»å¡
			// string[] Levels = task.Remark.Split("-");
			// if (Levels.Length == 2)
			// {
			// if (!string.IsNullOrEmpty(Levels[0])&& !string.IsNullOrEmpty(Levels[1]))
			// {
			// //å¦æå½åæåå±æ°çäºæ»å±æï¼åè¡¨ç¤ºæè½¦ææçå±æ°åå®
			// if(Convert.ToInt16(Levels[0])== Convert.ToInt16(Levels[1]))
			// {
			// string[] SourceCodes = task.SourceAddress.Split("-");
			// string startPlan = "";
			// if (SourceCodes.Length == 4)
			// {
			// startPlan = "101" + SourceCodes[2].Substring(1, 2);
			// }
			// DeliveryPlan send = new DeliveryPlan { startPlan = startPlan, isQuit = false, CarId = task.PalletCode };
			// string inparam2 = JsonConvert.SerializeObject(send);
			// ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡åä¼ MESå¥å{inparam2}");
			// ApiInvoke.DeliveryPlanCMD(send);//åè°MESæ¥å£çæç©ºè½¦åºåºä»»å¡
			// ææçå±æ°é½åå®ï¼éè¦ææåä½ç¶ææ¹ä¸ºç©ºé²ç¶æ
			// srcLocation.LocationStatus = (int)LocationStatusEnum.Free;
			// _locationInfoRepository.UpdateData(srcLocation);
			// }

			// }

			}
			}
			// }
			//}

			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å°å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.StackTrace}ã");
			content = WebResponseContent.Instance.Error($"å°å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}

			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"ä»»å¡ç±»åéè¯¯,æªæ¾å°è¯¥ä»»å¡ç±»å,ä»»å¡å·:ã{taskNum}ã,ä»»å¡ç±»å:ã{task.TaskType}ã");
			throw new Exception($"ä»»å¡ç±»åéè¯¯,æªæ¾å°è¯¥ä»»å¡ç±»å,ä»»å¡å·:ã{taskNum}ã,ä»»å¡ç±»å:ã{task.TaskType}ã");
			}
			content = WebResponseContent.Instance.OK();
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"ä»»å¡å®ææå,ä»»å¡å·:ã{taskNum}ã");
			content = WebResponseContent.Instance.OK($"ä»»å¡å®ææå,ä»»å¡å·:ã{taskNum}ã");
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error($"ä»»å¡å®æå¼å¸¸,ä»»å¡å·:ã{taskNum}ã");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"ä»»å¡å®æå¼å¸¸,ä»»å¡å·:ã{taskNum}ã{ex.Message}");
			content = WebResponseContent.Instance.Error($"ä»»å¡å®æå¼å¸¸,ä»»å¡å·:ã{taskNum}ã{ex.Message}");
			}
			return content;
			}



			/// <summary>
			/// æ¢å¤æèµ·ä»»å¡
			/// </summary>