RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -21,6 +21,7 @@
			using WIDESEAWCS_DTO.WMS;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.DTO;

			namespace WIDESEAWCS_TaskInfoService
			{
			@@ -80,19 +81,89 @@
			task.TaskState = (int)TaskStatusEnum.Takeing;
			TaskFeedback(task, 1);
			break;
			case "outbin":
			case "outbin"://ç¦»å¼èµ·ç¹
			{

			///å¤æä»»å¡æ¯å¦è·è®¾å¤æå³
			TaskFromCompleted(task, deviceTypeEnum);
			}
			break;
			case "finish"://ç¦»å¼æåæº
			{

			//å¥æåæº
			if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());
			if (device.IsConnected)
			device.SetValue(HoistEnum.Inboundboxon, 1);//å¥åºå®æ
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			}
			}

			//åºæåæº
			if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			if (device.IsConnected)
			device.SetValue(HoistEnum.Outboundboxon, 1);//åºåºå®æ
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			}
			}
			//åæ¥¼ å¥åº
			if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			if (device.IsConnected)
			device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			}
			}
			//åæ¥¼ åºåº
			if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			if (device.IsConnected)
			//åä»¥ä¸ä¸ªåºåºå®æä¿¡å·
			device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "1");
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			}
			}
			}
			break;
			case "into"://ç³è¯·è¿å¥æåæº
			{
			task.TaskState = (int)TaskStatusEnum.AGV_WaitToExecute;
			BaseDal.UpdateData(task);
			}
			break;
			case "wait"://æ«ç çå¾
			{
			task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
			BaseDal.UpdateData(task);
			}
			break;
			case "end":
			case "end"://ä»»å¡å®æéç¥
			{
			///å¤æä»»å¡æ¯å¦è·è®¾å¤æå³

			TaskCompleted(task, deviceTypeEnum);
			}
			break;
			@@ -178,12 +249,12 @@
			}
			else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
			{
			if (!string.IsNullOrEmpty(task.ExceptionMessage))
			if (!string.IsNullOrEmpty(task.ExceptionMessage) && !task.ExceptionMessage.Contains("ç±äºç®æ è®¡ç®æºç§¯ææç»ï¼æ æ³è¿æ¥"))
			ErrorTaskFeedback(task, true/!task.ExceptionMessage.Contains("å¤æ£å¤±è´¥")/);
			else
			TaskCompleted(task, deviceTypeEnum);
			}
			else if (task.TaskType == (int)TaskTypeEnum.CPOutbound )//åºåºå®æ
			else if (task.TaskType == (int)TaskTypeEnum.CPOutbound)//åºåºå®æ
			{
			TaskCompleted(task, deviceTypeEnum);
			}
			@@ -465,5 +536,9 @@
			return content;
			}
			#endregion




			}
			}