ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -44,42 +44,38 @@
			/// <param name="secureApplyModel"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("AgvSecureApply"), AllowAnonymous]
			public AgvResponseContent AgvSecureApply([FromBody] AgvSecureApplyDTO secureApplyModel)
			public AgvResponse AgvSecureApply([FromBody] AgvSecureApplyDTO secureApplyModel)
			{
			AgvResponseContent agvResponseContent = new AgvResponseContent();
			agvResponseContent.ReqCode = secureApplyModel.ReqCode;
			AgvResponse agvResponse = new AgvResponse();
			try
			{
			var task = _taskRepository.QueryFirst(x => secureApplyModel.TaskCode == x.AgvTaskNum);
			var task = _taskRepository.QueryFirst(x => secureApplyModel.ReceiveTaskID.ObjToInt() == x.TaskNum);
			if (task == null) throw new Exception("æªæ¾å°ä»»å¡");
			if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
			{
			var content = TakeRequest(task.CurrentAddress);
			//if (!content.Status)
			//{
			// throw new Exception(content.Message);
			//}
			if (!content.Status)
			{
			throw new Exception(content.Message);
			}
			}
			else
			{
			var content = PutRequest(task.NextAddress, task.PalletType);
			//if (!content.Status)
			//{
			// throw new Exception(content.Message);
			//}
			if (!content.Status)
			{
			throw new Exception(content.Message);
			}
			}
			task.TaskState = TaskStatusEnum.AGV_WaitToExecute.ObjToInt();
			task.TaskState = TaskStatusEnum.AGV_Puting.ObjToInt();
			var up = _taskRepository.UpdateData(task);
			agvResponseContent.Code = up ? "0" : "1";
			agvResponseContent.Message = up ? "æå" : "å¤±è´¥";
			agvResponse.OK("æå","0");
			}
			catch (Exception ex)
			{
			agvResponseContent.Code = "1";
			agvResponseContent.Message = ex.Message;
			agvResponse.Error(ex.Message);
			}
			return agvResponseContent;
			//return _taskService.AgvSecureApply(secureApplyModel);
			return agvResponse;
			}
			/// <summary>
			/// æåæºç³è¯· AGV-WCS
			@@ -195,56 +191,29 @@
			/// <param name="agvUpdateModel"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("AgvCallback"), AllowAnonymous]
			public AgvResponseContent AgvUpdateTask([FromBody] AgvUpdateDTO agvUpdateModel)
			public AgvResponse AgvCallback([FromBody] AgvUpdateDTO agvUpdateModel)
			{
			AgvResponseContent agvResponseContent = new AgvResponseContent();
			AgvResponse agvResponse = new AgvResponse();
			try
			{
			if (agvUpdateModel == null) throw new Exception("æªè·åå°è¯·æ±åæ°");
			agvResponseContent.ReqCode = agvUpdateModel.ReqCode;
			var task = _taskRepository.QueryFirst(x => agvUpdateModel.TaskCode == x.AgvTaskNum);
			if (task == null) throw new Exception($"æªæ¾å°ä»»å¡,ä»»å¡å·ã{agvUpdateModel.TaskCode}ã");
			switch (agvUpdateModel.Method)
			var task = _taskRepository.QueryFirst(x => agvUpdateModel.ReceiveTaskID == x.TaskNum.ToString());
			if (task == null) throw new Exception($"æªæ¾å°ä»»å¡,ä»»å¡å·ã{agvUpdateModel.ReceiveTaskID}ã");
			switch (agvUpdateModel.GoodsState)
			{
			case "start":
			break;
			case "outbin"://åºåºæ ¹æ®è¿ä¸ªä¿¡å·å¤æåè´§å®æ
			if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
			//case 1://åºåºæ ¹æ®è¿ä¸ªä¿¡å·å¤æåè´§å®æ
			// if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
			// {
			// var content = TakeFinish(task.CurrentAddress);
			// if (!content.Status) throw new Exception(content.Message);
			// task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
			// var up = _taskRepository.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			// _taskService.TaskCompleted(task.TaskNum);
			// }
			// break;
			case 2://å¥åºæ ¹æ®è¿ä¸ªä¿¡å·å¤ææ¾è´§å®æ
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
			{
			var content = TakeFinish(task.CurrentAddress);
			if (!content.Status) throw new Exception(content.Message);
			task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
			var up = _taskRepository.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			_taskService.TaskCompleted(task.TaskNum);
			agvResponseContent.Code = up ? "0" : "1";
			agvResponseContent.Message = up ? "æå" : "å¤±è´¥";
			return agvResponseContent;
			}
			break;
			case "getSafetySignal"://å®å¨ä¿¡å·ç³è¯·
			{
			if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
			{
			var content = TakeRequest(task.CurrentAddress);
			//if (!content.Status) throw new Exception(content.Message);
			}
			else
			{
			var content = PutRequest(task.NextAddress, task.PalletType);
			//if (!content.Status) throw new Exception(content.Message);
			}
			task.TaskState = TaskStatusEnum.AGV_WaitToExecute.ObjToInt();
			var up = _taskRepository.UpdateData(task);
			agvResponseContent.Code = up ? "0" : "1";
			agvResponseContent.Message = up ? "æå" : "å¤±è´¥";
			return agvResponseContent;
			}
			case "end"://å¥åºæ ¹æ®è¿ä¸ªä¿¡å·å¤ææ¾è´§å®æ
			if (task.TaskType != TaskTypeEnum.Outbound.ObjToInt())
			{
			var content = PutFinish(task.NextAddress);
			if (!content.Status) throw new Exception(content.Message);
			Dt_StationManger dt_Station = _stationMangerRepository.QueryFirst(x => x.AGVStationCode == task.NextAddress);
			Dt_StationManger dt_Station = _stationMangerRepository.QueryFirst(x => x.StationCode == task.NextAddress);
			if (dt_Station == null)
			{
			throw new Exception($"{task.NextAddress}AGVç«å°æªå®ä¹");
			@@ -252,29 +221,20 @@
			task.CurrentAddress = dt_Station.StationCode;
			task.NextAddress = "";
			task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
			task.DeviceCode = "SC01_CSJ";
			task.DeviceCode = dt_Station.StationDeviceCode;
			var up = _taskRepository.UpdateData(task);
			agvResponseContent.Code = up ? "0" : "1";
			agvResponseContent.Message = up ? "æå" : "å¤±è´¥";
			return agvResponseContent;
			return agvResponse.OK("æå","0");
			}
			break;
			case "cancel":
			task.TaskState = TaskStatusEnum.Cancel.ObjToInt();
			_taskRepository.UpdateData(task);
			break;
			default:
			throw new Exception($"æªå®ä¹æ¹æ³åã{agvUpdateModel.Method}ã");
			throw new Exception($"æªå®ä¹æ¹æ³åã{agvUpdateModel.TaskState}ã");
			}
			agvResponseContent.Code = "0";
			agvResponseContent.Message = "æå";
			}
			catch (Exception ex)
			{
			agvResponseContent.Code = "1";
			agvResponseContent.Message = ex.Message;
			agvResponse.Error(ex.Message);
			}
			return agvResponseContent;
			return agvResponse;
			//return _taskService.AgvUpdateTask(agvUpdateModel);
			}

			@@ -287,45 +247,36 @@
			[HttpPost, HttpGet, Route("PutRequest"), AllowAnonymous]
			public WebResponseContent PutRequest(string code, int palletType)
			{
			WebResponseContent content = new WebResponseContent();
			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($"æªæ¾å°ç«å°éç½®");
			return content.Error($"æªæ¾å°ç«å°éç½®");
			}
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device == null)
			{
			return WebResponseContent.Instance.Error($"æªæ¾å°å¯¹åºè®¾å¤");
			return content.Error($"æªæ¾å°å¯¹åºè®¾å¤");
			}

			OtherDevice otherDevice = (OtherDevice)device;

			bool canPut = otherDevice.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanPut, stationManger.StationCode);
			if (canPut)
			short Command = otherDevice.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
			if (Command == 3)
			{
			otherDevice.SetValue(GroundStationDBName.W_PutRequest, true, stationManger.StationCode);
			return WebResponseContent.Instance.OK();
			content.OK("åè®¸æ¾æ");
			}
			else
			{
			otherDevice.SetValue(GroundStationDBName.W_PutRequest, true, stationManger.StationCode);
			Thread.Sleep(1000);
			canPut = otherDevice.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanPut, stationManger.StationCode);
			if (canPut)
			{
			return WebResponseContent.Instance.OK();
			}
			else
			{
			return WebResponseContent.Instance.Error($"æ¾è´§ç³è¯·ä¸");
			}
			return content.Error("ç¦æ¢æ¾æ");
			}
			return content;
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			return content.Error(ex.Message);
			}
			}