Merge branch 'develop' into feature/bind-interlock-manager-to-module
This commit is contained in:
SIC1016\caipeilun
commit
3bdc347fba
|
|
@ -1,16 +1,8 @@
|
|||
using Aitex.Core.Backend;
|
||||
using Aitex.Core.Common.DeviceData;
|
||||
using Aitex.Core.RT.Device;
|
||||
using Aitex.Core.RT.Event;
|
||||
using Aitex.Core.RT.Event;
|
||||
using Aitex.Core.RT.IOCore;
|
||||
using Aitex.Core.RT.SCCore;
|
||||
using Aitex.Core.Util;
|
||||
using MECF.Framework.Common.SicMath;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Xml;
|
||||
|
||||
namespace Aitex.Core.RT.Device.Devices
|
||||
|
|
@ -18,7 +10,7 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
public class IoGasBoxTemp : BaseDevice, IDevice
|
||||
{
|
||||
//配置中标记的AI名称
|
||||
protected readonly List<string> _aiGasBoxTempName =new List<string>()
|
||||
protected readonly List<string> _aiGasBoxTempName = new List<string>()
|
||||
{
|
||||
"aiHeatTMA",
|
||||
"aiHeatTCSPanel",
|
||||
|
|
@ -38,7 +30,7 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
|
||||
protected readonly R_TRIG _trigIsAlarm = new R_TRIG();
|
||||
|
||||
protected int _alarmCount ;
|
||||
protected int _alarmCount;
|
||||
|
||||
public IoGasBoxTemp(string module, XmlElement node, string ioModule = "") : base(module, node, ioModule)
|
||||
{
|
||||
|
|
@ -49,14 +41,13 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
}
|
||||
|
||||
_doLineHeaterEnable = ParseDoNode("doLineHeaterEnable", node, ioModule);
|
||||
_scNameAlarmHigh = $"PM.{module}.Heater.GasBoxTempHigh";
|
||||
|
||||
|
||||
_scNameAlarmHigh = $"PM.{module}.Heater.{node.GetAttribute("scItemName")}";
|
||||
}
|
||||
|
||||
protected override void HandleMonitor()
|
||||
{
|
||||
string alarmMeg ="";
|
||||
string alarmMeg = "";
|
||||
foreach (var ai in _aiGasBoxTemp)
|
||||
{
|
||||
if (ai is not null && ai.FloatValue >= _alarmHigh)
|
||||
|
|
@ -65,7 +56,7 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
if (_alarmCount != alarmMeg.Length)// 报警数量发生变化才复位trig，防止未复位时产生新的报警不提示问题
|
||||
_trigIsAlarm.RST = true;
|
||||
|
||||
if (alarmMeg.Length > 0 )//有报警
|
||||
if (alarmMeg.Length > 0)//有报警
|
||||
{
|
||||
_trigIsAlarm.CLK = true;
|
||||
if (_trigIsAlarm.Q)
|
||||
|
|
@ -73,10 +64,8 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
_doLineHeaterEnable?.SetValue(false, out _);
|
||||
EV.PostWarningLog(Module, $"{alarmMeg} over temperature {_alarmHigh}\r\n{Module}.{_doLineHeaterEnable.Name} force off");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
_alarmCount = alarmMeg.Length;
|
||||
}
|
||||
|
||||
|
|
@ -85,7 +74,6 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
_alarmHigh = SC.SafeGetValue(_scNameAlarmHigh, double.PositiveInfinity);
|
||||
SC.RegisterValueChangedCallback(_scNameAlarmHigh, v => _alarmHigh = (double)v);
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -96,7 +84,6 @@ namespace Aitex.Core.RT.Device.Devices
|
|||
|
||||
public void Terminate()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,22 +3,22 @@
|
|||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
|
||||
xmlns:controls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Controls"
|
||||
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:dgExtension1="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension"
|
||||
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:micro="clr-namespace:Caliburn.Micro"
|
||||
xmlns:dgExtension1="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension"
|
||||
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
|
||||
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
|
||||
xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core"
|
||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||
xmlns:controls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Controls"
|
||||
d:Background="#91b0cd"
|
||||
d:DesignHeight="750"
|
||||
d:DesignWidth="1920"
|
||||
d:Background="#91b0cd"
|
||||
mc:Ignorable="d">
|
||||
<UserControl.Resources>
|
||||
<cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
|
||||
<cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter" />
|
||||
<HierarchicalDataTemplate x:Key="FolderTemplate" ItemsSource="{Binding Files}">
|
||||
<StackPanel Orientation="Horizontal" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Path=DataContext}">
|
||||
<Image
|
||||
|
|
@ -905,8 +905,8 @@
|
|||
Height="33">
|
||||
<Canvas.Resources>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||
</Style>
|
||||
</Canvas.Resources>
|
||||
<TextBlock
|
||||
|
|
@ -971,7 +971,7 @@
|
|||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding C2H4Color}" Text="{Binding C2H4Mol,StringFormat=F4}" />
|
||||
<TextBlock Foreground="{Binding C2H4Color}" Text="{Binding C2H4Mol, StringFormat=F4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Top="198"
|
||||
|
|
@ -980,7 +980,7 @@
|
|||
Background="Cyan"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="C2H4" Foreground="{Binding C2H4Color}"/>
|
||||
<TextBlock Foreground="{Binding C2H4Color}" Text="C2H4" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="75"
|
||||
|
|
@ -1029,8 +1029,8 @@
|
|||
Height="26"
|
||||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1" >
|
||||
<TextBlock Foreground="{Binding SIH4Color}" Text="{Binding SIH4Mol,StringFormat=N4}" />
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding SIH4Color}" Text="{Binding SIH4Mol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Top="223"
|
||||
|
|
@ -1039,7 +1039,7 @@
|
|||
Background="Cyan"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="SiH4" Foreground="{Binding SIH4Color}"/>
|
||||
<TextBlock Foreground="{Binding SIH4Color}" Text="SiH4" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="75"
|
||||
|
|
@ -1088,8 +1088,8 @@
|
|||
Height="26"
|
||||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1" >
|
||||
<TextBlock Foreground="{Binding HCLColor}" Text="{Binding HCLMol,StringFormat=N4}" />
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding HCLColor}" Text="{Binding HCLMol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Top="247"
|
||||
|
|
@ -1098,7 +1098,7 @@
|
|||
Background="Cyan"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="HCL" Foreground="{Binding HCLColor}"/>
|
||||
<TextBlock Foreground="{Binding HCLColor}" Text="HCL" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="75"
|
||||
|
|
@ -1148,7 +1148,7 @@
|
|||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding PN2Color}" Text="{Binding PN2Mol,StringFormat=N4}" />
|
||||
<TextBlock Foreground="{Binding PN2Color}" Text="{Binding PN2Mol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Top="271"
|
||||
|
|
@ -1156,8 +1156,8 @@
|
|||
Height="26"
|
||||
Background="Cyan"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1" >
|
||||
<TextBlock Text="PN2" Foreground="{Binding PN2Color}"/>
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding PN2Color}" Text="PN2" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="75"
|
||||
|
|
@ -1209,7 +1209,7 @@
|
|||
Background="Gold"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="H2"/>
|
||||
<TextBlock Text="H2" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="476"
|
||||
|
|
@ -1219,7 +1219,7 @@
|
|||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding H2Flow}" Text="{Binding H2Mol,StringFormat=N4}" />
|
||||
<TextBlock Foreground="{Binding H2Flow}" Text="{Binding H2Mol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="326"
|
||||
|
|
@ -1271,7 +1271,7 @@
|
|||
Background="Gold"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="Ar"/>
|
||||
<TextBlock Text="Ar" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="476"
|
||||
|
|
@ -1281,7 +1281,7 @@
|
|||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding ArFlow}" Text="{Binding ArMol,StringFormat=N4}" />
|
||||
<TextBlock Foreground="{Binding ArFlow}" Text="{Binding ArMol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="326"
|
||||
|
|
@ -1332,8 +1332,8 @@
|
|||
Height="26"
|
||||
Background="Gold"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1" >
|
||||
<TextBlock Text="TMA" Foreground="{Binding TMAColor}"/>
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding TMAColor}" Text="TMA" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="476"
|
||||
|
|
@ -1343,7 +1343,7 @@
|
|||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding TMAColor}" Text="{Binding TMAMol,StringFormat=N4}" />
|
||||
<TextBlock Foreground="{Binding TMAColor}" Text="{Binding TMAMol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="326"
|
||||
|
|
@ -1395,7 +1395,7 @@
|
|||
Background="Gold"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Text="TCS" Foreground="{Binding TCSColor}"/>
|
||||
<TextBlock Foreground="{Binding TCSColor}" Text="TCS" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="476"
|
||||
|
|
@ -1405,7 +1405,7 @@
|
|||
Background="LightGray"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="1">
|
||||
<TextBlock Foreground="{Binding TCSColor}" Text="{Binding TCSMol,StringFormat=N4}" />
|
||||
<TextBlock Foreground="{Binding TCSColor}" Text="{Binding TCSMol, StringFormat=N4}" />
|
||||
</Border>
|
||||
<Border
|
||||
Canvas.Left="326"
|
||||
|
|
@ -1478,7 +1478,10 @@
|
|||
</Canvas>
|
||||
</Canvas>
|
||||
|
||||
<Grid Margin="75,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" >
|
||||
<Grid
|
||||
Margin="75,20,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="24" />
|
||||
<RowDefinition Height="32" />
|
||||
|
|
@ -1558,10 +1561,10 @@
|
|||
<Button
|
||||
Width="70"
|
||||
Height="25"
|
||||
micro:Message.Attach="SelectRecipe()"
|
||||
Content="Select"
|
||||
FontSize="13"
|
||||
IsEnabled="{Binding IsSelectButtonEnable}"
|
||||
micro:Message.Attach="SelectRecipe()"/>
|
||||
IsEnabled="{Binding IsSelectButtonEnable}" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
|
|
@ -1822,136 +1825,136 @@
|
|||
</Grid>
|
||||
|
||||
<Grid
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="680 20 0 0"
|
||||
Width="1134"
|
||||
Height="713">
|
||||
Height="713"
|
||||
Margin="680,20,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top">
|
||||
|
||||
|
||||
<TabControl>
|
||||
<TabItem Header="Recipe" IsSelected="True">
|
||||
<Grid>
|
||||
<Grid
|
||||
x:Name="gridRecipe"
|
||||
Margin="5 0"
|
||||
IsEnabled="{Binding IsPermission}">
|
||||
x:Name="gridRecipe"
|
||||
Margin="5,0"
|
||||
IsEnabled="{Binding IsPermission}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="124*"/>
|
||||
<ColumnDefinition Width="435*"/>
|
||||
<ColumnDefinition Width="124*" />
|
||||
<ColumnDefinition Width="435*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.ColumnSpan="2"
|
||||
IsEnabled="{Binding IsRecipeLoading, Converter={StaticResource BoolReverseConverter}}"
|
||||
Orientation="Horizontal">
|
||||
|
||||
IsEnabled="{Binding IsRecipeLoading, Converter={StaticResource BoolReverseConverter}}"
|
||||
Orientation="Horizontal" Grid.ColumnSpan="2">
|
||||
|
||||
<Button x:Name="btnLockRecipe"
|
||||
Content="Lock"
|
||||
Height="30"
|
||||
Width="70"
|
||||
Margin="0 0 10 0"
|
||||
Click="BtnLockRecipe_OnClick"/>
|
||||
|
||||
<!--更新PM正在Run的配方到下表中的配方-->
|
||||
<Button
|
||||
Width="150" Height="30"
|
||||
IsEnabled="{Binding AllowRipRecipe}"
|
||||
Content="Reload In Process"
|
||||
ToolTip="Push the changes to the current process"
|
||||
Margin="0 "
|
||||
micro:Message.Attach="PushRecipeToCurrentProcess()"/>
|
||||
x:Name="btnLockRecipe"
|
||||
Width="70"
|
||||
Height="30"
|
||||
Margin="0,0,10,0"
|
||||
Click="BtnLockRecipe_OnClick"
|
||||
Content="Lock" />
|
||||
|
||||
<!-- 更新PM正在Run的配方到下表中的配方 -->
|
||||
<Button
|
||||
Width="150"
|
||||
Height="30"
|
||||
Margin="0"
|
||||
micro:Message.Attach="PushRecipeToCurrentProcess()"
|
||||
Content="Reload In Process"
|
||||
IsEnabled="{Binding AllowRipRecipe}"
|
||||
ToolTip="Push the changes to the current process" />
|
||||
|
||||
|
||||
<Grid
|
||||
Height="40"
|
||||
Margin="520 0 0 0">
|
||||
<Grid Height="40" Margin="520,0,0,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="140"/>
|
||||
<ColumnDefinition Width="110"/>
|
||||
<ColumnDefinition Width="110"/>
|
||||
<ColumnDefinition Width="140" />
|
||||
<ColumnDefinition Width="110" />
|
||||
<ColumnDefinition Width="110" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border
|
||||
Background="{StaticResource Table_BG_Title}"
|
||||
BorderBrush="{StaticResource Table_BD}"
|
||||
BorderThickness="1 1 0 1"
|
||||
CornerRadius="5 0 0 5">
|
||||
<TextBlock
|
||||
Text="To Baseline Recipe"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Margin="5 0"/>
|
||||
Background="{StaticResource Table_BG_Title}"
|
||||
BorderBrush="{StaticResource Table_BD}"
|
||||
BorderThickness="1,1,0,1"
|
||||
CornerRadius="5 0 0 5">
|
||||
<TextBlock
|
||||
Margin="5,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Text="To Baseline Recipe" />
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Column="1"
|
||||
Background="{StaticResource Table_BG_Content}"
|
||||
BorderBrush="{StaticResource Table_BD}"
|
||||
BorderThickness="1 1 0 1" >
|
||||
<!--重新加载基线配方-->
|
||||
<Border
|
||||
Grid.Column="1"
|
||||
Background="{StaticResource Table_BG_Content}"
|
||||
BorderBrush="{StaticResource Table_BD}"
|
||||
BorderThickness="1,1,0,1">
|
||||
<!-- 重新加载基线配方 -->
|
||||
<Button
|
||||
Height="30"
|
||||
Content="Restore"
|
||||
Margin="5 0"
|
||||
ToolTip="Discard changes and Restore to the baseline recipe"
|
||||
micro:Message.Attach="RestoreToBaselineRecipe()"/>
|
||||
Height="30"
|
||||
Margin="5,0"
|
||||
micro:Message.Attach="RestoreToBaselineRecipe()"
|
||||
Content="Restore"
|
||||
ToolTip="Discard changes and Restore to the baseline recipe" />
|
||||
</Border>
|
||||
|
||||
<Border Grid.Column="2"
|
||||
Background="{StaticResource Table_BG_Content}"
|
||||
BorderBrush="{StaticResource Table_BD}"
|
||||
BorderThickness="1 1 1 1"
|
||||
CornerRadius="0 5 5 0">
|
||||
<!--保存基线配方-->
|
||||
<Border
|
||||
Grid.Column="2"
|
||||
Background="{StaticResource Table_BG_Content}"
|
||||
BorderBrush="{StaticResource Table_BD}"
|
||||
BorderThickness="1,1,1,1"
|
||||
CornerRadius="0 5 5 0">
|
||||
<!-- 保存基线配方 -->
|
||||
<Button
|
||||
Height="30"
|
||||
Content="Save"
|
||||
Margin="5 0"
|
||||
Visibility="{Binding AllowSaveRecipe,
|
||||
Converter={StaticResource BoolVisibilityConverter}}"
|
||||
ToolTip="Save changes to the baseline recipe"
|
||||
micro:Message.Attach="SaveToBaselineRecipe()"/>
|
||||
Height="30"
|
||||
Margin="5,0"
|
||||
micro:Message.Attach="SaveToBaselineRecipe()"
|
||||
Content="Save"
|
||||
ToolTip="Save changes to the baseline recipe"
|
||||
Visibility="{Binding AllowSaveRecipe, Converter={StaticResource BoolVisibilityConverter}}" />
|
||||
</Border>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
|
||||
<dgExtension1:DataGridRecipe
|
||||
Grid.Row="1" x:Name="dgCustom"
|
||||
FrozenColumnCount="6"
|
||||
AllowDragToFill="False"
|
||||
IsEnabled="{Binding IsPermission}"
|
||||
Recipe="{Binding CurrentRecipe, Mode=OneWay}" Grid.ColumnSpan="2"/>
|
||||
x:Name="dgCustom"
|
||||
Grid.Row="1"
|
||||
Grid.ColumnSpan="2"
|
||||
AllowDragToFill="False"
|
||||
FrozenColumnCount="6"
|
||||
IsEnabled="{Binding IsPermission}"
|
||||
Recipe="{Binding CurrentRecipe, Mode=OneWay}" />
|
||||
</Grid>
|
||||
|
||||
<controls:PanelLocker
|
||||
x:Name="recipeLocker"
|
||||
LockTarget="{Binding ElementName=gridRecipe}"
|
||||
Visibility="Collapsed" />
|
||||
x:Name="recipeLocker"
|
||||
LockTarget="{Binding ElementName=gridRecipe}"
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
</TabItem>
|
||||
|
||||
<TabItem Header="Gas Flow Statistic">
|
||||
<Grid Margin="5">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="25"/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="25" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Label
|
||||
Grid.Row="0"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Content="Accumulated Gas Flow Statistic (sccm)"
|
||||
FontSize="12"
|
||||
Style="{DynamicResource Table_TitleStyle}" />
|
||||
Grid.Row="0"
|
||||
HorizontalContentAlignment="Center"
|
||||
VerticalContentAlignment="Center"
|
||||
Content="Accumulated Gas Flow Statistic (sccm)"
|
||||
FontSize="12"
|
||||
Style="{DynamicResource Table_TitleStyle}" />
|
||||
|
||||
<ListView ItemsSource="{Binding ProcessRunDataList}" Grid.Row="1">
|
||||
<ListView.Resources>
|
||||
|
||||
</ListView.Resources>
|
||||
<ListView Grid.Row="1" ItemsSource="{Binding ProcessRunDataList}">
|
||||
<ListView.Resources />
|
||||
|
||||
<ListView.View>
|
||||
<GridView>
|
||||
|
|
@ -1961,17 +1964,20 @@
|
|||
</Style>
|
||||
</GridView.ColumnHeaderContainerStyle>-->
|
||||
|
||||
<GridViewColumn Header="#" DisplayMemberBinding="{Binding Index}" Width="30"/>
|
||||
<GridViewColumn Header="Recipe Name" DisplayMemberBinding="{Binding RecipeName}"/>
|
||||
<GridViewColumn
|
||||
Width="30"
|
||||
DisplayMemberBinding="{Binding Index}"
|
||||
Header="#" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding RecipeName}" Header="Recipe Name" />
|
||||
<!--<GridViewColumn Header="Duration" DisplayMemberBinding="{Binding StatisticsStart, StringFormat='{}{0:MM/dd hh:mm:ss.fff}'}" Width="80"/>-->
|
||||
<GridViewColumn Header="Duration" Width="140">
|
||||
<GridViewColumn Width="140" Header="Duration">
|
||||
<GridViewColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock>
|
||||
<TextBlock.Text>
|
||||
<MultiBinding StringFormat="{}{0:HH:mm:ss} - {1:HH:mm:ss}">
|
||||
<Binding Path="ProcessBegin"/>
|
||||
<Binding Path="ProcessEnd"/>
|
||||
<Binding Path="ProcessBegin" />
|
||||
<Binding Path="ProcessEnd" />
|
||||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
</TextBlock>
|
||||
|
|
@ -1985,32 +1991,32 @@
|
|||
</DataTemplate>
|
||||
</GridViewColumn.CellTemplate>
|
||||
</GridViewColumn>-->
|
||||
<GridViewColumn Header="H2" DisplayMemberBinding="{Binding H2, StringFormat=F1}" />
|
||||
<GridViewColumn Header="Ar" DisplayMemberBinding="{Binding Ar, StringFormat=F1}" />
|
||||
<GridViewColumn Header="PN2" DisplayMemberBinding="{Binding PN2, StringFormat=F1}"/>
|
||||
<GridViewColumn Header="HCL" DisplayMemberBinding="{Binding HCL, StringFormat=F1}" />
|
||||
<GridViewColumn Header="SiH2" DisplayMemberBinding="{Binding SiH4, StringFormat=F1}"/>
|
||||
<GridViewColumn Header="C2H4" DisplayMemberBinding="{Binding C2H4, StringFormat=F1}" />
|
||||
<GridViewColumn Header="TCS" DisplayMemberBinding="{Binding TCS, StringFormat=F1}"/>
|
||||
<GridViewColumn Header="TMA" DisplayMemberBinding="{Binding TMA, StringFormat=F1}"/>
|
||||
<GridViewColumn Header="Power(KWH)" DisplayMemberBinding="{Binding HeaterPowerConsumption, StringFormat=F3}"/>
|
||||
<GridViewColumn DisplayMemberBinding="{Binding H2, StringFormat=F1}" Header="H2" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding Ar, StringFormat=F1}" Header="Ar" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding PN2, StringFormat=F1}" Header="PN2" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding HCL, StringFormat=F1}" Header="HCL" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding SiH4, StringFormat=F1}" Header="SiH2" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding C2H4, StringFormat=F1}" Header="C2H4" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding TCS, StringFormat=F1}" Header="TCS" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding TMA, StringFormat=F1}" Header="TMA" />
|
||||
<GridViewColumn DisplayMemberBinding="{Binding HeaterPowerConsumption, StringFormat=F3}" Header="Power(KWH)" />
|
||||
</GridView>
|
||||
</ListView.View>
|
||||
</ListView>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
|
||||
<TabItem Header="Gas Flow History" FontSize="12">
|
||||
<TabItem FontSize="12" Header="Gas Flow History">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="280"/>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="280" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
|
||||
|
||||
|
||||
<StackPanel Orientation="Vertical" >
|
||||
<StackPanel Orientation="Vertical">
|
||||
<StackPanel Width="260" Margin="5,5">
|
||||
<StackPanel.Resources>
|
||||
<Style TargetType="xctk:DateTimeUpDown">
|
||||
|
|
@ -2021,44 +2027,44 @@
|
|||
</StackPanel.Resources>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock
|
||||
Width="70"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14"
|
||||
Text="Start Time" />
|
||||
Width="70"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14"
|
||||
Text="Start Time" />
|
||||
<WindowsFormsHost
|
||||
Width="170"
|
||||
Height="22"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14">
|
||||
Width="170"
|
||||
Height="22"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14">
|
||||
<forms:DateTimePicker
|
||||
x:Name="wfTimeFrom"
|
||||
CustomFormat="yyyy/MM/dd HH:mm:ss"
|
||||
Format="Custom"
|
||||
Value="2011-8-1" />
|
||||
x:Name="wfTimeFrom"
|
||||
CustomFormat="yyyy/MM/dd HH:mm:ss"
|
||||
Format="Custom"
|
||||
Value="2011-8-1" />
|
||||
</WindowsFormsHost>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,5,0,0" Orientation="Horizontal">
|
||||
<TextBlock
|
||||
Width="70"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14"
|
||||
Text="End Time" />
|
||||
Width="70"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14"
|
||||
Text="End Time" />
|
||||
<WindowsFormsHost
|
||||
Width="170"
|
||||
Height="22"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14">
|
||||
Width="170"
|
||||
Height="22"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14">
|
||||
<forms:DateTimePicker
|
||||
x:Name="wfTimeTo"
|
||||
CustomFormat="yyyy/MM/dd HH:mm:ss"
|
||||
Format="Custom"
|
||||
Value="2011-8-1" />
|
||||
x:Name="wfTimeTo"
|
||||
CustomFormat="yyyy/MM/dd HH:mm:ss"
|
||||
Format="Custom"
|
||||
Value="2011-8-1" />
|
||||
</WindowsFormsHost>
|
||||
</StackPanel>
|
||||
|
||||
|
|
@ -2072,7 +2078,7 @@
|
|||
Content="Query">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<micro:ActionMessage MethodName="Query"/>
|
||||
<micro:ActionMessage MethodName="Query" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
|
|
@ -2081,13 +2087,13 @@
|
|||
</StackPanel>
|
||||
|
||||
<userControls1:BusyIndicator
|
||||
Panel.ZIndex="1"
|
||||
Grid.Column="3"
|
||||
Grid.Column="3"
|
||||
Width="Auto"
|
||||
Height="Auto"
|
||||
Padding="20,10"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Panel.ZIndex="1"
|
||||
Background="{StaticResource Tab_BG}"
|
||||
BorderBrush="Gray"
|
||||
BorderThickness="3"
|
||||
|
|
@ -2100,26 +2106,34 @@
|
|||
</i:Interaction.Triggers>
|
||||
</userControls1:BusyIndicator>
|
||||
|
||||
<ListView ItemsSource="{Binding GasFlowSumList}" Grid.Column="3">
|
||||
<ListView.Resources>
|
||||
<DataGrid
|
||||
Grid.Column="3"
|
||||
AlternationCount="2"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserAddRows="False"
|
||||
FontSize="13"
|
||||
IsReadOnly="True"
|
||||
ItemsSource="{Binding GasFlowSumList}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn
|
||||
Width="78"
|
||||
Binding="{Binding Name}"
|
||||
Header="Name" />
|
||||
<DataGridTextColumn
|
||||
Width="230"
|
||||
Binding="{Binding RunVolume, StringFormat=F3}"
|
||||
Header="Run(m³)" />
|
||||
<DataGridTextColumn
|
||||
Width="230"
|
||||
Binding="{Binding VentVolume, StringFormat=F3}"
|
||||
Header="Vent(m³)" />
|
||||
<DataGridTextColumn
|
||||
Width="300"
|
||||
Binding="{Binding Volume, StringFormat=F3}"
|
||||
Header="Total(m³)" />
|
||||
</DataGrid.Columns>
|
||||
|
||||
</ListView.Resources>
|
||||
|
||||
<ListView.View>
|
||||
<GridView>
|
||||
<GridViewColumn Width="80" Header="Name">
|
||||
<GridViewColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock Text="{Binding Name}" HorizontalAlignment="Center" VerticalAlignment="Center" FontFamily="Bold" />
|
||||
</DataTemplate>
|
||||
</GridViewColumn.CellTemplate>
|
||||
</GridViewColumn>
|
||||
<GridViewColumn Width="230" Header="Run(m³)" DisplayMemberBinding="{Binding RunVolume, StringFormat=F3}" />
|
||||
<GridViewColumn Width="230" Header="Vent(m³)" DisplayMemberBinding="{Binding VentVolume, StringFormat=F3}" />
|
||||
<GridViewColumn Width="300" Header="Total(m³)" DisplayMemberBinding="{Binding Volume, StringFormat=F3}" />
|
||||
</GridView>
|
||||
</ListView.View>
|
||||
</ListView>
|
||||
</DataGrid>
|
||||
|
||||
</Grid>
|
||||
|
||||
|
|
|
|||
|
|
@ -570,7 +570,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
|
|||
}
|
||||
|
||||
var xmlRecipe = CurrentRecipe.GetXmlString();
|
||||
InvokeClient.Instance.Service.DoOperation($"PM1.ReloadRecipe", xmlRecipe);
|
||||
InvokeClient.Instance.Service.DoOperation($"{SystemName}.ReloadRecipe", xmlRecipe);
|
||||
//InvokeClient.Instance.Service.DoOperation($"PM2.ReloadRecipe");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue