RuiShengZhiNeng/NanNingBYD.git

			@@ -481,15 +481,15 @@
			_unitOfWorkManage.BeginTran();
			UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºå®æ");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMS");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMS,ä»»å¡å·:ã{taskNum}ã");
			var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "æ´æ°ä»»å¡ç¶æ");
			if(response.Status)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMSæå");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMSæå,ä»»å¡å·:ã{taskNum}ã");
			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMSå¤±è´¥");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMSå¤±è´¥,ä»»å¡å·:ã{taskNum}ã");
			}
			_unitOfWorkManage.CommitTran();
			return content.OK();
			@@ -508,33 +508,33 @@
			_unitOfWorkManage.BeginTran();
			UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºå¥åºå®æ");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºå¥åºå®æç¶æååWMS");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºå¥åºå®æç¶æååWMS,ä»»å¡å·:ã{taskNum}ã");
			var response= HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "æ´æ°ä»»å¡ç¶æ");
			if(response.Status)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºå¥åºå®æç¶æååWMSæå");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºå¥åºå®æç¶æååWMSæå,ä»»å¡å·:ã{taskNum}ã");

			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºå¥åºå®æç¶æååWMSå¤±è´¥");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºå¥åºå®æç¶æååWMSå¤±è´¥,ä»»å¡å·:ã{taskNum}ã");
			}
			UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.InFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å¥åºä»»å¡å®æ");
			//if (App.User.UserId > 0)
			//{
			task.Modifier = "System";
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¥åºä»»å¡å®æååWMS");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¥åºä»»å¡å®æååWMS,ä»»å¡å·:ã{taskNum}ã");
			var response2 = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + task.TaskNum, "", "ä»»å¡å®æ");
			if (response2.Status)
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¥åºä»»å¡å®æååWMSæå");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¥åºä»»å¡å®æååWMSæå,ä»»å¡å·:ã{taskNum}ã");
			_unitOfWorkManage.CommitTran();
			return content.OK();
			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¥åºä»»å¡å®æååWMSå¤±è´¥");
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å¥åºä»»å¡å®æååWMSå¤±è´¥,ä»»å¡å·:ã{taskNum}ã");
			_unitOfWorkManage.RollbackTran();
			return content = WebResponseContent.Instance.Error(response.Message);
			}
			@@ -594,17 +594,17 @@
			public WebResponseContent OutBoundTaskByWMS(int taskNum)
			{
			WebResponseContent content = new WebResponseContent();
			ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"åºåºä»»å¡å®æååWMS");
			ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"åºåºä»»å¡å®æååWMSï¼ä»»å¡å·ï¼{taskNum}");
			var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + taskNum, "", "ä»»å¡å®æ");
			if (response.Status)
			{
			ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"åºåºä»»å¡å®æååWMSæå");
			ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"åºåºä»»å¡å®æååWMSæåï¼ä»»å¡å·ï¼{taskNum}");
			_unitOfWorkManage.CommitTran();
			return content.OK();
			}
			else
			{
			ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"åºåºä»»å¡å®æååWMSå¤±è´¥");
			ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"åºåºä»»å¡å®æååWMSå¤±è´¥ï¼ä»»å¡å·ï¼{taskNum}");
			_unitOfWorkManage.RollbackTran();
			return content = WebResponseContent.Instance.Error(response.Message);
			}