Browse Source

从AutoCycle获取已经运行job做Pause功能

lixiang 1 year ago
parent
commit
410df462f5

+ 16 - 15
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -554,26 +554,28 @@ namespace Venus_MainPages.ViewModels
         {
             InvokeClient.Instance.Service.DoOperation("System.HomeAll");
         }
-        private void OnPauseAllJob()
-        {
-           
-        }
+
         private void OnResumeAllJob()
         {
+            var t = CommonFunction.GetValue<List<string>>(RtDataValues, "Scheduler.PjNameList");
+            if (t == null && t.Count == 0)
+            {
+                return;
+            }
             if (CommonFunction.GetValue<int>(RtDataValues, "EquipmentStatus") == 4)
             {
-                InvokeClient.Instance.Service.DoOperation("System.ResumeJob", LP1WaferAssociation.JobID);
-                //InvokeClient.Instance.Service.DoOperation("System.ResumeJob", LP2WaferAssociation.JobID);
-                //InvokeClient.Instance.Service.DoOperation("System.ResumeJob", LP3WaferAssociation.JobID);
+                t.ForEach(x => 
+                {
+                    InvokeClient.Instance.Service.DoOperation("System.ResumeJob", x);
+                });               
             }
             else
             {
-                InvokeClient.Instance.Service.DoOperation("System.PauseJob", LP1WaferAssociation.JobID);
-                //InvokeClient.Instance.Service.DoOperation("System.PauseJob", LP2WaferAssociation.JobID);
-                //InvokeClient.Instance.Service.DoOperation("System.PauseJob", LP3WaferAssociation.JobID);
-
+                t.ForEach(x =>
+                {
+                    InvokeClient.Instance.Service.DoOperation("System.PauseJob", x);
+                });
             }
-
         }
         private void OnAbortAll()
         {
@@ -735,8 +737,7 @@ namespace Venus_MainPages.ViewModels
             else
             {
                 RouteState = "Pause";
-            }
-
+            }          
         }
         private async void RobotMoveInfoChanged(RobotMoveInfo oldValue, RobotMoveInfo newValue)
         {
@@ -1172,7 +1173,7 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add("Scheduler.CycleSetPoint");
             m_RtDataKeys.Add("Scheduler.Throughput");
             m_RtDataKeys.Add("EquipmentStatus");
-
+            m_RtDataKeys.Add("Scheduler.PjNameList");          
         }
         private void AssociateSequence(WaferAssociationInfo info, bool flag, int slot = -1)
         {

+ 3 - 2
Venus/Venus_MainPages/Views/MFCVerificationView.xaml

@@ -92,6 +92,7 @@
 
 
         <DataGrid AutoGenerateColumns="False"   CanUserAddRows="False" 
+                  Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}"
                   ItemsSource="{Binding MFCCalibrationTenPointsDataRecords}" 
                   FontFamily="Arial" FontSize="14" Height="260" IsReadOnly="True" Width="1920"   VerticalScrollBarVisibility="Auto" Canvas.Top="50">
             <DataGrid.Columns>
@@ -457,7 +458,7 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <!--<DataGridTemplateColumn  Width="*" Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}">
+                <DataGridTemplateColumn  Width="*" Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}">
                         <DataGridTemplateColumn.HeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -578,7 +579,7 @@
                                 </Grid>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>-->
+                    </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
 

+ 3 - 0
Venus/Venus_RT/Modules/AutoCycle.cs

@@ -171,6 +171,9 @@ namespace Venus_RT.Modules
 
 
             DATA.Subscribe("Scheduler.PjIdList", () => Array.ConvertAll(_lstProcessJobs.ToArray(), x => x.InnerId.ToString()).ToList());
+
+            DATA.Subscribe("Scheduler.PjNameList", () => Array.ConvertAll(_lstProcessJobs.ToArray(), x => x.LotName.ToString()).ToList());
+
         }
 
         public RState Start(params object[] objs)