Merge branch 'ROR功能开发' into MfcCalculation
This commit is contained in:
hanqiangqiang
commit
d302127967
|
|
@ -0,0 +1,491 @@
|
|||
<UserControl x:Class="MECF.Framework.UI.Client.CenterViews.ROR.RorView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:userControls="clr-namespace:MECF.Framework.UI.Client.CenterViews.Core.UserControls"
|
||||
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
|
||||
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
|
||||
xmlns:micro="clr-namespace:Caliburn.Micro"
|
||||
xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.ROR"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<UserControl.Resources>
|
||||
<Style TargetType="TextBlock" >
|
||||
<Setter Property="FontSize"
|
||||
Value="15" />
|
||||
<Setter Property="TextAlignment"
|
||||
Value="Center" />
|
||||
<Setter Property="VerticalAlignment"
|
||||
Value="Center" />
|
||||
<Setter Property="TextWrapping"
|
||||
Value="Wrap" />
|
||||
<Setter Property="Margin"
|
||||
Value="3"/>
|
||||
<Setter Property="HorizontalAlignment"
|
||||
Value="Left"/>
|
||||
</Style>
|
||||
|
||||
|
||||
<Style TargetType="Border" >
|
||||
<Setter Property="Background"
|
||||
Value="#91b0cd" />
|
||||
<Setter Property="BorderBrush"
|
||||
Value="Gray"/>
|
||||
<Setter Property="SnapsToDevicePixels"
|
||||
Value="True"/>
|
||||
<Setter Property="BorderThickness"
|
||||
Value="1,0,1,1"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="InfBorder" TargetType="Border">
|
||||
<Setter Property="Background"
|
||||
Value="White" />
|
||||
<Setter Property="BorderBrush"
|
||||
Value="Gray"/>
|
||||
<Setter Property="SnapsToDevicePixels"
|
||||
Value="True"/>
|
||||
<Setter Property="BorderThickness"
|
||||
Value="0,0,1,1"/>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="TextBox">
|
||||
<Setter Property="BorderThickness"
|
||||
Value="0"/>
|
||||
<Setter Property="VerticalAlignment"
|
||||
Value="Center"/>
|
||||
<Setter Property="FontSize"
|
||||
Value="15" />
|
||||
<Setter Property="Margin"
|
||||
Value="3"/>
|
||||
</Style>
|
||||
|
||||
|
||||
</UserControl.Resources>
|
||||
|
||||
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="430"/>
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="370"/>
|
||||
<RowDefinition/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Grid Margin="5">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="35" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Border
|
||||
CornerRadius="8,8,0,0"
|
||||
BorderThickness="0"
|
||||
Background="#FF243664" >
|
||||
<TextBlock Text="ROR" FontSize="13" Foreground="White" HorizontalAlignment="Center" Padding="8,0,0,0"/>
|
||||
</Border >
|
||||
<StackPanel Grid.Row="1" Orientation="Horizontal">
|
||||
<StackPanel Width="180" HorizontalAlignment="Left" >
|
||||
<Border BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="基准VS选择" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="MFC名称" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="反应腔温度" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="反应腔保压压力变化(ts)" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="反应腔体积" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="压力记录时间间隔t" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="压力记录时间间隔(s)" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="反应腔压差(1)" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="反应腔压差(2)" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="反应腔平均压差" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="标准MFC实际流量" />
|
||||
</Border>
|
||||
<Border>
|
||||
<TextBlock Text="标准MFC设定流量" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
<StackPanel Width="120">
|
||||
<Border BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="基准MFC" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="MFC27" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="123" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="123" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="123" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
<StackPanel Width="120" HorizontalAlignment="Left">
|
||||
<Border BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="选择MFC" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="MFC27" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="123" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="123" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Style="{StaticResource InfBorder}">
|
||||
<TextBox Text="" />
|
||||
</Border>
|
||||
<Border Background="#FFD6D6D6" Style="{StaticResource InfBorder}">
|
||||
<TextBlock Text="{Binding rorMfcSetValue}" />
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<!--<Border
|
||||
Grid.Row="1"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="基准VS实际" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Background="#FFD6D6D6"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="12313" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="2"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="反应腔温度" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Background="#FFD6D6D6"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="12313" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="反应腔保压压力变化(ts)" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
Background="#FFD6D6D6"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="12313" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="4"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="反应腔体积"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="12313" HorizontalAlignment="Left"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="5"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="压力记录时间间隔t"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBox Text="12313"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="压力记录时间间隔(s)"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="6"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBox Text="12313"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="7"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="反应腔压差(1)"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="7"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBox Text="12313"/>
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
Grid.Row="8"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="反应腔压差(2)"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="8"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBox Text="12313"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="9"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="反应腔平均压差"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="9"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBox Text="12313"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="标准MFC实际流量" />
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="10"
|
||||
Grid.Column="1"
|
||||
Background="White"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBox Text="12313"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="11"
|
||||
BorderThickness="1,0,1,1">
|
||||
<TextBlock Text="标准MFC设定流量"/>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="11"
|
||||
Grid.Column="1"
|
||||
Background="#FFD6D6D6"
|
||||
BorderThickness="0,0,1,1">
|
||||
<TextBlock Text="12313" />
|
||||
</Border>-->
|
||||
</Grid>
|
||||
<Canvas Grid.Row="1" Margin="5">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="30" />
|
||||
<RowDefinition Height="45" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="150" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border
|
||||
CornerRadius="8,8,0,0"
|
||||
Width="310"
|
||||
Grid.ColumnSpan="2"
|
||||
Background="#FF243664" >
|
||||
<TextBlock Text="Test" FontSize="13" Foreground="White" HorizontalAlignment="Center" Padding="8,0,0,0"/>
|
||||
</Border >
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Padding="5,1,0,1"
|
||||
Background="#91b0cd"
|
||||
BorderThickness="1,0,1,1">
|
||||
<ComboBox
|
||||
Margin="5"
|
||||
FontSize="15"
|
||||
Height="30"
|
||||
Width="120">
|
||||
<ItemsControl>MFC25</ItemsControl>
|
||||
<ItemsControl>MFC26</ItemsControl>
|
||||
<ItemsControl>MFC27</ItemsControl>
|
||||
<ItemsControl>MFC28</ItemsControl>
|
||||
<ItemsControl>MFC29</ItemsControl>
|
||||
<ItemsControl>MFC30</ItemsControl>
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="SelectionChanged">
|
||||
<micro:ActionMessage MethodName="MfcSelectionChanged">
|
||||
<micro:ActionMessage.Parameters>
|
||||
<micro:Parameter Value="Mfc27" />
|
||||
</micro:ActionMessage.Parameters>
|
||||
</micro:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</ComboBox>
|
||||
</Border>
|
||||
<Border
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Padding="0"
|
||||
Background="#91b0cd"
|
||||
BorderThickness="0,0,1,1">
|
||||
<Button
|
||||
Width="80"
|
||||
Height="30"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Right"
|
||||
Content="Star">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<micro:ActionMessage MethodName="Query">
|
||||
<micro:ActionMessage.Parameters>
|
||||
<micro:Parameter Value="123" />
|
||||
</micro:ActionMessage.Parameters>
|
||||
</micro:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</Border>
|
||||
</Grid>
|
||||
<Grid Canvas.Top="90">
|
||||
<Border CornerRadius="8,8,0,0" Background="#91b0cd"
|
||||
BorderThickness="1,0,1,1">
|
||||
<StackPanel Orientation="Horizontal" Width="302">
|
||||
<StackPanel Margin="0,15">
|
||||
<StackPanel Orientation="Horizontal" Height="40">
|
||||
<TextBlock
|
||||
Text="Start Time" Width="75"/>
|
||||
<WindowsFormsHost
|
||||
Width="170"
|
||||
Height="22"
|
||||
Margin="5,0,0,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Arial"
|
||||
FontSize="14">
|
||||
<forms:DateTimePicker
|
||||
CustomFormat="yyyy/MM/dd HH:mm:ss"
|
||||
Format="Custom"
|
||||
Value="2011-8-1" />
|
||||
</WindowsFormsHost>
|
||||
</StackPanel>
|
||||
<StackPanel Margin="0,5,0,0" Orientation="Horizontal" Height="40">
|
||||
<TextBlock
|
||||
Text="End Time" Width="75"/>
|
||||
<WindowsFormsHost
|
||||
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" />
|
||||
</WindowsFormsHost>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="5">
|
||||
<Button
|
||||
Width="100"
|
||||
Height="30"
|
||||
Margin="5,5,5,0"
|
||||
HorizontalAlignment="Right"
|
||||
Content="Query">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<micro:ActionMessage MethodName="Query">
|
||||
<micro:ActionMessage.Parameters>
|
||||
<micro:Parameter Value="123" />
|
||||
</micro:ActionMessage.Parameters>
|
||||
</micro:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
<Button
|
||||
Width="100"
|
||||
Height="30"
|
||||
Margin="20,5,5,0"
|
||||
HorizontalAlignment="Right"
|
||||
Content="Append"
|
||||
ToolTip="Append selected items to current chart">
|
||||
<i:Interaction.Triggers>
|
||||
<i:EventTrigger EventName="Click">
|
||||
<micro:ActionMessage MethodName="Query">
|
||||
<micro:ActionMessage.Parameters>
|
||||
<micro:Parameter Value="123" />
|
||||
</micro:ActionMessage.Parameters>
|
||||
</micro:ActionMessage>
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</Grid>
|
||||
</Canvas>
|
||||
<Grid Grid.Column="1" Grid.RowSpan="2" Margin="10,5,0,0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition/>
|
||||
<RowDefinition Height="300"/>
|
||||
</Grid.RowDefinitions>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace MECF.Framework.UI.Client.CenterViews.ROR
|
||||
{
|
||||
/// <summary>
|
||||
/// RorView.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class RorView : UserControl
|
||||
{
|
||||
public RorView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
using Aitex.Core.RT.SCCore;
|
||||
using MECF.Framework.Common.DataCenter;
|
||||
using MECF.Framework.UI.Client.ClientBase;
|
||||
using SciChart.Charting2D.Interop;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MECF.Framework.UI.Client.CenterViews.ROR
|
||||
{
|
||||
public class RorViewModel : UiViewModelBase, ISupportMultipleSystem
|
||||
{
|
||||
private SCConfigItem MfcConfigItem;
|
||||
public double rorMfcSetValue { get; set; }
|
||||
public void MfcSelectionChanged(string mfcName)
|
||||
{
|
||||
rorMfcSetValue = (double)QueryDataClient.Instance.Service.GetConfig($"System.PM.{SystemName}.MFC.{mfcName}.DefaultSetPoint");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -218,6 +218,10 @@
|
|||
</Compile>
|
||||
<Compile Include="CenterViews\Dialogs\SystemInfoViewModel.cs" />
|
||||
<Compile Include="CenterViews\Editors\ChamberTypeItem.cs" />
|
||||
<Compile Include="CenterViews\ROR\RorView.xaml.cs">
|
||||
<DependentUpon>RorView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CenterViews\ROR\RorViewModel.cs" />
|
||||
<Compile Include="Ctrlib\Controls\PanelLocker.xaml.cs">
|
||||
<DependentUpon>PanelLocker.xaml</DependentUpon>
|
||||
</Compile>
|
||||
|
|
@ -878,6 +882,10 @@
|
|||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="CenterViews\ROR\RorView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrlib\Controls\PanelLocker.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ namespace MECF.Framework.UI.Client.TrayThickness
|
|||
{
|
||||
List<string> cmdList = new List<string>();
|
||||
|
||||
string cmdID = $"select * from tray_thickness_data where tray_guid = '{trayUid}'";
|
||||
string cmdID = $"select * from tray_thickness_data where wafer_guid = '{trayUid}'";
|
||||
var dt = QueryDataClient.Instance.Service.QueryData(cmdID);
|
||||
if (dt is { Rows.Count: > 0 })
|
||||
cmdList.Add(Cmd_update(trayCoatingThickness, trayUid));
|
||||
|
|
@ -165,7 +165,7 @@ namespace MECF.Framework.UI.Client.TrayThickness
|
|||
{
|
||||
coatingData = new List<CoatingData>();
|
||||
var sql =
|
||||
$"select tray_number, tray_inner_number, ring_inner_number, ring_outer_number from tray_thickness_data WHERE tray_guid = '{trayUid}' limit 1";
|
||||
$"select tray_number, tray_inner_number, ring_inner_number, ring_outer_number from tray_thickness_data WHERE wafer_guid = '{trayUid}' limit 1";
|
||||
var dt = QueryDataClient.Instance.Service.QueryData(sql);
|
||||
if (dt is { Rows.Count: > 0 })
|
||||
{
|
||||
|
|
@ -185,7 +185,7 @@ namespace MECF.Framework.UI.Client.TrayThickness
|
|||
{
|
||||
string cmd_data_insert =
|
||||
"insert into tray_thickness_data" +
|
||||
"(tray_guid,tray_number, tray_inner_number, ring_inner_number, ring_outer_number)" +
|
||||
"(wafer_guid,tray_number, tray_inner_number, ring_inner_number, ring_outer_number)" +
|
||||
$"values ('{trayID}'," +
|
||||
$"'{trayCoatingThickness.Tray.SerialNumber}'," +
|
||||
$"'{trayCoatingThickness.TrayInner.SerialNumber}'," +
|
||||
|
|
@ -207,7 +207,7 @@ namespace MECF.Framework.UI.Client.TrayThickness
|
|||
$"tray_inner_number= '{trayCoatingThickness.TrayInner.SerialNumber}'," +
|
||||
$"ring_inner_number= '{trayCoatingThickness.RingInner.SerialNumber}'," +
|
||||
$"ring_outer_number= '{trayCoatingThickness.RingOuter.SerialNumber}'" +
|
||||
$"where tray_guid = '{trayID}'";
|
||||
$"where wafer_guid = '{trayID}'";
|
||||
return cmd_update;
|
||||
}
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue