RuiShengZhiNeng/GaoPuLiTiKu.git

			@@ -103,11 +103,22 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());//æ¾å°ä½äº
			bool Work = false;
			if (device.IsConnected)
			device.SetValue(HoistEnum.Inboundboxon, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.TargetAddress);
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.TargetAddress}ãåå¥3æ¥¼å¥åºç®±æ¾å°ä½å¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			@@ -119,10 +130,22 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Work = false;
			if (device.IsConnected)
			device.SetValue(HoistEnum.Outboundboxon, 1);//åºåºå®æ
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Outboundboxon, 1, task.SourceAddress);//åºåºå®æ
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.SourceAddress}ãåå¥3æ¥¼åºåºç®±æ¾å°ä½å¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			@@ -133,25 +156,48 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Work = false;
			if (device.IsConnected)
			device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Emptyboxplacedinposition, 1, task.TargetAddress);
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.TargetAddress}ãåå¥4æ¥¼ç©ºç®±æ¾å°ä½å¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			// //åæ¥¼åºæåæº å¥åº ä¹åæ¯AGV_ToExecute //è¦åæåè´§å®æç¶æTakeFinish
			else if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() \|\| task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
			else if ((task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() \|\| task.TaskType == TaskTypeEnum.F03.ObjToInt()) && task.TaskState == (int)TaskStatusEnum.TakeFinish)
			{
			var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Work = false;
			if (device.IsConnected)
			//åä»¥ä¸ä¸ªåºåºå®æä¿¡å·
			device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Work && i <= 3)
			{
			i++;
			Work = device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
			Thread.Sleep(500);
			}
			}
			if (!Work)
			{
			task.ExceptionMessage = $"ã{task.SourceAddress}ãåå¥4æ¥¼åºåºåç®±å®æå¤±è´¥";
			task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
			}
			}
			BaseDal.UpdateData(task);
			}
			@@ -197,11 +243,22 @@
			if (device == null) task.ExceptionMessage = "æªæ¾å°æåæºä¿¡æ¯";
			else
			{
			bool Wok = false;
			if (device.IsConnected)
			//æå¼æ«ç å¨
			device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
			else
			task.ExceptionMessage = "æåæºä¿¡æ¯è®¾å¤è¿æ¥å¤±è´¥";
			{
			int i = 0;
			while (!Wok && i <= 3)
			{
			i++;
			Wok = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1, "TSJR3F");
			Thread.Sleep(500);
			}
			}
			if (!Wok)
			{
			task.ExceptionMessage = $"ãTSJR3Fã3æ¥¼è¯»ç è§¦åå¤±è´¥ï¼";
			task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
			}
			}
			task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
			BaseDal.UpdateData(task);
			@@ -226,7 +283,7 @@
			case "intolift": //è¿å¥çµæ¢¯
			{
			//åæ¥¼å°ä¸æ¥¼çå¥åºä»»å¡
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01)
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01 \|\| task.TaskType == (int)TaskTypeEnum.Q3CK)
			{
			task.TaskState = TaskStatusEnum.Hkintolift.ObjToInt();
			BaseDal.UpdateData(task);
			@@ -235,7 +292,7 @@
			break;
			case "leavelift": //ç¦»å¼çµæ¢¯
			{
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01)
			if (task.TaskType == (int)TaskTypeEnum.Q3RK \|\| task.TaskType == (int)TaskTypeEnum.MOVE \|\| task.TaskType == (int)TaskTypeEnum.F01\|\| task.TaskType == (int)TaskTypeEnum.Q3CK)
			{
			task.TaskState = TaskStatusEnum.HKleavelift.ObjToInt();
			BaseDal.UpdateData(task);
			@@ -332,6 +389,15 @@
			else if (task.TaskType == (int)TaskTypeEnum.CPOutbound)//åºåºå®æ
			{
			TaskCompleted(task, deviceTypeEnum);
			}
			}
			if (Rgv.content.status == 5)
			{
			if (task.TaskState == (int)TaskStatusEnum.Execut)
			{
			task.TaskState = (int)TaskStatusEnum.New;
			task.Remark = "ååè½¦åé¦å¤±è´¥,éæ°ä¸å";
			BaseDal.UpdateData(task);
			}
			}
			}
			@@ -583,7 +649,7 @@
			#endregion

			#region ä¸æ¥WMS
			public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status, bool Del = true)
			public WebResponseContent TaskFeedback(Dt_Task dt_Task, int Status, bool Del = false)
			{
			WebResponseContent content = new WebResponseContent();
			WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();