KuKa/HaErBingCTU.git

			@@ -22,8 +22,8 @@
			{
			try
			{
			var newTasksOut = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && x.TaskType==TaskTypeEnum.Outbound.ObjToInt() && x.DeviceCode == "AGV").ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
			var newTasksIn = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.DeviceCode == "AGV").ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
			var newTasksOut = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && x.TaskType==TaskTypeEnum.Outbound.ObjToInt() && x.DeviceCode == "AGV").ToList().OrderBy(x => x.Grade).ThenBy(x => x.TaskNum).ToList();
			var newTasksIn = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.DeviceCode == "AGV").ToList().OrderBy(x => x.Grade).ThenBy(x => x.TaskNum).ToList();
			#region åºåºä»»å¡ä¸å
			if (newTasksOut.Count>0)
			{
			@@ -109,7 +109,7 @@
			//è·åç®æ ç¹è´§ä½
			Dt_LocationInfo locationInfoEnd = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.NextAddress);
			//è·åçº¿ä½å¥åºç«å°
			Dt_StationManger stationMangerStart = _stationMangerRepository.QueryFirst(x => x.PickStationCode == task.CurrentAddress);
			Dt_StationManger stationMangerStart = _stationMangerRepository.QueryFirst(x => x.StationCode == task.CurrentAddress);
			if (locationInfoEnd == null \|\| stationMangerStart == null) throw new Exception($"æªæ¾å°ä»»å¡å·${task.TaskNum}èµ·å§ç¹{task.CurrentAddress}æç®æ ç¹{task.NextAddress}ä½ç½®ä¿¡æ¯");
			agvTaskSend.RequestId = Guid.NewGuid().ToString().Replace("-", "");
			agvTaskSend.MissionCode = task.TaskNum.ToString();
			@@ -130,10 +130,10 @@
			StartSlotCode = stationMangerStart.CraneStationCode,
			EndPosition = locationInfoEnd.AgvPoint,
			EndSlotCode = locationInfoEnd.LocationCode,
			TakeActionConfirm = false,
			TakeActionInform = false,
			PutActionConfirm = true,
			PutActionInform = true,
			TakeActionConfirm = true,
			TakeActionInform = true,
			PutActionConfirm = false,
			PutActionInform = false,
			};
			agvTaskSend.MissionData.Add(missionDataItem);
			//åéAGVä»»å¡