RuiShengZhiNeng/NanNingBYD.git

			@@ -4,10 +4,14 @@
			using System.Collections.Generic;
			using System.Diagnostics.CodeAnalysis;
			using System.Linq;
			using System.Security.Policy;
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common.Http;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.Enums;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;
			@@ -21,7 +25,7 @@
			namespace WIDESEAWCS_Tasks
			{
			[DisallowConcurrentExecution]
			public class CommonStackerCraneJob : IJob
			public class CommonStackerCraneJob :JobBase, IJob
			{
			private readonly ITaskService _taskService;
			private readonly ITaskExecuteDetailService _taskExecuteDetailService;
			@@ -35,49 +39,71 @@
			_taskRepository = taskRepository;
			_routerService = routerService;
			}

			public string url = AppSettings.Configuration["WMS"];
			public Task Execute(IJobExecutionContext context)
			{
			CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
			try
			{

			CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
			//CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
			if (commonStackerCrane != null)
			{
			if (!commonStackerCrane.IsEventSubscribed)
			{
			commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//è®¢éä»»å¡å®æäºä»¶
			}
			//if (!commonStackerCrane.IsEventSubscribed)
			//{
			// commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//è®¢éä»»å¡å®æäºä»¶
			//}

			if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal)
			{
			commonStackerCrane.CheckStackerCraneTaskCompleted();//é²æ¢ä»»å¡å®æäºä»¶çæµè¶æ¶ï¼åæå¨è§¦åä¸æ¬¡
			//commonStackerCrane.CheckStackerCraneTaskCompleted();//é²æ¢ä»»å¡å®æäºä»¶çæµè¶æ¶ï¼åæå¨è§¦åä¸æ¬¡

			if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"å åæºå¼å§æ§è¡ï¼è·åä»»å¡å·");
			Dt_Task? task = GetTask(commonStackerCrane);
			if (task != null)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"å åæºå¼å§æ§è¡ï¼ä»»å¡å·ï¼{task.TaskNum}");
			StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
			int isIn = commonStackerCrane.Communicator.Read<byte>("DB106.12.0");
			if(task.TaskType == (int)TaskOutboundTypeEnum.Outbound&&isIn==1)//å¦æå¨å¥åºä¸ï¼ä¸åè®¡ä¸ååºåºä»»å¡
			if((task.TaskType == (int)TaskOutboundTypeEnum.Outbound\|\| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) &&isIn==1)//å¦æå¨å¥åºä¸ï¼ä¸åè®¡ä¸ååºåºä»»å¡
			{
			return Task.CompletedTask;
			WriteDebug(nameof(CommonStackerCraneJob), $"åºåºæ ¡éªï¼å¨å¥åºä¸ï¼ä¸åè®¡ä¸ååºåºç±»åä»»å¡ï¼ä»»å¡å·ï¼{task.TaskNum}");
			return Task.CompletedTask;
			}
			if (stackerCraneTaskCommand != null)
			{
			bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
			if (sendFlag)
			{
			if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
			if (task.TaskType == (int)TaskInboundTypeEnum.Inbound\|\| task.TaskType == (int)TaskInboundTypeEnum.InInventory\|\|task.TaskType==(int)TaskInboundTypeEnum.InPick)
			{
			_taskService.UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InExecuting);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºå¥åºæ§è¡ä¸");
			WriteDebug(nameof(CommonStackerCraneJob), $"WCSå åæºå¥åºæ§è¡ä¸ï¼å¼å§ååWMSä»»å¡ç¶æï¼ä»»å¡å·ï¼{task.TaskNum}");
			var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "æ´æ°ä»»å¡ç¶æ");
			if(response.Status==true)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"WCSå åæºå¥åºæ§è¡ä¸ï¼ååWMSä»»å¡ç¶ææåï¼ä»»å¡å·ï¼{task.TaskNum}");
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"WCSå åæºå¥åºæ§è¡ä¸ï¼ååWMSä»»å¡ç¶æå¤±è´¥ï¼ä»»å¡å·ï¼{task.TaskNum}ï¼å¤±è´¥åå {response.Message}");
			}
			}
			else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound\|\| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
			{
			_taskService.UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutExecuting);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºåºåºæ§è¡ä¸");
			var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "æ´æ°ä»»å¡ç¶æ");
			if (response.Status == true)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"WCSå åæºå¥åºæ§è¡ä¸ï¼ååWMSä»»å¡ç¶ææåï¼ä»»å¡å·ï¼{task.TaskNum}");
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"WCSå åæºå¥åºæ§è¡ä¸ï¼ååWMSä»»å¡ç¶æå¤±è´¥ï¼ä»»å¡å·ï¼{task.TaskNum}ï¼å¤±è´¥åå {response.Message}");
			}
			}
			}
			}
			@@ -88,8 +114,40 @@
			}
			catch (Exception ex)
			{
			Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
			WriteDebug(nameof(CommonStackerCraneJob), $"å åæºæ§è¡å¼å¸¸ï¼{ex.Message}");
			}

			try
			{
			if (commonStackerCrane != null)
			{
			//è¯»åå¤§å åæºä»»å¡å·åä»»å¡å®æç¡®è®¤ç¶æï¼å ä¸ºå°è£çäºä»¶ç»å¸¸ä¸è§¦åï¼æä»¥å ä¸ªç´æ¥è¯»çé»è¾ï¼ä»¥ååºç°å åæºä¸ç´æ¥å¤äºçå¾wcsç¡®è®¤ï¼
			byte IsOver = commonStackerCrane.Communicator.Read<byte>("DB106.22");
			int tasknum = commonStackerCrane.Communicator.Read<int>("DB106.18");
			//WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºSC01ä»»å¡å·å åæºä»»å¡å·ï¼{tasknum}ç¶æï¼{IsOver}");
			if (IsOver == 6)
			{
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			{
			_taskService.StackCraneTaskCompleted(tasknum);
			WriteDebug(nameof(CommonStackerCraneJob), $"å åæºWCSä»»å¡æ§è¡å®æï¼ä»»å¡å·ï¼{tasknum}");
			Console.Out.WriteLine("TaskCompleted" + tasknum);
			bool issuccess = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			if (issuccess)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"å åæºä»»å¡å·ï¼{tasknum},å åæºåå5æå");

			}
			}
			}
			}
			}
			catch(Exception ex)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"å åæºä»»å¡å®æå¼å¸¸ï¼{ex.Message}");
			}


			return Task.CompletedTask;
			}

			@@ -120,7 +178,7 @@
			private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
			{
			Dt_Task task;
			task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
			task = _taskService.QueryStackerCraneTask("R01");
			return task;
			}

			@@ -168,7 +226,15 @@
			stackerCraneTaskCommand.Barcode = task.PalletCode;
			stackerCraneTaskCommand.TaskNum = task.TaskNum;
			stackerCraneTaskCommand.WorkType = 1;
			stackerCraneTaskCommand.TrayType = 1;
			if(task.PalletCode.Substring(0,1)=="B")
			{
			stackerCraneTaskCommand.TrayType = 2;
			}
			else
			{
			stackerCraneTaskCommand.TrayType = 1;
			}
			//stackerCraneTaskCommand.TrayType = 1;
			string[] SourceCodes = task.SourceAddress.Split("-");
			if (SourceCodes.Length == 4)
			{