查看plc信息

master
zhaoaomin 2 years ago
parent f08d3f4f92
commit a4c0387dba

Binary file not shown.

@ -804,7 +804,18 @@ where workorder.workorder_id = '{workOrderNo}'";
}
return null;
}
public DataTable GetPlcValueList(string key,string deviceCode)
{
//根据工单获取成型机
string sql = $@"SELECT * FROM [dbo].[base_equipment_attached] where explain like '%{key}%' and device_code like '%{deviceCode}%' ORDER BY device_code ; ";
DataSet dtset = Utils.netClientDBHelper.getDataSet(sql);
if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0)
{
return dtset.Tables[0];
}
return null;
}
/// <summary>

@ -12,7 +12,7 @@
<!--设备编码-->
<add key="DeviceCode" value="C6" />
<!--上位机类型 0:工单准备1成型机\shoupei2烘房-->
<add key="ClientMode" value="1" />
<add key="ClientMode" value="2" />
<add key="SerialPort" value="COM5" />
<add key="DryingHouseList" value="H1,H2,H3" />

@ -237,13 +237,17 @@ namespace XGL.FormItem
new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; }
),
System.Windows.Threading.DispatcherPriority.Render);
if (dt.Rows[0][0].ToString() == "1" && time == 6)
{
//报警
serialHelper.ComOn();
serialHelper.redLightOff();
serialHelper.buzzerOff();
serialHelper.ComOff();
if (dt.Rows[0][0].ToString() == "1" )
{
if (time == 6)
{
//取消报警
serialHelper.ComOn();
serialHelper.redLightOff();
serialHelper.buzzerOff();
serialHelper.ComOff();
}
}
else
{

@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
namespace XGL.Tools
{
public class DeviceNameConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value.Equals("equ_type_cxj"))
{
return "成型机";
}
if (value.Equals("equ_type_hf"))
{
return "烘房";
}
if (value.Equals("equ_type_lg"))
{
return "料罐";
}
if (value.Equals("equ_type_spdsj"))
{
return "吊筛机";
}
return "未知";
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

@ -388,16 +388,39 @@
<StackPanel Orientation="Horizontal">
<Button
x:Name="btnRefrsh"
Width="100"
Width="120"
Height="40"
Margin="60,0,0,0"
Margin="0,0,20,0"
Background="#2F82E7"
Click="btnRefrsh_Click"
Content="刷新"
FontSize="20"
Foreground="White"
IsCancel="True" />
</StackPanel>
<Button
x:Name="btnCheckLog"
Width="120"
Height="40"
Margin="25,5"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="btnCheckLog_Click" Content="接口日志"></Button>
<Button
x:Name="btnViewPlcvalue"
Width="120"
Height="40"
Margin="25,5"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
</StackPanel>
</StackPanel>
<!--ItemContainerStyle="{DynamicResource ApplicantList_ListBoxItem_Style}"-->
<GroupBox Grid.Row="1" HorizontalContentAlignment="Center">

@ -233,6 +233,17 @@ namespace XGL.Views
GetDringRoomData();
GetOutDringRoomData();
}
private void btnCheckLog_Click(object sender, RoutedEventArgs e)
{
ViewLogWin viewLogWin = new ViewLogWin();
viewLogWin.ShowDialog();
}
private void btnViewPlcvalue_Click(object sender, RoutedEventArgs e)
{
ViewPlcInfoWin viewPlcWin = new ViewPlcInfoWin();
viewPlcWin.ShowDialog();
}
}
public class EquipmentMode
{

@ -352,10 +352,28 @@
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="btnCheckLog_Click" Content="查看日志"></Button>
Click="btnCheckLog_Click" Content="查看接口日志"></Button>
</StackPanel>
<StackPanel
Grid.Row="0"
Grid.Column="7"
Width="220"
Height="90">
<Button
x:Name="btnViewPlcvalue"
Grid.Row="1"
Grid.Column="5"
Width="170"
Height="60"
Margin="25,5"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="#2B7EE6"
FontSize="20"
Foreground="White"
Click="btnViewPlcvalue_Click" Content="查看Plc值"></Button>
</StackPanel>
<DataGrid
x:Name="dgWorkOrderInfo"
Grid.Row="1"

@ -295,5 +295,11 @@ namespace XGL.Views
ViewLogWin viewLogWin = new ViewLogWin();
viewLogWin.ShowDialog();
}
private void btnViewPlcvalue_Click(object sender, RoutedEventArgs e)
{
ViewPlcInfoWin viewPlcWin = new ViewPlcInfoWin();
viewPlcWin.ShowDialog();
}
}
}

@ -92,7 +92,6 @@
<convert:MyValueConverter x:Key="MyConverter"/>
<convert:SyncFlagConverter x:Key="SyncFlagConverter"/>
<convert:SyncFlagColorConverter x:Key="SyncFlagColorConvert"/>
</ResourceDictionary>
</UserControl.Resources>

@ -76,11 +76,11 @@
<StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
<Label Content="请选择日期:" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
<localDate:UserDatePicker x:Name="dateStart" VerticalAlignment="Center" AlternativeCalendarStyle="{StaticResource calendarWithGotToTodayStyle}"
Width="150" SelectedDateFormat="Short" IsTodayHighlighted="True">
Width="150" SelectedDateFormat="Short" IsTodayHighlighted="True">
</localDate:UserDatePicker>
<Label Content="关键字:" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
<TextBox x:Name="txtKey" Width="150" Height="30" FontSize="18" VerticalContentAlignment="Center"></TextBox>
<TextBox x:Name="txtKey" Width="150" Height="30" FontSize="18" VerticalContentAlignment="Center" KeyDown="txtKey_KeyDown"></TextBox>
<Button x:Name="btnQueryLog" Content="查询" Foreground="White" Margin="20,0,0,0" FontSize="18" Background="#2B7EE6" Width="100" Height="30" Click="btnQueryLog_Click"/>
</StackPanel>

@ -30,7 +30,7 @@ namespace XGL.Views
private void Window_Loaded(object sender, RoutedEventArgs e)
{
this.dateStart.SelectedDate = DateTime.Now;
GetLogList();
}
private void dgLogInfo_LoadingRow(object sender, DataGridRowEventArgs e)
@ -57,6 +57,12 @@ namespace XGL.Views
this.Close();
}
private void txtKey_KeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
GetLogList();
}
}
}
}

@ -0,0 +1,132 @@
<Window x:Class="XGL.Views.ViewPlcInfoWin"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:XGL.Views" xmlns:localDate="clr-namespace:XGL.Tools"
xmlns:convert="clr-namespace:XGL.Tools"
mc:Ignorable="d"
Title="ViewLogWin" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" WindowStyle="None" WindowState="Maximized">
<Window.Resources>
<convert:DeviceNameConverter x:Key="DeviceNameConverter"/>
<SolidColorBrush x:Key="EvenRowBackground" Color="#E0E0E0"/>
<SolidColorBrush x:Key="OddRowBackground" Color="#FFFFFF"/>
<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
<Setter Property="Background" Value="{StaticResource EvenRowBackground}"/>
<Style.Triggers>
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
<Setter Property="Background" Value="{StaticResource OddRowBackground}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="CustomCellStyle" TargetType="DataGridCell">
<Setter Property="Foreground" Value="Black" />
<Setter Property="TextBlock.TextAlignment" Value="Center" />
<Setter Property="TextBlock.FontSize" Value="22" />
</Style>
<!--日历样式-->
<Style TargetType="CalendarDayButton" x:Key="CalendarDayBtnStyle">
<Setter Property="FontSize" Value="16"></Setter>
</Style>
<Style x:Key="calendarWithGotToTodayStyle"
TargetType="{x:Type Calendar}">
<Setter Property="CalendarDayButtonStyle"
Value="{StaticResource CalendarDayBtnStyle}"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Calendar}">
<Border>
<StackPanel Orientation="Vertical">
<StackPanel x:Name="PART_Root"
HorizontalAlignment="Center" Background="#FF878787">
<CalendarItem x:Name="PART_CalendarItem"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"
Style="{TemplateBinding CalendarItemStyle}"
Height="{TemplateBinding Height}"
/>
<Grid VerticalAlignment="Center" HorizontalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="52"></ColumnDefinition>
<ColumnDefinition Width="26"></ColumnDefinition>
<ColumnDefinition Width="52"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock x:Name="PART_GoToday"
Width="40" Height="20"
Text="今天" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Cursor="Hand" Foreground="#FFFFFFFF" />
<TextBlock Grid.Column="2" x:Name="PART_GoClear"
Width="40" Height="20"
Text="清空" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" Cursor="Hand" Foreground="#FFFFFFFF" />
</Grid>
</StackPanel>
</StackPanel>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.1*"/>
<RowDefinition Height="0.9*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
<Label Content="注释:" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
<TextBox x:Name="txtKey" Width="150" Height="30" FontSize="18" VerticalContentAlignment="Center" KeyDown="txtKey_KeyDown"></TextBox>
<Label Content="设备编码:" VerticalContentAlignment="Center" FontSize="14" Margin="20"></Label>
<TextBox x:Name="txtDeviceCode" Width="150" Height="30" FontSize="18" VerticalContentAlignment="Center" KeyDown="txtDeviceCode_KeyDown"></TextBox>
<Button x:Name="btnQueryLog" Content="查询" Foreground="White" Margin="20,0,0,0" FontSize="18" Background="#2B7EE6" Width="100" Height="30" Click="btnQueryLog_Click"/>
</StackPanel>
<Button x:Name="btnClose" Content="关闭" Foreground="White" FontSize="18" Background="#2B7EE6" Width="100" Margin="20" Height="30" Click="btnClose_Click" HorizontalAlignment="Right"/>
<DataGrid
x:Name="dgPlcValueInfo"
Grid.Row="1"
MinHeight="340"
AlternatingRowBackground="{StaticResource OddRowBackground}"
AlternationCount="2"
RowStyle="{StaticResource DataGridRowStyle}"
Margin="20,0,0,5"
LoadingRow="dgLogInfo_LoadingRow"
HeadersVisibility="Column"
CellStyle="{StaticResource CustomCellStyle}"
HorizontalAlignment="Left"
VerticalAlignment="Top" IsReadOnly="True"
AutoGenerateColumns="False" CanUserAddRows="False">
<DataGrid.ColumnHeaderStyle >
<Style TargetType="DataGridColumnHeader">
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="Height" Value="48" />
<Setter Property="FontSize" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#2B7EE6" />
</Style>
</DataGrid.ColumnHeaderStyle>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" 序号" Width="80" MinWidth="10" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,0,0"></TextBlock>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="0.08*" Header="设备编码" Binding="{Binding device_code}" />
<DataGridTextColumn Width="0.1*" Header="设备类型" Binding="{Binding device_type,Converter={StaticResource DeviceNameConverter}}" />
<DataGridTextColumn Width="0.15*" Header="更新时间" Binding="{Binding last_update_time, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" />
<DataGridTextColumn Width="0.2*" Header="属性名" Binding="{Binding property}" > </DataGridTextColumn>
<DataGridTextColumn Width="0.25*" Header="注释" Binding="{Binding explain}" />
<DataGridTextColumn Width="0.12*" Header="值" Binding="{Binding isvalue}" />
<!--<DataGridTextColumn Width="340" Header="流转码" Binding="{Binding work_batch_code}" />-->
<!--<DataGridTextColumn Width="60" Header="出入" Binding="{Binding taskcode,Converter={StaticResource TaskCodeConverter}}"/>-->
</DataGrid.Columns>
</DataGrid>
</Grid>
</Window>

@ -0,0 +1,75 @@
using CentralControl.DBDAO;
using System;
using System.Collections.Generic;
using System.Data;
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.Shapes;
namespace XGL.Views
{
/// <summary>
/// ViewLogWin.xaml 的交互逻辑
/// </summary>
public partial class ViewPlcInfoWin : Window
{
DBService userDbWareHouse = new DBService();
public ViewPlcInfoWin()
{
InitializeComponent();
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
GetPlcValueList();
}
private void dgLogInfo_LoadingRow(object sender, DataGridRowEventArgs e)
{
e.Row.Header = (e.Row.GetIndex() + 1).ToString();
}
private void btnQueryLog_Click(object sender, RoutedEventArgs e)
{
GetPlcValueList();
}
private void GetPlcValueList()
{
DataTable dt = userDbWareHouse.GetPlcValueList(this.txtKey.Text,this.txtDeviceCode.Text);
if (dt == null) return;
this.dgPlcValueInfo.ItemsSource = null;
this.dgPlcValueInfo.ItemsSource = dt.DefaultView;
}
private void btnClose_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void txtKey_KeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
GetPlcValueList();
}
}
private void txtDeviceCode_KeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Enter)
{
GetPlcValueList();
}
}
}
}

@ -255,6 +255,7 @@
<Compile Include="Tools\SyncFlagColorConverter.cs" />
<Compile Include="Tools\NetStatusToColorConvert.cs" />
<Compile Include="Tools\MyValueConverter.cs" />
<Compile Include="Tools\DeviceNameConverter.cs" />
<Compile Include="Tools\SyncFlagConverter.cs" />
<Compile Include="Tools\UserDatePicker.cs" />
<Compile Include="UControl\ordertj.xaml.cs">
@ -380,6 +381,9 @@
<Compile Include="Views\LanJu_UserRecord.xaml.cs">
<DependentUpon>LanJu_UserRecord.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ViewPlcInfoWin.xaml.cs">
<DependentUpon>ViewPlcInfoWin.xaml</DependentUpon>
</Compile>
<Compile Include="Views\ViewLogWin.xaml.cs">
<DependentUpon>ViewLogWin.xaml</DependentUpon>
</Compile>
@ -627,6 +631,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\ViewPlcInfoWin.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\ViewLogWin.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6CE0F6B014615598B15A3033E96EA2683574AB189AA0B1872F6672D5A8EB0C13"
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8B9B7D2C74FAD7D86572110B403B2CF5688AF560B3DDA7ED40DFE31C30B24AAA"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -82,7 +82,15 @@ namespace XGL.Views {
#line hidden
#line 360 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 364 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnViewPlcvalue;
#line default
#line hidden
#line 378 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
@ -90,7 +98,7 @@ namespace XGL.Views {
#line hidden
#line 499 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 517 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
@ -197,23 +205,32 @@ namespace XGL.Views {
#line hidden
return;
case 9:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
this.btnViewPlcvalue = ((System.Windows.Controls.Button)(target));
#line 370 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line 375 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnViewPlcvalue.Click += new System.Windows.RoutedEventHandler(this.btnViewPlcvalue_Click);
#line default
#line hidden
return;
case 10:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 431 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line 388 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line default
#line hidden
return;
case 11:
#line 449 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line default
#line hidden
return;
case 12:
this.Window1 = ((System.Windows.Controls.ContentControl)(target));
return;
}

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6CE0F6B014615598B15A3033E96EA2683574AB189AA0B1872F6672D5A8EB0C13"
#pragma checksum "..\..\..\..\Views\LanJu_Operator.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8B9B7D2C74FAD7D86572110B403B2CF5688AF560B3DDA7ED40DFE31C30B24AAA"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -82,7 +82,15 @@ namespace XGL.Views {
#line hidden
#line 360 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 364 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnViewPlcvalue;
#line default
#line hidden
#line 378 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgWorkOrderInfo;
@ -90,7 +98,7 @@ namespace XGL.Views {
#line hidden
#line 499 "..\..\..\..\Views\LanJu_Operator.xaml"
#line 517 "..\..\..\..\Views\LanJu_Operator.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Window1;
@ -197,23 +205,32 @@ namespace XGL.Views {
#line hidden
return;
case 9:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
this.btnViewPlcvalue = ((System.Windows.Controls.Button)(target));
#line 370 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line 375 "..\..\..\..\Views\LanJu_Operator.xaml"
this.btnViewPlcvalue.Click += new System.Windows.RoutedEventHandler(this.btnViewPlcvalue_Click);
#line default
#line hidden
return;
case 10:
this.dgWorkOrderInfo = ((System.Windows.Controls.DataGrid)(target));
#line 431 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line 388 "..\..\..\..\Views\LanJu_Operator.xaml"
this.dgWorkOrderInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgWorkOrderInfo_LoadingRow);
#line default
#line hidden
return;
case 11:
#line 449 "..\..\..\..\Views\LanJu_Operator.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.InOut_Click);
#line default
#line hidden
return;
case 12:
this.Window1 = ((System.Windows.Controls.ContentControl)(target));
return;
}

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96834934E2770D41EE52C6970A8604F6142011FC58BFEA23BAB4A3B17A3BBAEA"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0210A0C880B62CA918F0740CDFF9441166FD363DD377C446AAFEAAB7DF78D62E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -43,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
#line 133 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 132 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgMaterialInfo;
@ -51,7 +51,7 @@ namespace XGL.Views {
#line hidden
#line 220 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 219 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
@ -59,7 +59,7 @@ namespace XGL.Views {
#line hidden
#line 229 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 228 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid WorkOrder;
@ -107,7 +107,7 @@ namespace XGL.Views {
case 2:
this.dgMaterialInfo = ((System.Windows.Controls.DataGrid)(target));
#line 140 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 139 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.dgMaterialInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgMaterialInfo_LoadingRow);
#line default
@ -115,7 +115,7 @@ namespace XGL.Views {
return;
case 3:
#line 182 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 181 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
#line default
@ -124,7 +124,7 @@ namespace XGL.Views {
case 4:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 221 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 220 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line default
@ -133,13 +133,13 @@ namespace XGL.Views {
case 5:
this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
#line 240 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 239 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
#line default
#line hidden
#line 243 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 242 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.WorkOrder_SelectionChanged);
#line default
@ -160,7 +160,7 @@ namespace XGL.Views {
{
case 6:
#line 354 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 353 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
@ -168,7 +168,7 @@ namespace XGL.Views {
break;
case 7:
#line 361 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 360 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
#line default
@ -176,7 +176,7 @@ namespace XGL.Views {
break;
case 8:
#line 368 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 367 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "96834934E2770D41EE52C6970A8604F6142011FC58BFEA23BAB4A3B17A3BBAEA"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0210A0C880B62CA918F0740CDFF9441166FD363DD377C446AAFEAAB7DF78D62E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -43,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_Prepare : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
#line 133 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 132 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgMaterialInfo;
@ -51,7 +51,7 @@ namespace XGL.Views {
#line hidden
#line 220 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 219 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnRefresh;
@ -59,7 +59,7 @@ namespace XGL.Views {
#line hidden
#line 229 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 228 "..\..\..\..\Views\LanJu_Prepare.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid WorkOrder;
@ -107,7 +107,7 @@ namespace XGL.Views {
case 2:
this.dgMaterialInfo = ((System.Windows.Controls.DataGrid)(target));
#line 140 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 139 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.dgMaterialInfo.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgMaterialInfo_LoadingRow);
#line default
@ -115,7 +115,7 @@ namespace XGL.Views {
return;
case 3:
#line 182 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 181 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.btnStartOrders_Click);
#line default
@ -124,7 +124,7 @@ namespace XGL.Views {
case 4:
this.btnRefresh = ((System.Windows.Controls.Button)(target));
#line 221 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 220 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.btnRefresh.Click += new System.Windows.RoutedEventHandler(this.btnRefresh_Click);
#line default
@ -133,13 +133,13 @@ namespace XGL.Views {
case 5:
this.WorkOrder = ((System.Windows.Controls.DataGrid)(target));
#line 240 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 239 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.USERLIST_LoadingRow);
#line default
#line hidden
#line 243 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 242 "..\..\..\..\Views\LanJu_Prepare.xaml"
this.WorkOrder.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.WorkOrder_SelectionChanged);
#line default
@ -160,7 +160,7 @@ namespace XGL.Views {
{
case 6:
#line 354 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 353 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Flow_Click);
#line default
@ -168,7 +168,7 @@ namespace XGL.Views {
break;
case 7:
#line 361 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 360 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SOP_Click);
#line default
@ -176,7 +176,7 @@ namespace XGL.Views {
break;
case 8:
#line 368 "..\..\..\..\Views\LanJu_Prepare.xaml"
#line 367 "..\..\..\..\Views\LanJu_Prepare.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Material_Click);
#line default

@ -1 +1 @@
87f39467f535bf496adb97438a039b26400bb381
2a2ffa0c505ff927c6da6cd9f7531b0d8d225fba

@ -781,3 +781,5 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\zh-Hans\Xcee
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\bin\Debug\Resources\lanjuLogoNew.ico
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewLogWin.g.cs
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewLogWin.baml
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewPlcInfoWin.g.cs
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\obj\x86\Debug\Views\ViewPlcInfoWin.baml

@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
58-207796803
591234386457
3-297253631
77864370360
79-1358286590
1691309784480
CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;Views\ViewLogWin.xaml;
CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;Views\ViewPlcInfoWin.xaml;Views\ViewLogWin.xaml;
False

@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\App.xaml
58-207796803
591234386457
3-297253631
78-547651397
801524658949
1691309784480
CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;Views\ViewLogWin.xaml;
CSS\DataGridClass.xaml;CSS\NormalSmlBtnClass.xaml;CSS\SearchBtnClass.xaml;CSS\Style.xaml;CSS\SearchTextClass.xaml;CSS\TabControl.xaml;FormItem\FormBlankingBoard.xaml;FormItem\FormBoard.xaml;FormItem\FormChargingBoard.xaml;FormItem\FormLocator.xaml;FormItem\FormOutBoxBoard.xaml;FormItem\FormShowSelect.xaml;FormItem\Main.xaml;LoginPage.xaml;MainWindow.xaml;Tools\ModuleUC.xaml;UControl\ordertj.xaml;UControl\orderzfzy.xaml;UControl\orderzy.xaml;UControl\product_order.xaml;UControl\product_ordertj.xaml;UControl\product_orderzfzy.xaml;UControl\product_orderzy.xaml;UControl\UCArea.xaml;UControl\UCBoard.xaml;UControl\UCCar.xaml;UControl\UCCarL.xaml;UControl\UCLMix.xaml;UControl\UCMix.xaml;UControl\UCMixR.xaml;UControl\UCPermissionList.xaml;UControl\UCPostionList.xaml;UControl\UCProgressBar.xaml;UControl\UCRoleList.xaml;UControl\UCRProgressBar.xaml;UControl\UCStorage.xaml;UControl\UCStorageNew.xaml;UControl\UCStorageNewx.xaml;UControl\UCTakeOff.xaml;UControl\UCUserList.xaml;Views\CheckUserWin.xaml;Views\DryingRoomUC.xaml;Views\ShouPeiWin.xaml;Views\SopInfoWin.xaml;Views\FlowInfoWin.xaml;Views\LanJu_Complete.xaml;Views\LanJu_DeviceItems.xaml;Views\LanJu_Flow.xaml;Views\LanJu_Index.xaml;Views\LanJu_InOut.xaml;Views\LanJu_Material.xaml;Views\LanJu_NowUser.xaml;Views\LanJu_Operator.xaml;Views\LanJu_Paused.xaml;Views\LanJu_Prepare.xaml;Views\LanJu_User.xaml;Views\LanJu_UserRecord.xaml;Views\ViewPlcInfoWin.xaml;Views\ViewLogWin.xaml;
True
False

@ -49,5 +49,6 @@ FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Paused.xa
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Prepare.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_User.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_UserRecord.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\ViewPlcInfoWin.xaml;;
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\ViewLogWin.xaml;;

Loading…
Cancel
Save