瀏覽代碼

fix PJ/CJ complete事件未上报

jiangjy 6 天之前
父節點
當前提交
627461a094
共有 2 個文件被更改,包括 7 次插入0 次删除
  1. 5 0
      Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs
  2. 2 0
      Furnace/FurnaceUI/Config/Menu.xml

+ 5 - 0
Furnace/FurnaceRT/Equipments/Jobs/AutoTransfer.cs

@@ -1137,6 +1137,11 @@ namespace FurnaceRT.Equipments.Jobs
                 }
                 }
 
 
                 _lstControlJobs.Remove(cj);
                 _lstControlJobs.Remove(cj);
+                Singleton<FAJobController>.Instance.CheckPJCompleteByCJID(cj.Name);
+                Task.Delay(2000).ContinueWith(x =>
+                {
+                    Singleton<FAJobController>.Instance.CJComplete(cj.Name);
+                });
             }
             }
         }
         }
 
 

+ 2 - 0
Furnace/FurnaceUI/Config/Menu.xml

@@ -4,6 +4,8 @@
 	<menuItem id="status"				resKey="Status" >
 	<menuItem id="status"				resKey="Status" >
 		<menuItem  id="main"			resKey="Main"				viewmodel="FurnaceUI.Views.Operations.StatusViewModel,FurnaceUI" />
 		<menuItem  id="main"			resKey="Main"				viewmodel="FurnaceUI.Views.Operations.StatusViewModel,FurnaceUI" />
 		<menuItem  id="job"				resKey="Job"				viewmodel="FurnaceUI.Views.Status.ControlJobStatusViewModel,FurnaceUI" />
 		<menuItem  id="job"				resKey="Job"				viewmodel="FurnaceUI.Views.Status.ControlJobStatusViewModel,FurnaceUI" />
+
+		<menuItem id="FAJob"		resKey="FAJob"		viewmodel="MECF.Framework.UI.Client.CenterViews.Operations.MonitorJobViewModel,MECF.Framework.UI.Client" />
 		<menuItem  id="temp"			resKey="Temp"				viewmodel="FurnaceUI.Views.Operations.TemperatureViewModel,FurnaceUI" />
 		<menuItem  id="temp"			resKey="Temp"				viewmodel="FurnaceUI.Views.Operations.TemperatureViewModel,FurnaceUI" />
 		<menuItem  id="Pressure"		resKey="Pressure"			viewmodel="FurnaceUI.Views.Operations.PressureDetailViewModel,FurnaceUI" />
 		<menuItem  id="Pressure"		resKey="Pressure"			viewmodel="FurnaceUI.Views.Operations.PressureDetailViewModel,FurnaceUI" />
 		<menuItem  id="TransferMain"	resKey="Transfer Main"		viewmodel="FurnaceUI.Views.Operations.SelfCheckViewModel,FurnaceUI" />
 		<menuItem  id="TransferMain"	resKey="Transfer Main"		viewmodel="FurnaceUI.Views.Operations.SelfCheckViewModel,FurnaceUI" />