ZhiHuiQiCe/GuoDianLiKu.git

			@@ -53,15 +53,15 @@

			public Task Execute(IJobExecutionContext context)
			{
			//WriteDebug("å¤§å åæºè¿è¡æ¥å¿", "å¼å§æ¶é´" + DateTime.Now);
			Console.WriteLine("å½åçº¿ç¨æ°"+ThreadPool.ThreadCount);

			WriteDebug("çº¿ç¨ç»è®¡æ¥å¿", "çº¿ç¨æ°" + ThreadPool.ThreadCount);
			//CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
			CommonStackerCrane commonStackerCrane = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC01") as CommonStackerCrane;
			try
			{
			if (commonStackerCrane != null)
			{
			WriteDebug("å¤§å åæºè¿è¡æ¥å¿", $"å¤§å åæºä»»å¡æ§è¡ä¸...");
			//WriteDebug("å¤§å åæºè¿è¡æ¥å¿", $"å¤§å åæºä»»å¡æ§è¡ä¸...");
			//if (!commonStackerCrane.IsEventSubscribed)
			//{
			// commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//è®¢éä»»å¡å®æäºä»¶
			@@ -69,7 +69,7 @@

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

			if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
			{
			@@ -77,7 +77,7 @@
			if (task != null)
			{

			WriteDebug("å¤§å åæºè¿è¡æ¥å¿", $"å¤§å åæºä»»å¡å·{task.TaskNum}");
			WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºä»»å¡å·{task.TaskNum}");
			StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
			if (stackerCraneTaskCommand != null)
			{
			@@ -128,9 +128,7 @@
			}



			//Task.Run(delegate
			//{

			try
			{
			if (commonStackerCrane != null)
			@@ -138,7 +136,7 @@
			//è¯»åå¤§å åæºä»»å¡å·åä»»å¡å®æç¡®è®¤ç¶æï¼å ä¸ºå°è£çäºä»¶ç»å¸¸ä¸è§¦åï¼æä»¥å ä¸ªç´æ¥è¯»çé»è¾ï¼ä»¥ååºç°å åæºä¸ç´æ¥å¤äºçå¾wcsç¡®è®¤ï¼
			byte IsOver = commonStackerCrane.Communicator.Read<byte>("DB106.22");
			int tasknum = commonStackerCrane.Communicator.Read<int>("DB106.18");
			//WriteDebug(nameof(CommonStackerCraneJob), $"è¯»åå¤§å åæºSC01ä»»å¡å®æä¿¡å·å¼:{IsOver} ä»»å¡å·ï¼{tasknum}");
			WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºSC01ä»»å¡å·å åæºä»»å¡å·ï¼{tasknum}ç¶æï¼{IsOver}");
			if (IsOver == 6)
			{
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			@@ -146,17 +144,38 @@
			_taskService.StackCraneTaskCompleted(tasknum);
			Console.Out.WriteLine("TaskCompleted" + tasknum);
			bool issuccess = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			if (issuccess)
			if(issuccess)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºSC01ä»»å¡å·åå¥ä»»å¡å®æç¡®è®¤å¼5æå{tasknum}");
			WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºSC01ä»»å¡å·å åæºä»»å¡å·ï¼{tasknum},åå5æå");
			//æ¥è¯¢å½åä»»å¡å·ï¼æ¯ä¸æ¯åºåºï¼æ£å¸¸åºä½-->æåä½ï¼
			Dt_Task tasktemp = _taskService.QueryStackerCraneTaskByRelotion(tasknum);
			if (tasktemp != null&&!string.IsNullOrEmpty(tasktemp.Remark.Trim()))
			{
			//æ ¹æ®ä»»å¡ç®æ å°åç¡®å®åå¥PLCä½ç½® Depth
			Dt_LocationInfo location = _locationInfoRepository.QueryFirst(x => x.LocationCode == tasktemp.TargetAddress);
			if (commonStackerCrane != null && location != null)
			{
			bool issuccess2 = commonStackerCrane.Communicator.Write<short>("DB28." + location.Depth + ".0", 9);
			if (issuccess2)
			{
			ServiceLogger.WriteDebug("TaskService", $"åæåºåºååå¥æ è¯æåï¼");
			}
			else
			{
			ServiceLogger.WriteDebug("TaskService", $"åæåºåºååå¥æ è¯å¤±è´¥ï¼");
			}
			}
			}
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºSC01ä»»å¡å·åå¥ä»»å¡å®æç¡®è®¤å¼5å¤±è´¥{tasknum}");
			WriteDebug(nameof(CommonStackerCraneJob), $"å¤§å åæºSC01ä»»å¡å·å åæºä»»å¡å·ï¼{tasknum},åå5å¤±è´¥");
			}

			}
			}



			//æåæºäº¤äº
			Dt_Task? task1001 = _taskService.QueryStackerCraneTaskByAGVRequest("SC01");
			@@ -176,18 +195,6 @@
			{
			MESSendCMD sendcmd = new MESSendCMD { cmd = 2001, task_id = task1001.TaskNum, status = 6 };
			MESResponse res = ApiInvoke.SendTaskCMD(sendcmd);
			if (res != null && res.code != 0)
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"åè®¡AGVè¿å¥æåæºï¼åä¼ WMSå¤±è´¥ï¼ä»»å¡å·{task1001.TaskNum}");
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"åè®¡AGVè¿å¥æåæºï¼åä¼ WMSæåï¼ä»»å¡å·{task1001.TaskNum}");
			}
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"æªè¯»åå°æåæºåè®¡è¿å¥ä¿¡å·ï¼æä¸åè®¡AGVè¿å¥æåæºï¼ä»»å¡å·{task1001.TaskNum}");
			}
			}
			Dt_Task? task3001 = _taskService.QueryStackerCraneTaskByAGVPutFinish("SC01");
			@@ -208,10 +215,7 @@
			{
			commonStackerCrane.Communicator.Write<short>("DB1.0.0", 1);
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"æªåå¥æåä¿¡å·ï¼å¯è½æ¯å·²åå¥æèæåæºæªå¤çå°±ç»ªç¶æ,ä»»å¡å·ï¼{task3001.TaskNum}");
			}

			//è¯»åæåæºä¿¡å·ï¼ç¡®å®æ¯å¦æåå®æ

			IsFinish = commonStackerCrane.Communicator.Read<short>("DB2.2.0");
			@@ -228,10 +232,7 @@
			{
			commonStackerCrane.Communicator.Write<short>("DB1.6.0", 1);
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"æªåå¥æåä¿¡å·ï¼å¯è½æ¯ä¿¡å·å·²åå¥æèæåæºæªå¤çå°±ç»ªç¶æï¼ä»»å¡å·ï¼{task3001.TaskNum}");
			}

			//è¯»åæåæºä¿¡å·ï¼ç¡®å®æ¯å¦æåå®æ
			IsFinish = commonStackerCrane.Communicator.Read<short>("DB2.10.0");
			}
			@@ -247,10 +248,7 @@
			WriteDebug(nameof(CommonStackerCraneJob), $"æåæºæåå®æï¼åä¼ WMSå¤±è´¥ï¼ä»»å¡å·{task3001.TaskNum}");
			}
			}
			else
			{
			WriteDebug(nameof(CommonStackerCraneJob), $"æåæºæåä¸...ï¼ä»»å¡å·ï¼{task3001.TaskNum}");
			}

			}

			//å°å åæºåºåºå®æä»»å¡
			@@ -334,10 +332,8 @@
			}
			catch (Exception ex)
			{
			WriteError(nameof(CommonStackerCraneJob), "æ¥è¯¢æåå¥PLCç¶æå¤±è´¥ï¼", ex);
			WriteError(nameof(CommonStackerCraneJob), "æ§è¡å¼å¸¸ï¼", ex);
			}
			// WriteDebug("å¤§å åæºè¿è¡æ¥å¿", "ç»ææ¶é´" + DateTime.Now);
			//});
			return Task.CompletedTask;
			}