ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -15,9 +15,12 @@
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_QuartzJob.Repository;
			using WIDESEAWCS_Tasks;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using WIDESEAWCS_Tasks.DBNames;
			using static Dm.net.buffer.ByteArrayBuffer;

			namespace WIDESEAWCS_Server.Controllers
			{
			@@ -28,12 +31,14 @@
			private readonly IStationMangerRepository _stationMangerRepository;
			private readonly ITaskService _taskService;
			private readonly ITaskRepository _taskRepository;
			private readonly IRouterRepository _routerRepository;

			public AGVController(IStationMangerRepository stationMangerRepository, ITaskService taskService, ITaskRepository taskRepository)
			public AGVController(IStationMangerRepository stationMangerRepository, ITaskService taskService, ITaskRepository taskRepository,IRouterRepository routerRepository)
			{
			_stationMangerRepository = stationMangerRepository;
			_taskService = taskService;
			_taskRepository = taskRepository;
			_routerRepository = routerRepository;
			}


			@@ -53,22 +58,42 @@
			if (task == null) throw new Exception("æªæ¾å°ä»»å¡");
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			var content = TakeRequest(task.CurrentAddress);
			if (!content.Status)
			if (task.TaskState==TaskStatusEnum.AGV_Executing.ObjToInt())//åºåºåè´§è¯·æ±
			{
			throw new Exception(content.Message);
			var content = TakeRequest(secureApplyModel.WbCode);
			if (!content.Status)
			{
			throw new Exception(content.Message);
			}
			}
			else//åºåºæ¾è´§è¯·æ±
			{
			var content = PutRequest(task.NextAddress, task.PalletType);
			if (!content.Status)
			{
			throw new Exception(content.Message);
			}
			}
			}
			else
			{
			var content = PutRequest(task.NextAddress, task.PalletType);
			if (!content.Status)
			if (task.TaskState == TaskStatusEnum.AGV_Executing.ObjToInt())//å¥åºåè´§è¯·æ±
			{
			throw new Exception(content.Message);
			var content = TakeRequest(secureApplyModel.WbCode);
			if (!content.Status)
			{
			throw new Exception(content.Message);
			}
			}
			else//å¥åºæ¾è´§è¯·æ±
			{
			var content = PutRequest(task.NextAddress, task.TaskNum);
			if (!content.Status)
			{
			throw new Exception(content.Message);
			}
			}
			}
			task.TaskState = TaskStatusEnum.AGV_Puting.ObjToInt();
			var up = _taskRepository.UpdateData(task);
			agvResponse.OK("æå","0");
			}
			catch (Exception ex)
			@@ -201,6 +226,9 @@
			switch (agvUpdateModel.GoodsState)
			{
			case "1"://åºåºæ ¹æ®è¿ä¸ªä¿¡å·å¤æåè´§å®æ

			//æ´æ°ä»»å¡ç¶æ
			_taskService.UpdateTask(task, TaskStatusEnum.AGV_TakeFinish);
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			var content = TakeFinish(task.CurrentAddress);
			@@ -208,9 +236,19 @@
			{
			throw new Exception(content.Message);
			};
			return agvResponse.OK("æå", "0");
			}
			break;
			else
			{
			if (task.TaskType == TaskTypeEnum.PrintYLInbound.ObjToInt() \|\| task.TaskType == TaskTypeEnum.PrintYLBackInbound.ObjToInt())
			{
			var content = TakeFinish(task.CurrentAddress);
			if (!content.Status)
			{
			throw new Exception(content.Message);
			};
			}
			}
			return agvResponse.OK("æå", "0");
			case "2"://å¥åºæ ¹æ®è¿ä¸ªä¿¡å·å¤ææ¾è´§å®æ
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
			{
			@@ -219,19 +257,41 @@
			{
			throw new Exception($"{task.NextAddress}AGVç«å°æªå®ä¹");
			}
			task.CurrentAddress = dt_Station.StationCode;
			task.NextAddress = "";
			task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
			task.DeviceCode = dt_Station.StationDeviceCode;
			var up = _taskRepository.UpdateData(task);
			if (task.TaskType == TaskTypeEnum.PrintYLInbound.ObjToInt() \|\| task.TaskType == TaskTypeEnum.PrintYLBackInbound.ObjToInt())
			{
			List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == task.TaskType && task.NextAddress == x.StartPosi);
			Dt_Router router = routers.FirstOrDefault();
			if (router == null)
			{
			throw new Exception($"ä»»å¡å·:{task.TaskNum}æªæ¾å°è·¯ç±éç½®ä¿¡æ¯");
			}
			string oldAddress = task.NextAddress;
			//æ´æ°ä»»å¡ç¶æ
			task.CurrentAddress = router.NextPosi;
			task.NextAddress = "";
			task.DeviceCode = router.ChildPosiDeviceCode;
			_taskService.UpdateTask(task, TaskStatusEnum.AGV_Finish);
			PutFinish(oldAddress, task.TaskNum);
			}
			else
			{
			task.CurrentAddress = dt_Station.StationCode;
			task.NextAddress = "";
			task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
			task.DeviceCode = dt_Station.StationDeviceCode;
			_taskRepository.UpdateData(task);
			}
			return agvResponse.OK("æå","0");
			}
			else if(task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			else
			{
			_taskService.TaskCompleted(task.TaskNum);
			if (task.TaskType==TaskTypeEnum.PrintYLOutbound.ObjToInt())
			{
			PutFinish(task.NextAddress);
			}
			return agvResponse.OK("æå", "0");
			}
			break;
			default:
			throw new Exception($"æªå®ä¹æ¹æ³åã{agvUpdateModel.TaskState}ã");
			}
			@@ -241,7 +301,6 @@
			agvResponse.Error(ex.Message);
			}
			return agvResponse;
			//return _taskService.AgvUpdateTask(agvUpdateModel);
			}

			/// <summary>
			@@ -251,7 +310,7 @@
			/// <param name="palletType"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("PutRequest"), AllowAnonymous]
			public WebResponseContent PutRequest(string code, int palletType)
			public WebResponseContent PutRequest(string code, int taskNum)
			{
			WebResponseContent content = new WebResponseContent();
			try
			@@ -269,15 +328,57 @@

			OtherDevice otherDevice = (OtherDevice)device;

			short Command = otherDevice.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
			if (Command == 3)
			if (device.DeviceCode.Contains("CP"))//æåè¾éçº¿
			{
			content.OK("åè®¸æ¾æ");
			short Command = otherDevice.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
			if (Command == 3)
			{
			content.OK("åè®¸æ¾æ");
			}
			else
			{
			return content.Error("ç¦æ¢æ¾æ");
			}
			}
			else
			else if (device.DeviceCode.Contains("Coveryor"))//æ¥é©³å°
			{
			return content.Error("ç¦æ¢æ¾æ");
			bool RequestPut = otherDevice.GetValue<CoveryorDB, bool>(CoveryorDB.C_RequestPut, stationManger.StationDeviceCode);
			if (!RequestPut)
			{
			otherDevice.SetValue(CoveryorDB.C_InTaskNum, taskNum, stationManger.StationDeviceCode);
			otherDevice.SetValue(CoveryorDB.C_RequestPut, true, stationManger.StationDeviceCode);
			Thread.Sleep(1000);
			}
			bool AllowFinish = otherDevice.GetValue<CoveryorDB, bool>(CoveryorDB.C_AllowFinish, stationManger.StationDeviceCode);
			if (AllowFinish)
			{
			content.OK("åè®¸æ¾æ");
			}
			else
			{
			return content.Error("ç¦æ¢æ¾æ");
			}
			}
			else if (device.DeviceCode.Contains("Retract"))//ä¼¸ç¼©è´§å
			{
			bool RequestPut = otherDevice.GetValue<RetractDB, bool>(RetractDB.Ret_RequestPut, stationManger.StationDeviceCode);
			if (!RequestPut)
			{
			otherDevice.SetValue(RetractDB.Ret_TargetAddress, Convert.ToInt16(stationManger.StationCode), stationManger.StationDeviceCode);
			otherDevice.SetValue(RetractDB.Ret_RequestPut, true, stationManger.StationDeviceCode);
			Thread.Sleep(1000);
			}
			bool AllowFinish = otherDevice.GetValue<RetractDB, bool>(RetractDB.Ret_AllowFinish, stationManger.StationDeviceCode);
			if (AllowFinish)
			{
			content.OK("åè®¸æ¾æ");
			}
			else
			{
			return content.Error("ç¦æ¢æ¾æ");
			}
			}

			return content;
			}
			catch (Exception ex)
			@@ -293,11 +394,11 @@
			/// <param name="code"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("PutFinish"), AllowAnonymous]
			public WebResponseContent PutFinish(string code)
			public WebResponseContent PutFinish(string code,int taskNum=0)
			{
			try
			{
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.AGVStationCode == code);
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == code);
			if (stationManger == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°ç«å°éç½®");
			@@ -309,7 +410,14 @@
			}

			OtherDevice otherDevice = (OtherDevice)device;
			otherDevice.SetValue(GroundStationDBName.W_PutFinish, true, stationManger.StationCode);
			if (device.DeviceCode.Contains("Coveryor"))//æ¥é©³å°
			{
			otherDevice.SetValue(CoveryorDB.C_PutFinish, true, stationManger.StationDeviceCode);
			}
			else if (device.DeviceCode.Contains("Retract"))//ä¼¸ç¼©è´§å
			{
			otherDevice.SetValue(RetractDB.Ret_PutFinish, true, stationManger.StationDeviceCode);
			}
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			@@ -330,7 +438,7 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == code);
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.AGVStationCode == code);
			if (stationManger == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°ç«å°éç½®{code}");
			@@ -343,15 +451,43 @@

			OtherDevice otherDevice = (OtherDevice)device;

			short Command = otherDevice.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
			if (Command == 2)
			if (otherDevice.DeviceCode.Contains("CP"))//æåè¾éçº¿
			{
			content.OK("åè®¸åæ");
			short Command = otherDevice.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
			if (Command == 2)
			{
			content.OK("åè®¸åæ");
			}
			else
			{
			return content.Error("ç¦æ¢åæ");
			}
			}
			else
			else if (device.DeviceCode.Contains("Coveryor"))//æ¥é©³å°
			{
			return content.Error("ç¦æ¢åæ");
			bool AllowTake = otherDevice.GetValue<CoveryorDB, bool>(CoveryorDB.C_AllowTake, stationManger.StationDeviceCode);
			if (AllowTake)
			{
			content.OK("åè®¸åæ");
			}
			else
			{
			return content.Error("ç¦æ¢åæ");
			}
			}
			else if (device.DeviceCode.Contains("Retract"))//ä¼¸ç¼©è´§å
			{
			bool AllowTake = otherDevice.GetValue<RetractDB, bool>(RetractDB.Ret_AllowTake, stationManger.StationDeviceCode);
			if (AllowTake)
			{
			content.OK("åè®¸åæ");
			}
			else
			{
			return content.Error("ç¦æ¢åæ");
			}
			}

			return content;
			}
			catch (Exception ex)
			@@ -387,6 +523,15 @@
			{
			otherDevice.SetValue(W_ConveyorLineCPDB.W_Command, 2, stationManger.StationCode);
			}
			else if (device.DeviceCode.Contains("Coveryor"))
			{
			otherDevice.SetValue(CoveryorDB.C_TakeFinish, true, stationManger.StationDeviceCode);
			}
			else if (device.DeviceCode.Contains("Retract"))//ä¼¸ç¼©è´§å
			{
			otherDevice.SetValue(RetractDB.Ret_TakeFinish, true, stationManger.StationDeviceCode);
			}

			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)