ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -22,7 +22,7 @@
			{
			try
			{
			var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()\|\| x.TaskState == TaskStatusEnum.New.ObjToInt()) && x.DeviceCode=="AGV" && x.TaskType!=999).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
			var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()\|\| x.TaskState == TaskStatusEnum.New.ObjToInt()) && x.DeviceCode=="AGV").ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();

			if (newTasks.Count>0)
			{
			@@ -38,6 +38,16 @@
			MapCode="01",
			Variables=new List<PointDetail>()
			};
			if (task.NextAddress== "ä¸æ¥¼æå°ç å¤´")
			{
			string? address =_taskService.RequestTargetAddress(task.TaskNum);
			if (address.IsNullOrEmpty())
			{
			task.ExceptionMessage = "æªæ¾å°AGVç«ç¹";
			continue;
			}
			task.NextAddress = address;
			}
			Dt_StationManger stationMangerStart = _stationMangerRepository.QueryFirst(x=>x.StationCode==task.CurrentAddress);
			Dt_StationManger stationMangerEnd = _stationMangerRepository.QueryFirst(x => x.StationCode == task.NextAddress);
			//æ·»å ä»»å¡è·¯å¾åé«åº¦
			@@ -48,6 +58,7 @@
			Code= "GoodPoint",
			Value=stationMangerStart.AGVStationCode
			};
			//å¤ææ¯å¦æåç½®ç¹
			if (!string.IsNullOrEmpty(stationMangerStart.AGVFrontCode))
			{
			PointDetail pointDetail2 = new PointDetail()
			@@ -62,7 +73,8 @@
			Code = "PointB",
			Value = stationMangerEnd.AGVStationCode
			};
			if (!string.IsNullOrEmpty(stationMangerStart.AGVFrontCode))
			//å¤ææ¯å¦æåç½®ç¹
			if (!string.IsNullOrEmpty(stationMangerEnd.AGVFrontCode))
			{
			PointDetail pointDetail4 = new PointDetail()
			{
			@@ -90,6 +102,91 @@
			{
			throw new Exception("æªæ¾å°AGVç«ç¹");
			}
			//åæ¾ä»»å¡æ¨¡ç
			if (stationMangerStart.StationCode.Contains("PNT") && !stationMangerEnd.StationCode.Contains("PNT") && stationMangerEnd.IsManual==0)//è¯·æ±æ¾
			{
			agvTaskSend.TaskCode = "DUIGAO1";
			if (stationMangerStart.StationType == 998 \|\| stationMangerEnd.StationType == 998)//æ½ä¼é¡¶åè½¦
			{
			agvTaskSend.TaskCode = "DUOLUN1";
			}
			}
			else if (!stationMangerStart.StationCode.Contains("PNT") && stationMangerEnd.StationCode.Contains("PNT") && stationMangerStart.IsManual == 0)//è¯·æ±å
			{
			agvTaskSend.TaskCode = "DUIGAO2";
			if (stationMangerStart.StationType==998 \|\| stationMangerEnd.StationType == 998)//æ½ä¼é¡¶åè½¦
			{
			agvTaskSend.TaskCode = "DUOLUN2";
			}
			}
			else if (!stationMangerStart.StationCode.Contains("PNT") && !stationMangerEnd.StationCode.Contains("PNT") && stationMangerStart.IsManual == 0 && stationMangerStart.IsManual == 0)//è¯·æ±åæ¾
			{
			agvTaskSend.TaskCode = "DUIGAO3";
			if (stationMangerStart.StationType == 998 \|\| stationMangerEnd.StationType == 998)//æ½ä¼é¡¶åè½¦
			{
			agvTaskSend.TaskCode = "DUOLUN3";
			}
			}
			else//æ è¯·æ±
			{
			agvTaskSend.TaskCode = "DUIGAO4";
			if (stationMangerStart.StationType == 998 \|\| stationMangerEnd.StationType == 998)//æ½ä¼é¡¶åè½¦
			{
			agvTaskSend.TaskCode = "DUOLUN4";
			}
			}
			if (stationMangerStart.StationType == 998 \|\| stationMangerEnd.StationType == 998)//æ½ä¼é¡¶åè½¦
			{
			agvTaskSend.Variables.FirstOrDefault(x => x.Code == "FHMH").Value = "0";
			agvTaskSend.Variables.FirstOrDefault(x => x.Code == "GoodPoint").Value = "";
			//å¤æäººå·¥æå¨
			PointDetail complete = new();
			if (stationMangerStart.IsManual==1 && stationMangerEnd.IsManual==0)
			{
			complete = new()
			{
			Code = "Complete",
			Value = "1"
			};
			}
			else if (stationMangerStart.IsManual == 0 && stationMangerEnd.IsManual == 1)
			{
			complete = new()
			{
			Code = "Complete",
			Value = "2"
			};
			}
			else if (stationMangerStart.IsManual == 1 && stationMangerEnd.IsManual == 1)
			{
			complete = new()
			{
			Code = "Complete",
			Value = "3"
			};
			}
			else
			{
			complete = new()
			{
			Code = "Complete",
			Value = "0"
			};
			}
			//ä¸åä»»å¡AGVä»»å¡éç¾¤
			agvTaskSend.AgvGroupCode = "QianF";
			PointDetail pointDetail2 = new PointDetail()
			{
			Code = "CostPoint",
			Value = stationMangerStart.AGVStationCode
			};
			agvTaskSend.Variables.Add(pointDetail2);
			agvTaskSend.Variables.Add(complete);
			}
			if (task.TaskType==TaskTypeEnum.OutCarton.ObjToInt())
			{
			agvTaskSend.AgvGroupCode = "GAOc";
			}
			//åéAGVä»»å¡
			WebResponseContent content = _taskService.AgvSendTask(agvTaskSend, APIEnum.AgvSendTask);
			if (!content.Status)
			@@ -104,6 +201,7 @@
			task.ExceptionMessage = ex.Message;
			}
			}
			//æ´æ°ä»»å¡
			if (newTasks.Count > 0)
			{
			_taskService.UpdateData(newTasks);