ZhiHuiQiCe/GuoDianLiKu.git

			@@ -24,6 +24,7 @@
			using System.Collections;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Data;
			using System.Diagnostics.CodeAnalysis;
			using System.Linq;
			using System.Reflection;
			@@ -42,6 +43,7 @@
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_QuartzJob.Service;

			@@ -210,7 +212,7 @@
			if (taskinfo != null)
			{
			UpdateTaskStatus(taskinfo.TaskId, (int)TaskInStatusEnum.AGV_InExecuting);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGVå¥åºæ§è¡ä¸");
			_taskExecuteDetailService.AddTaskExecuteDetail(taskinfo.TaskId, $"AGVå¥åºæ§è¡ä¸");
			ServiceLogger.WriteDebug("ReceiveTask", $"AGVå¥åºæ§è¡ä¸ï¼èªå¨3001ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			return content = WebResponseContent.Instance.OK($"AGVå¥åºæ§è¡ä¸ï¼èªå¨3001ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			}
			@@ -226,7 +228,7 @@
			{
			//æ´æ°ä»»å¡è¡¨ä¸NextAddressåæ®µä¸ºæ°çä»»å¡å· taskDTO.weight-æ§çä»»å¡å· taskDTO.task_id-æ°çä»»å¡å·
			UpdateTaskStatus(taskinfo.TaskId, taskDTO.task_id, (int)TaskInStatusEnum.AGV_InFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"AGVæ¬è¿å®æ");
			_taskExecuteDetailService.AddTaskExecuteDetail(taskinfo.TaskId, $"AGVæ¬è¿å®æ");
			ServiceLogger.WriteDebug("ReceiveTask", $"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			return content = WebResponseContent.Instance.OK($"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			}
			@@ -241,6 +243,10 @@
			task.TaskType= (int)TaskRelocationTypeEnum.Relocation;
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			task.Roadway = "SC01";
			if (taskDTO.total > 0)
			{
			task.Remark = taskDTO.total.ToString();//ååºåºçæ»å±æ°
			}
			task.Grade = 1;
			break;
			case 102:
			@@ -478,6 +484,253 @@

			}


			/// <summary>
			/// wcsæå·¥çæä»»å¡
			/// </summary>
			/// <param name="taskDTO">WCSä»»å¡å¯¹è±¡</param>
			/// <returns>è¿åå¤çç»æ</returns>
			public WebResponseContent ReceiveWCSTask([NotNull] MESTaskDTO taskDTO)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			taskDTO.task_id = GetTaskNo();
			string inparam = JsonConvert.SerializeObject(taskDTO);

			ServiceLogger.WriteDebug("ReceiveWCSTask", $"ReceiveWCSTaskæ¹æ³å¥å{inparam}");
			Dt_Task task = new Dt_Task();
			Dt_Task taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id);
			if (taskDTO.cmd == 101)//å¦ææ¯101ææ§çä»»å¡å·å»æ¥
			{
			taskinfo = BaseDal.QueryFirst(x => x.TaskNum == taskDTO.weight);
			}

			if (taskDTO.cmd != 3001 && taskDTO.cmd != 101 && taskinfo != null)
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"ä»»å¡å·éå¤ï¼ä»»å¡å·ï¼{taskDTO.task_id}");
			return content = WebResponseContent.Instance.Error($"ä»»å¡å·éå¤ï¼ä»»å¡å·ï¼{taskDTO.task_id}");
			}
			Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.src_station.ToString());
			Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.Remark == taskDTO.dest_station.ToString());
			switch (taskDTO.cmd)
			{
			case 3001://AGVæ¾è´§å®æ WMSå3001çåæ¶WCSéå¨jobä¸åæåä¿¡å·
			if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.task_id) == null)//æå¨å¥åºç´æ¥å3001ï¼éè¦çæä»»å¡ï¼å ä¸ºæ²¡æ1001ç¯è
			{
			taskDTO.dest_rack =int.Parse(taskDTO.dest_station.ToString().Substring(0, 1));
			taskDTO.dest_row = int.Parse(taskDTO.dest_station.ToString().Substring(1, 2).TrimStart('0'));
			taskDTO.dest_col = int.Parse(taskDTO.dest_station.ToString().Substring(3, 2).TrimStart('0'));
			task.TaskType = (int)TaskInboundTypeEnum.Inbound;
			task.TaskState = (int)TaskInStatusEnum.AGV_InExecuting;
			task.Roadway = "SC01";
			task.Grade = 2;

			if (locationsrc != null)
			{
			task.SourceAddress = locationsrc.LocationCode;
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"WCSæªæ¥è¯¢å°æºç«ç¹å¯¹åºçåºä½ï¼æºç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°æºç«ç¹å¯¹åºçåºä½ï¼æºç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			}
			}
			break;
			case 101://æåæºæåå®æ
			if (taskinfo != null)
			{
			//æ´æ°ä»»å¡è¡¨ä¸NextAddressåæ®µä¸ºæ°çä»»å¡å· taskDTO.weight-æ§çä»»å¡å· taskDTO.task_id-æ°çä»»å¡å·
			UpdateTaskStatus(taskinfo.TaskId, taskDTO.task_id, (int)TaskInStatusEnum.AGV_InFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(taskinfo.TaskId, $"AGVæ¬è¿å®æ");
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			return content = WebResponseContent.Instance.OK($"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææåï¼ä»»å¡å·ï¼{taskinfo.TaskId}");
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææ¶ï¼æ¥è¯¢ä¸å°ä»»å¡å·");
			return content = WebResponseContent.Instance.Error($"AGVæ¬è¿å®æï¼101ï¼æ´æ°ç¶ææ¶ï¼æ¥è¯¢ä¸å°ä»»å¡å·");
			}
			break;

			case 103://äº§åç§»åºï¼ç§»åºï¼åºåºï¼
			taskDTO.src_rack = int.Parse(taskDTO.src_station.ToString().Substring(0, 1));
			taskDTO.src_row = int.Parse(taskDTO.src_station.ToString().Substring(1, 2).TrimStart('0'));
			taskDTO.src_col = int.Parse(taskDTO.src_station.ToString().Substring(3, 2).TrimStart('0'));

			taskDTO.dest_rack = int.Parse(taskDTO.dest_station.ToString().Substring(0, 1));
			taskDTO.dest_row = int.Parse(taskDTO.dest_station.ToString().Substring(1, 2).TrimStart('0'));
			taskDTO.dest_col = int.Parse(taskDTO.dest_station.ToString().Substring(3, 2).TrimStart('0'));

			taskDTO.total = 9;
			task.TaskType = (int)TaskRelocationTypeEnum.Relocation;
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			task.Roadway = "SC01";

			if (taskDTO.total > 0)
			{
			task.Remark = taskDTO.total.ToString();//ååºåºçæ»å±æ°
			}
			task.Grade = 1;
			break;
			case 102:
			if (taskDTO.dest_station == 1001 \|\| taskDTO.dest_station == 1002)//å¼å¸¸åºåº
			{
			taskDTO.src_rack = int.Parse(taskDTO.src_station.ToString().Substring(0, 1));
			taskDTO.src_row = int.Parse(taskDTO.src_station.ToString().Substring(1, 2).TrimStart('0'));
			taskDTO.src_col = int.Parse(taskDTO.src_station.ToString().Substring(3, 2).TrimStart('0'));
			task.TaskType = (int)TaskOutboundTypeEnum.OutInventory;
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			task.Roadway = "SC01";
			task.Grade = 1;
			}
			if (locationdsc != null)
			{
			task.TargetAddress = locationdsc.LocationCode;
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			return content = WebResponseContent.Instance.Error($"WCSæªæ¥è¯¢å°ç®æ ç«ç¹å¯¹åºçåºä½ï¼ç®æ ç«ç¹ï¼{taskDTO.dest_station.ToString()}");
			}
			break;
			default:
			break;
			}

			task.TaskNum = taskDTO.task_id;
			task.PalletCode = taskDTO.CarId;

			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')}";
			}
			if (string.IsNullOrEmpty(task.TargetAddress))//å¦æä¸æ¯ç«ç¹ï¼ç´æ¥åè¡åå±
			{
			task.TargetAddress = $"SC01-{taskDTO.dest_rack.ToString().PadLeft(3, '0')}-{taskDTO.dest_col.ToString().PadLeft(3, '0')}-{taskDTO.dest_row.ToString().PadLeft(3, '0')}";
			}
			task.Creater = "WCS";
			task.WMSId = 3;//WCSäººå·¥å»ºä»»å¡

			//å¤æè´§ä½ç¶æ
			Dt_LocationInfo srcLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			Dt_LocationInfo tarLocation = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			if (srcLocation != null && tarLocation != null)
			{
			if (srcLocation.EnableStatus == (int)EnableStatusEnum.Disable)
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"æºå°åå·²ç¦ç¨ï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"æºå°åå·²ç¦ç¨ï¼{srcLocation.LocationCode}");
			}
			if (tarLocation.EnableStatus == (int)EnableStatusEnum.Disable)
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"ç®æ å°åå·²ç¦ç¨ï¼{tarLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç®æ å°åå·²ç¦ç¨ï¼{tarLocation.LocationCode}");
			}
			if (taskDTO.cmd != 101)//å¥åºæ¶ä¸éè¦å¤ææ¯å¦éå®ï¼éå®ç¶ææ¯å¨çæä»»å¡æ¶éå®
			{

			if (taskinfo != null && taskDTO.cmd == 3001 && taskinfo.WMSId == 3)//å¦ææ¯æå¨å¥åºï¼å3001ï¼ä¼çæä»»å¡ï¼éè¦å¤æåºä½æ¯å¦éå®;èªå¨æ¨¡å¼å1001çæ¶åå°±çæäºä»»å¡ï¼åå3001å°±ä¸éè¦å¤ææ¯å¦éå®äº
			{
			if (srcLocation.LocationStatus == (int)LocationStatusEnum.Lock)
			{

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

			ServiceLogger.WriteDebug("ReceiveWCSTask", $"å¥åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{tarLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"å¥åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{tarLocation.LocationCode}");
			}
			tarLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			}
			else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation) //äº§åç§»åºï¼ç§»åºï¼åºåºå±ç¨ï¼ è·¯å¾ï¼åºä½-->åºä½/æååºä½
			{
			//WCSæ¥è¯¢åºä½ç¶ææ¯å¦ä¸ºâæè´§âï¼åºä½/æååºä½æ¯å¦âç©ºé²â
			if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"ç§»åº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç§»åº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			}
			if (tarLocation.LocationStatus != (int)LocationStatusEnum.Free)
			{

			ServiceLogger.WriteDebug("ReceiveWCSTask", $"ç§»åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"ç§»åº-ç®æ å°åä¸æ¯ç©ºé²ç¶æï¼{srcLocation.LocationCode}");
			}
			srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			tarLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			}
			else if (task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) //å¼å¸¸åºåºï¼éåºï¼ è·¯å¾ï¼åºä½-->æåæºåºä½
			{
			//WCSæ¥è¯¢åºä½ç¶ææ¯å¦ä¸ºâæè´§â
			if (srcLocation.LocationStatus != (int)LocationStatusEnum.InStock)
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"å¼å¸¸åºåº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			return content = WebResponseContent.Instance.Error($"å¼å¸¸åºåº-æºå°åä¸æ¯æè´§ç¶æï¼{srcLocation.LocationCode}");
			}
			srcLocation.LocationStatus = (int)LocationStatusEnum.Lock;
			}
			}
			else
			{
			ServiceLogger.WriteDebug("ReceiveWCSTask", $"åºä½å°åä¸åå¨ï¼ä»»å¡å·:{task.TaskNum}");
			return content = WebResponseContent.Instance.Error($"åºä½å°åä¸åå¨ï¼ä»»å¡å·:{task.TaskNum}");
			}

			try
			{
			//å¼å¯äºç©
			_unitOfWorkManage.BeginTran();
			_locationInfoRepository.UpdateData(tarLocation);
			_locationInfoRepository.UpdateData(srcLocation);
			BaseDal.AddData(task);
			Dt_Task tasktemp = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum);
			_taskExecuteDetailService.AddTaskExecuteDetail(tasktemp.TaskId, "æ¥æ¶WCSä»»å¡");
			//æäº¤äºå¡
			_unitOfWorkManage.CommitTran();

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

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


			/// <summary>
			/// è·åä»»å¡å·
			/// </summary>
			/// <returns></returns>
			public int GetTaskNo()
			{
			DataTable dt = BaseDal.QueryTable("SELECT FORMAT(NEXT VALUE FOR dbo.seqTaskNum, '0000000');");
			return int.Parse("9"+ dt.Rows[0][0].ToString());
			}

			/// <summary>
			/// æ ¹æ®æçå·ãèµ·å§å°ååWMSè¯·æ±ä»»å¡
			/// </summary>
			@@ -586,6 +839,15 @@
			}

			/// <summary>
			/// æ¥è¯¢ç§»åºä»»å¡
			/// </summary>
			/// <returns></returns>
			public Dt_Task QueryStackerCraneTaskByRelotion(int taskNum)
			{
			return BaseDal.QueryFirst(x => (x.Roadway == "SC01" )&&x.TaskType==(int)TaskRelocationTypeEnum.Relocation && x.TaskNum==taskNum, TaskOrderBy);
			}

			/// <summary>
			/// æ¥è¯¢å°å åæºåºåºå®æä»»å¡
			/// </summary>
			/// <returns></returns>
			@@ -600,8 +862,19 @@
			/// <param name="deviceNo"></param>
			/// <returns></returns>
			public Dt_Task QueryStackerCraneTaskByAGVRequest(string deviceNo)
			{
			{
			return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew), TaskOrderBy);
			}

			/// <summary>
			/// æ¥è¯¢AGVè¿å¥ä¸çå¥åºä»»å¡
			/// </summary>
			/// <param name="deviceNo"></param>
			/// <returns></returns>
			public Dt_Task QueryStackerCraneTaskByAGVIning(string deviceNo)
			{

			return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType)&&x.CurrentAddress=="1"), TaskOrderBy);
			}
			/// <summary>
			/// å¯¹åºWMSè¯·æ± 3001-AGVæ¾è´§å®æ
			@@ -691,6 +964,56 @@
			}

			/// <summary>
			/// èªå¨å¥åºæ¶æ´æ°æ¯å¦è¿å¥åéæºæ å¿ï¼0ï¼æªè¿å¥ 1ï¼å·²è¿å¥ï¼
			/// </summary>
			/// <param name="taskNum"></param>
			/// <param name="Inflag"></param>
			/// <returns></returns>
			public WebResponseContent UpdateTaskAllowIn(int taskNum, int Inflag)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task == null) return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»»å¡ä¿¡æ¯,ä»»å¡å·:ã{taskNum}ã");
			task.CurrentAddress = Inflag.ToString();
			task.ModifyDate = DateTime.Now;
			BaseDal.UpdateData(task);
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			}
			return content;

			}

			/// <summary>
			/// æ¯å¦å·²åä¼ MES2001æ å¿ï¼0ï¼æªåä¼ 1ï¼å·²åä¼ ï¼
			/// </summary>
			/// <param name="taskNum"></param>
			/// <param name="Inflag"></param>
			/// <returns></returns>
			public WebResponseContent UpdateTaskIsBack(int taskNum, int Inflag)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task == null) return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»»å¡ä¿¡æ¯,ä»»å¡å·:ã{taskNum}ã");
			task.Remark = Inflag.ToString();
			task.ModifyDate = DateTime.Now;
			BaseDal.UpdateData(task);
			}
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error(ex.Message);
			}
			return content;

			}

			/// <summary>
			/// æ´æ°ä»»å¡ç¶æä¿¡æ¯ï¼å¹¶åæ¥è³WMS
			/// </summary>
			/// <param name="taskId">ä»»å¡ID</param>
			@@ -749,7 +1072,7 @@
			{
			if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
			{


			if (task.TaskType == (int)TaskOutboundTypeEnum.OutInventory \|\| task.TaskType == (int)TaskOutboundTypeEnum.OutPick)//å¼å¸¸åºåº ç©ºè½¦åºåº
			{
			task.TaskState = (int)TaskOutStatusEnum.OutFinish;
			@@ -784,8 +1107,14 @@


			}
			else
			else//ä¸æä»»å¡ä¹æ¹ä¸ºå¼ºå¶å®æ20250115
			{
			//æ´æ°ç¶æä¸ºä»»å¡å®æ
			//task.TaskState = (int)TaskOutStatusEnum.OutFinish;
			//UpdateTaskStatus(task.TaskId, task.TaskState);
			//_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºå®æ");
			//_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"åºåºä»»å¡å®æ");
			//isBack = true;
			return WebResponseContent.Instance.Error($"ä¸æä»»å¡ä¸åè®¡å¼ºå¶å®æï¼");
			}
			}
			@@ -826,6 +1155,26 @@
			}

			/// <summary>
			/// åè®¡éç½®
			/// </summary>
			/// <param name="taskNum"></param>
			/// <returns></returns>
			public WebResponseContent AGVResetTask()
			{
			WebResponseContent content = new WebResponseContent();
			Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == "1");
			if (task != null)
			{
			UpdateTaskAllowIn(task.TaskNum, 0);
			}
			else
			{
			return WebResponseContent.Instance.Error($"ç®åæ¯åè®¡AGVè¿å¥ç¶æï¼æ ééç½®ï¼");
			}
			return content.Error("éç½®æåï¼");
			}

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

			//åæ¶ä»»å¡æ¶ï¼éç½®æ¯å¦åè®¡è¿å¥
			if (task.CurrentAddress == "1")
			{
			UpdateTaskAllowIn(task.TaskNum, 0);
			}

			Dt_LocationInfo locationsrc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress.ToString());
			Dt_LocationInfo locationdsc = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress.ToString());
			@@ -1127,12 +1482,15 @@
			}
			else
			{
			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.WMSId != 3)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¼å¸¸åºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			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}ã");
			}
			}
			}

			@@ -1140,7 +1498,7 @@
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			//ä»»å¡æ§è¡å¤±è´¥ï¼è´§ä½ç¶æè¿å

			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºæ§è¡åºåºä»»å¡å¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{ex.Message}ã");
			}
			@@ -1173,16 +1531,19 @@
			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)
			if (task.WMSId != 3)
			{
			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}ã");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æå¥åºä»»å¡ååä¼ MESæåï¼,ä»»å¡å·:ã{taskNum}ã");
			}
			}

			}
			@@ -1216,15 +1577,36 @@
			_unitOfWorkManage.CommitTran();
			//ç§»åºå®æï¼åä¼ 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)
			if (task.WMSId != 3)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¤§å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			content = WebResponseContent.Instance.Error($"å¤§å åæºå®æåºåºä»»å¡ååä¼ MESå¤±è´¥ï¼,ä»»å¡å·:ã{taskNum}ã,å¤±è´¥ä¿¡æ¯:ã{res.message}ã");
			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}ã");
			}
			}
			//if(task.TaskType== (int)TaskRelocationTypeEnum.Relocation&&!string.IsNullOrEmpty(task.Remark.Trim()))//åºåºä»»å¡åæ»å±æ°æ è¯
			//{
			// CommonStackerCrane commonStackerCrane = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC01") as CommonStackerCrane;
			// //æ ¹æ®ä»»å¡æºå°åç¡®å®åå¥PLCä½ç½® Depth
			// Dt_LocationInfo location = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			// if (commonStackerCrane!=null&&location != null)
			// {
			// bool issuccess = commonStackerCrane.Communicator.Write<short>("DB28." + location.Depth + ".0", 9);
			// if (issuccess)
			// {
			// ServiceLogger.WriteDebug("TaskService", $"åæåºåºååå¥æ è¯æåï¼");
			// }
			// else
			// {
			// ServiceLogger.WriteDebug("TaskService", $"åæåºåºååå¥æ è¯å¤±è´¥ï¼");
			// }
			// }
			//}

			}
			catch (Exception ex)