瀏覽代碼

update process 状态下 run idle recipe

git-svn-id: http://10.4.3.168:50001/svn/Furnace@61 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Jiangjinyuan 1 月之前
父節點
當前提交
58e1b9c5e8

+ 1 - 0
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -424,6 +424,7 @@ namespace FurnaceRT.Equipments.PMs
             OP.Subscribe($"{Name}.RecipePause", (string cmd, object[] args) => CheckToPostMessage((int)MSG.RecipePause));
             OP.Subscribe($"{Name}.RecipeContinue", (string cmd, object[] args) => CheckToPostMessage((int)MSG.RecipeContinue));
             OP.Subscribe($"{Name}.RecipeAbort", (string cmd, object[] args) => CheckToPostMessage((int)MSG.RecipeAbort));
+            OP.Subscribe($"{Name}.RecipeIdle", (string cmd, object[] args) => CheckToPostMessage((int)MSG.RunIdleRecipe));
 
             OP.Subscribe($"{Name}.LeakCheck", (string cmd, object[] args) => CheckToPostMessage((int)MSG.LeakCheck, args[0], args[1], args[2], args[3]));
             OP.Subscribe($"{Name}.Wait", (string cmd, object[] args) =>

+ 1 - 0
Furnace/FurnaceRT/Equipments/PMs/RecipeExecutions/Process.cs

@@ -1134,6 +1134,7 @@ namespace FurnaceRT.Equipments.PMs.RecipeExecutions
         {
             if (_state == RecipeRunningState.RecipeCompleted)
             {
+                PMModule.StringProcessFlowState= PMModule.ProcessFlowState.Standby.ToString();
                 _faCallback.RecipeComplete(PMModule.Module, PMModule.RecipeRunningInfo.RecipeName);
                 _dbCallback.RecipeComplete(PMModule.RecipeRunningInfo.InnerId.ToString());
                 _fdc.Stop();

+ 42 - 3
Furnace/FurnaceUI/Views/Status/ControlJobStatusView.xaml

@@ -23,6 +23,14 @@
             <Setter Property="HorizontalContentAlignment" Value="Center"/>
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
+        <Style x:Key="LableNew" TargetType="Label" BasedOn="{StaticResource TopLable}">
+            <Setter Property="Background" Value="{DynamicResource FirstLevelElement_BG}"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="BorderBrush" Value="Black"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        </Style>
         <converter:StatusForegroundConverter x:Key="StatusForegroundConverter" />
         <SolidColorBrush x:Key="N2_purge_bg" Color="#B1D2F2"/>
         <SolidColorBrush x:Key="N2_purge_Idlebg" Color="#E4E487"/>
@@ -132,20 +140,51 @@
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
                     </Button>
-                    <Label Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="311">
+                    <Label   Width="130" Height="45" Canvas.Left="312" Canvas.Top="311">
                         <Label.Content>
                             <TextBlock Text="STANDBY" TextAlignment="Center" TextWrapping="Wrap"  />
                         </Label.Content>
+                        <Label.Style>
+                            <Style TargetType="Label"  BasedOn="{StaticResource LableNew}">
+                                <Setter Property="Background" Value="#ccc"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ProcessFlowStatus,UpdateSourceTrigger=PropertyChanged}" Value="Standby">
+                                        <Setter Property="Background" Value="LimeGreen"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Label.Style>
                     </Label>
-                    <Label Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="401">
+                    <Label   Width="130" Height="45" Canvas.Left="312" Canvas.Top="401">
                         <Label.Content>
                             <TextBlock Text="RUN" TextAlignment="Center" TextWrapping="Wrap"  />
                         </Label.Content>
+                        <Label.Style>
+                            <Style TargetType="Label"  BasedOn="{StaticResource LableNew}">
+                                <Setter Property="Background" Value="#ccc"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ProcessFlowStatus,UpdateSourceTrigger=PropertyChanged}" Value="Run">
+                                        <Setter Property="Background" Value="LimeGreen"/>
+                                    </DataTrigger>
+                             
+                                </Style.Triggers>
+                            </Style>
+                        </Label.Style>
                     </Label>
-                    <Label Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="491">
+                    <Label  Width="130" Height="45" Canvas.Left="312" Canvas.Top="491">
                         <Label.Content>
                             <TextBlock Text="END" TextAlignment="Center" TextWrapping="Wrap"  />
                         </Label.Content>
+                        <Label.Style>
+                            <Style TargetType="Label"  BasedOn="{StaticResource LableNew}"> 
+                                <Setter Property="Background" Value="#ccc"/>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ProcessFlowStatus,UpdateSourceTrigger=PropertyChanged}" Value="End">
+                                        <Setter Property="Background" Value="LimeGreen"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Label.Style>
                     </Label>
                     <Button BorderBrush="Black" Background="Transparent"  Width="130" Height="45" Canvas.Left="100" Canvas.Top="131">
                         <Button.Content>

+ 3 - 2
Furnace/FurnaceUI/Views/Status/ControlJobStatusViewModel.cs

@@ -240,7 +240,8 @@ namespace FurnaceUI.Views.Status
                 return SelectedControlJob.State.ToString() == "Completed" ? "Green" : "Transparent";
             }
         }
-
+        [Subscription("ProcessFlow.Status")]
+        public string ProcessFlowStatus { get; set; }
         public void BtnClick(string cmd)
         {
             switch (cmd)
@@ -255,7 +256,7 @@ namespace FurnaceUI.Views.Status
                     InvokeClient.Instance.Service.DoOperation("System.Reset");
                     break;
                 case "IDLE":
-                    InvokeClient.Instance.Service.DoOperation("System.HomeAll");
+                    InvokeClient.Instance.Service.DoOperation("PM1.RecipeIdle");
                     break;
                 default:
                     break;