~dengjunjie/TaiYuanTaiZhong.git

			@@ -25,23 +25,24 @@
			/// </summary>
			public static void SendAgvTask()
			{
			WriteLog.Write_Log("鑷姩涓嬪彂浠诲姟", "SendAgvTask","");
			WriteLog.Write_Log("鑷姩涓嬪彂浠诲姟", "SendAgvTask", "");
			Respone respone = new Respone();
			RequestTask requestTask = new RequestTask();
			string postJson = string.Empty;
			string report = string.Empty;
			try

			VOLContext Context = new VOLContext();
			Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
			var agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
			.ThenBy(x => x.agv_createtime).ToList();
			if (agv_tasks.Count < 1)
			agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && !string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
			.ThenBy(x => x.agv_createtime).ToList();
			if (agv_tasks.Count > 0)
			{
			VOLContext Context = new VOLContext();
			Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
			var agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
			.ThenBy(x => x.agv_createtime).ToList();
			if (agv_tasks.Count < 1)
			agv_tasks = agvtaskRepository.Find(x => x.agv_taskstate == "Create" && !string.IsNullOrEmpty(x.agv_remark)).OrderByDescending(x => x.agv_grade)
			.ThenBy(x => x.agv_createtime).ToList();
			if (agv_tasks.Count > 0)
			foreach (var agv_task in agv_tasks)
			{
			foreach (var agv_task in agv_tasks)
			try
			{
			var Materiel = QueryData.QueryMateriel(agv_task.agv_materielid);//鏌ユ壘杞﹁疆鏁版嵁
			var Materiel1 = QueryData.QueryMateriel1(agv_task.agv_materielid);//鏌ユ壘杞﹁疆鏁版嵁
			@@ -75,32 +76,34 @@
			requestTask.H = Materiel == null ? Materiel1.h : Materiel.h;
			}
			postJson = JsonConvert.SerializeObject(requestTask);
			report = Request.RequestData(postJson, "http://192.168.12.204:5000/api/TaskCreat/CreatTask");
			respone = JsonConvert.DeserializeObject<Respone>(report);
			if (respone.Success)
			{
			agv_task.agv_taskstate = AGVTaskStateEnum.SendOut.ToString();
			agv_task.agv_realesstime = DateTime.Now;
			agvtaskRepository.Update(agv_task, true);
			WriteWMSLog.LogAdd(requestTask.TASK_NO, "鎴愬姛 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
			}
			else
			{
			agv_task.agv_remark = respone.Msg;
			var task = agvtaskRepository.Find(x => x.agv_tasknum == agv_task.agv_tasknum && x.agv_remark == agv_task.agv_remark).FirstOrDefault();//.Exists
			if (task == null)
			agvtaskRepository.Update(agv_task, true);
			WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
			}
			//report = Request.RequestData(postJson, AGVAPIAddress.IPAddress_AGVTask);//"http://192.168.12.204:5000/api/TaskCreat/CreatTask"
			RequestAGV(agvtaskRepository, agv_task, postJson, AGVAPIAddress.IPAddress_AGVTask);
			//respone = JsonConvert.DeserializeObject<Respone>(report);
			//if (respone.Success)
			//{
			// agv_task.agv_taskstate = AGVTaskStateEnum.SendOut.ToString();
			// agv_task.agv_realesstime = DateTime.Now;
			// agvtaskRepository.Update(agv_task, true);
			// WriteWMSLog.LogAdd(requestTask.TASK_NO, "鎴愬姛 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
			//}
			//else
			//{
			// agv_task.agv_remark = respone.Msg;
			// var task = agvtaskRepository.Find(x => x.agv_tasknum == agv_task.agv_tasknum && x.agv_remark == agv_task.agv_remark).FirstOrDefault();//.Exists
			// if (task == null)
			// agvtaskRepository.Update(agv_task, true);
			// WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触 ", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
			//}
			}
			catch (Exception ex)
			{
			respone.Success = false;
			respone.Msg = ex.Message;
			WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
			}
			}
			}
			catch (Exception ex)
			{
			respone.Success = false;
			respone.Msg = ex.Message;
			WriteWMSLog.LogAdd(requestTask.TASK_NO, "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Msg);
			}

			}
			}
			}