RuiShengZhiNeng/NanNingBYD.git

			@@ -29,6 +29,7 @@
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common.Http;
			using WIDESEAWCS_Common.ServiceLog;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseRepository;
			@@ -95,28 +96,31 @@
			}
			Dt_Task task = _mapper.Map<Dt_Task>(item);
			task.Creater = "WMS";
			//ç©ºè½¦å¥åº
			if (item.TaskType == (int)TaskInboundTypeEnum.InInventory)
			{
			task.TaskType= (int)TaskInboundTypeEnum.InInventory;
			task.TaskState= (int)TaskInStatusEnum.InNew;

			}
			else if(item.TaskType==(int)TaskOutboundTypeEnum.OutInventory)
			if(item.TaskType==(int)TaskOutboundTypeEnum.OutInventory)
			{
			task.TaskType=(int)TaskOutboundTypeEnum.OutInventory;
			task.TaskState=(int)TaskOutStatusEnum.OutNew;

			}
			else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			}
			else if (item.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			task.TaskType = (int)TaskInboundTypeEnum.Inbound;
			task.TaskState = (int)TaskInStatusEnum.InNew;
			}
			else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			else if (item.TaskType == (int)TaskInboundTypeEnum.InInventory)
			{
			task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			task.TaskType = (int)TaskInboundTypeEnum.InInventory;
			task.TaskState = (int)TaskInStatusEnum.InNew;
			}
			else if (item.TaskType == (int)TaskInboundTypeEnum.InPick)
			{
			task.TaskType = (int)TaskInboundTypeEnum.InPick;
			task.TaskState = (int)TaskInStatusEnum.InNew;
			}
			tasks.Add(task);
			}
			@@ -477,6 +481,16 @@
			_unitOfWorkManage.BeginTran();
			UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºå®æ");
			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æå,ä»»å¡å·:ã{taskNum}ã");
			}
			else
			{
			ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"å åæºåºåºå®æç¶æååWMSå¤±è´¥,ä»»å¡å·:ã{taskNum}ã");
			}
			_unitOfWorkManage.CommitTran();
			return content.OK();
			}
			@@ -489,27 +503,41 @@


			}
			else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound \|\| task.TaskType == (int)TaskInboundTypeEnum.InInventory)
			else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound \|\| task.TaskType == (int)TaskInboundTypeEnum.InInventory \|\| task.TaskType == (int)TaskInboundTypeEnum.InPick)
			{
			_unitOfWorkManage.BeginTran();
			UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InFinish);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºå¥åºå®æ");
			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æå,ä»»å¡å·:ã{taskNum}ã");

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