MeiRuiAn/HuaiAn.git

			@@ -24,7 +24,7 @@
			/// <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 = "")
			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))
			@@ -56,6 +56,10 @@
			{
			stringBuilder.Append($",宸烽亾鍙风敱{task.Roadway}鍙樻洿涓簕roadwayNo}");
			task.Roadway = roadwayNo;
			}
			if (heightType!=0)
			{
			task.HeightType= heightType;
			}
			if (task.TaskState != taskStatus.ObjToInt())
			{
			@@ -95,13 +99,12 @@

			BaseDal.UpdateData(task);

			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, stringBuilder.ToString());

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