MeiRuiAn/HuaiAn.git

			@@ -14,7 +14,17 @@
			{
			public partial class TaskService
			{
			public void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "")
			/// <summary>
			/// æ´æ°ä»»å¡ä¿¡æ¯åæ·»å ä»»å¡æç»è®°å½
			/// </summary>
			/// <param name="task">ä»»å¡åå¯¹è±¡å®ä¾(æªä¿®æ¹çæ°æ®å¯¹è±¡)</param>
			/// <param name="taskStatus">ä¿®æ¹åçä»»å¡ç¶æ</param>
			/// <param name="deviceCode">ä¿®æ¹åçè®¾å¤ç¼å·</param>
			/// <param name="sourceAddress">ä¿®æ¹åçèµ·å§å°å</param>
			/// <param name="targetAddress">ä¿®æ¹åçç®æ å°å</param>
			/// <param name="currentAddress">ä¿®æ¹åçå½åå°å</param>
			/// <param name="nextAddress">ä¿®æ¹åçä¸ä¸å°å</param>
			public void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = "", int heightType = 0)
			{
			StringBuilder stringBuilder = new StringBuilder(App.User?.UserId == 0 ? $"ç³»ç»èªå¨æµç¨" : "äººå·¥æå¨æµç¨");
			if (task.DeviceCode != deviceCode && !string.IsNullOrEmpty(deviceCode))
			@@ -41,6 +51,15 @@
			{
			stringBuilder.Append($",ä¸ä¸ä½ç½®ç±{task.NextAddress}åæ´ä¸º{nextAddress}");
			task.NextAddress = nextAddress;
			}
			if (task.Roadway != roadwayNo && !string.IsNullOrEmpty(roadwayNo))
			{
			stringBuilder.Append($",å··éå·ç±{task.Roadway}åæ´ä¸º{roadwayNo}");
			task.Roadway = roadwayNo;
			}
			if (heightType!=0)
			{
			task.HeightType= heightType;
			}
			if (task.TaskState != taskStatus.ObjToInt())
			{
			@@ -80,8 +99,12 @@

			BaseDal.UpdateData(task);

			string address = AppSettings.Get("WMSApiAddress");
			if (!string.IsNullOrEmpty(address))
			{
			HttpHelper.Post($"{address}/api/Task/UpdateTaskInfo", task.Serialize());
			}
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, stringBuilder.ToString());

			}
			}
			}