RuiShengZhiNeng/AoTanSiWCS.git

			@@ -82,12 +82,6 @@
			CommonRGV commonRGV = (CommonRGV)context.JobDetail.JobDataMap.Get("JobParams");
			if (commonRGV != null)
			{
			//if (!commonRGV.IsEventSubscribed)
			//{
			// commonRGV.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//è®¢éä»»å¡å®æäºä»¶
			//}

			//commonRGV.CheckStackerCraneTaskCompleted();//é²æ¢ä»»å¡å®æäºä»¶çæµè¶æ¶ï¼åæå¨è§¦åä¸æ¬¡
			if (commonRGV.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.WorkCompleted))
			{
			var x = commonRGV.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum);
			@@ -122,20 +116,32 @@
			}
			var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
			var userIds = tokenInfos?.Select(x => x.UserId).ToList();

			string RGVAutoStatus(bool AutoStatus) => AutoStatus switch
			{
			true => "èæºæ¨¡å¼",
			false => "åæºæ¨¡å¼",
			};
			string RGVWorkStatus(bool WorkStatus) => WorkStatus switch
			{
			true => "è¿è¡ä¸",
			false => "å¾æº",
			};
			string RGVStatus(bool Status) => Status switch
			{
			true => "æé",
			false => "æ£å¸¸",
			};
			object obj = new
			{
			Automatic = commonRGV.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic),
			Fault = commonRGV.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault),
			Running = commonRGV.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running),
			//commonRGV.StackerCraneAutoStatusDes,
			//commonRGV.StackerCraneWorkStatusDes,
			//commonRGV.DeviceCode,
			//commonRGV.DeviceName,
			//commonRGV.CurrentTaskNum,
			//commonRGV.LastTaskNum,
			Automatic = RGVAutoStatus(commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)),
			Fault = RGVStatus(commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Fault)),
			Running = RGVWorkStatus(commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Running)),
			LevelPoint = commonRGV.GetValue<RGVDBName, int>(RGVDBName.LevelPoint),
			CurrentTaskNum = commonRGV.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum),
			commonRGV.DeviceCode,
			commonRGV.DeviceName,
			};
			_noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { commonRGV.DeviceName, data = obj });
			_noticeService.RGVData(userIds?.FirstOrDefault(), userTokenIds, new { commonRGV.DeviceName, data = obj });

			#endregion è°ç¨äºä»¶æ»çº¿éç¥åç«¯
			}
			@@ -146,30 +152,12 @@
			}
			return Task.CompletedTask;
			}
			/// <summary>
			/// ä»»å¡å®æäºä»¶è®¢éçæ¹æ³
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e)
			{
			CommonRGV? commonRGV = sender as CommonRGV;

			}


			public void RGVTaskFinish(CommonRGV commonRGV, int TaskNum)
			{
			if (commonRGV != null)
			{
			#region æ¥å¿è®°å½
			ConsoleHelper.WriteColorLine($"ã{commonRGV.DeviceName}ãå åæºä½ä¸ç¶æï¼ããæ¶é´ã{DateTime.Now}ã", ConsoleColor.Magenta);

			string str = $"ã{commonRGV.DeviceName}ãä»»å¡å®æ,ä»»å¡å·ï¼ã{TaskNum}ãæ¶é´ã{DateTime.Now}ã";
			WriteInfo(commonRGV.DeviceName, str);
			ConsoleHelper.WriteColorLine(str, ConsoleColor.Blue);

			#endregion

			var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
			if (task != null)
			{
			@@ -183,9 +171,10 @@
			{
			CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
			Thread.Sleep(100);

			var Barcode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.ConveyorLineBarcode, stationManager.stationChildCode);

			if (Barcode == null)
			if (Barcode == null\|\|Barcode=="")
			{
			return;
			}
			@@ -195,6 +184,25 @@
			}
			else
			{
			if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutExecuting)
			{
			Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress && x.stationType == 7);
			if (stationManager != null)
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManager.stationPLC);
			if (device != null)
			{
			CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
			Thread.Sleep(100);
			var Barcode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.ConveyorLineBarcode, stationManager.stationChildCode);
			conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, Convert.ToInt16(stationManager.stationNextChildCode), stationManager.stationChildCode);
			Thread.Sleep(100);
			conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTaskNum, Convert.ToInt16(1000), stationManager.stationChildCode);
			Thread.Sleep(100);
			conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(2), stationManager.stationChildCode);
			}
			}
			}
			var content = _taskService.RGVTaskCompleted(TaskNum);
			}
			}