Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-client
# Conflicts: # shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs # shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.csmaster
zhaojian
1 year ago
commit
0fa1e7ce81
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
||||
{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl","ProjectFileName":"LanJuControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.exe","OutputItemRelativePath":"LanJuControl.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuControl\\bin\\Debug\\LanJuControl.pdb","OutputItemRelativePath":"LanJuControl.pdb"}],"CopyToOutputEntries":[]}
|
||||
@ -0,0 +1 @@
|
||||
{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib","ProjectFileName":"LanJuLib.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DataConfig\\ConnectionConfig.cs"},{"SourceFile":"DataConfig\\DatabaseConfig.cs"},{"SourceFile":"DataConfig\\DataCache.cs"},{"SourceFile":"DataConfig\\SqlDataObject.cs"},{"SourceFile":"DbHelperSQL.cs"},{"SourceFile":"Logger.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SecurityHelper\\DESProvider.cs"},{"SourceFile":"SecurityHelper\\MD5Provider.cs"},{"SourceFile":"WorkOrder.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\CommonFunc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\CommonFunc\\bin\\x86\\Debug\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\System.Data.SqlClient.4.8.5\\lib\\net461\\System.Data.SqlClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.dll","OutputItemRelativePath":"LanJuLib.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\LanJuLib\\bin\\Debug\\LanJuLib.pdb","OutputItemRelativePath":"LanJuLib.pdb"}],"CopyToOutputEntries":[]}
|
||||
@ -0,0 +1 @@
|
||||
{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\RestartApp","ProjectFileName":"RestartApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"RestartApp.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"update.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\HtmlAgilityPack.1.11.54\\lib\\Net45\\HtmlAgilityPack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\RestartApp\\bin\\Debug\\RestartApp.exe","OutputItemRelativePath":"RestartApp.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\RestartApp\\bin\\Debug\\RestartApp.pdb","OutputItemRelativePath":"RestartApp.pdb"}],"CopyToOutputEntries":[]}
|
||||
@ -0,0 +1 @@
|
||||
{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate","ProjectFileName":"WPFupdate.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"WPFupdate1.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"update.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\HtmlAgilityPack.1.11.54\\lib\\Net45\\HtmlAgilityPack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.exe","OutputItemRelativePath":"WPFupdate.exe"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\WPFupdate\\bin\\Debug\\WPFupdate.pdb","OutputItemRelativePath":"WPFupdate.pdb"}],"CopyToOutputEntries":[]}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
||||
{"RootPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift","ProjectFileName":"XGL.Thrift.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AreaPlc.cs"},{"SourceFile":"CarArea.cs"},{"SourceFile":"Fault.cs"},{"SourceFile":"LineArea.cs"},{"SourceFile":"MaterielNumKB.cs"},{"SourceFile":"Order.cs"},{"SourceFile":"OutCarLine.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"ThriftCommon.cs"},{"SourceFile":"ThriftService.cs"},{"SourceFile":"ThriftServiceImp.cs"},{"SourceFile":"WorkOrder.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\packages\\Thrift.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.dll","OutputItemRelativePath":"XGL.Thrift.dll"},{"OutputItemFullPath":"D:\\Repos\\WorkSpace\\lanju-client\\shangjian\\XGL.Thrift\\bin\\Debug\\XGL.Thrift.pdb","OutputItemRelativePath":"XGL.Thrift.pdb"}],"CopyToOutputEntries":[]}
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,180 @@
|
||||
<Window x:Class="XGL.Views.AddReportFrom"
|
||||
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"
|
||||
mc:Ignorable="d"
|
||||
Loaded="Window_Loaded"
|
||||
Height="450" Width="800" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
|
||||
<Window.Resources>
|
||||
<Style x:Key="CheckBoxStyle" TargetType="{x:Type CheckBox}">
|
||||
<Setter Property="IsEnabled" Value="False" />
|
||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="LayoutTransform">
|
||||
<Setter.Value>
|
||||
<ScaleTransform ScaleX="1.5" ScaleY="1.5" />
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style x:Key="LabelStyle" TargetType="Label">
|
||||
<Setter Property="FontSize" Value="25"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
<Style x:Key="TextBlockStyle" TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="15"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
||||
</Style>
|
||||
</Window.Resources>
|
||||
<Border BorderThickness="2" BorderBrush="Black" Margin="5">
|
||||
<Grid Margin="5">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock x:Name="WindowTitle" Text="新增" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Margin="10,10,10,10"/>
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition Width="100"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="点检内容" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Center" Grid.Column="0" Grid.Row="0" />
|
||||
<TextBlock Text="点检结果" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Center" Grid.Column="1" Grid.Row="0" />
|
||||
<TextBlock Text="异常填写实际情况" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Center" Grid.Column="2" Grid.Row="0" />
|
||||
<TextBlock Text="上一任务不良品是否处理并放置在不合格品区域" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="1" />
|
||||
<TextBlock Text="涉及内容物转换，上一任务内容物是否清理干净" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="2" />
|
||||
<TextBlock Text="上一任务剩余包材/内容物是否做好防护、标识并放在指定位置" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="3" />
|
||||
<TextBlock Text="流水线是否清理干净，无与当班次生产无关的东西存处" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="4" />
|
||||
<TextBlock Text="作业员是否清楚当班次操作" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="5" />
|
||||
<TextBlock Text="该班次内容物、包材是否符合" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="6" />
|
||||
<TextBlock Text="班次现场使用的设备是否可以正常工作" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="7" />
|
||||
<TextBlock Text="该班次生产批号是否正确" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="8" />
|
||||
<TextBlock Text="不良品是否处理干净并放置在不合格品区域" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="9" />
|
||||
<TextBlock Text="剩余包材/内容物是否做好防护并放在指定位置" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="10" />
|
||||
<TextBlock Text="生产线是否清理干净" Style="{StaticResource TextBlockStyle}" HorizontalAlignment="Left" TextWrapping="Wrap" Grid.Row="11" />
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="12" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="11" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="10" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="9" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="8" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="7" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="6" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="5" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="4" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="3" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="2" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="1" Grid.ColumnSpan="3"/>
|
||||
<Line X1="1" X2="0" Y1="0" Y2="0" StrokeThickness="1" VerticalAlignment="Top" Stretch="Fill" Stroke="Black" Grid.Row="0" Grid.ColumnSpan="3"/>
|
||||
<Line X1="0" X2="0" Y1="0" Y2="1" StrokeThickness="1" HorizontalAlignment="Left" Stretch="Fill" Stroke="Black" Grid.RowSpan="12"/>
|
||||
<Line X1="0" X2="0" Y1="0" Y2="1" StrokeThickness="1" HorizontalAlignment="Right" Stretch="Fill" Stroke="Black" Grid.RowSpan="12"/>
|
||||
<Line X1="0" X2="0" Y1="0" Y2="1" StrokeThickness="1" HorizontalAlignment="Right" Stretch="Fill" Stroke="Black" Grid.RowSpan="12" Grid.Column="1"/>
|
||||
<Line X1="0" X2="0" Y1="0" Y2="1" StrokeThickness="1" HorizontalAlignment="Right" Stretch="Fill" Stroke="Black" Grid.RowSpan="12" Grid.Column="2"/>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1">
|
||||
<RadioButton x:Name="unqualifiedC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="unqualifiedW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="unqualified" Grid.Row="1" GotFocus="TextBox_GotFocus" Grid.Column="2" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1">
|
||||
<RadioButton x:Name="clearC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="clearW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="clear" Grid.Row="2" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1">
|
||||
<RadioButton x:Name="residueC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="residueW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="residue" Grid.Row="3" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="4" Grid.Column="1">
|
||||
<RadioButton x:Name="lineClearC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="lineClearW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="lineClear" Grid.Row="4" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="5" Grid.Column="1">
|
||||
<RadioButton x:Name="UserKnowC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="UserKnowW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="UserKnow" Grid.Row="5" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="6" Grid.Column="1">
|
||||
<RadioButton x:Name="qualifiedC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="qualifiedW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="qualified" Grid.Row="6" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="7" Grid.Column="1">
|
||||
<RadioButton x:Name="equipStatusC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="equipStatusW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="equipStatus" Grid.Row="7" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="8" Grid.Column="1">
|
||||
<RadioButton x:Name="StampCorrectC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="StampCorrectW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="StampCorrect" Grid.Row="8" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="9" Grid.Column="1">
|
||||
<RadioButton x:Name="isClearC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="isClearW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="isClear" Grid.Row="9" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="10" Grid.Column="1">
|
||||
<RadioButton x:Name="positionCorrectC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="positionCorrectW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="positionCorrect" Grid.Row="10" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" GotFocus="TextBox_GotFocus" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="11" Grid.Column="1">
|
||||
<RadioButton x:Name="isLineClearC" Content="√" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="isLineClearW" Content="x" />
|
||||
</StackPanel>
|
||||
<TextBox x:Name="isLineClear" Grid.Row="11" Grid.Column="2" GotFocus="TextBox_GotFocus" TextWrapping="Wrap" Height="25" VerticalAlignment="Center" />
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="3">
|
||||
<RadioButton x:Name="OpenLine" Content="开线" Margin="0,0,15,0" />
|
||||
<RadioButton x:Name="ReplaceLine" Content="清换线" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="5" Grid.Row="2">
|
||||
<Button
|
||||
x:Name="AddButton"
|
||||
Grid.Row="0"
|
||||
Width="90"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Background="#2B7EE6" Click="AddButton_Click">
|
||||
<TextBlock
|
||||
FontSize="20"
|
||||
Foreground="White"
|
||||
Text="保存" />
|
||||
</Button>
|
||||
<Button
|
||||
Grid.Row="0"
|
||||
Width="90"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Margin="50,0,0,0"
|
||||
Background="#2B7EE6" Click="CloseButton_Click">
|
||||
<TextBlock
|
||||
FontSize="20"
|
||||
Foreground="White"
|
||||
Text="关闭" />
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Window>
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue