Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加烘房屏蔽设备

Browse Source
master
zhaojian 2 years ago
parent 1753c5463e
commit 5657265016
12 changed files with 90 additions and 65 deletions
Show Stats Download Patch File Download Diff File

BIN
shangjian/.vs/BL/v17/.suo
View File

Binary file not shown.

2
shangjian/XGL/App.config
Unescape Escape View File

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

1
shangjian/XGL/FormItem/Main.xaml
Unescape Escape View File

@ -349,6 +349,7 @@
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Name="shebei"
Margin="45,25"
HorizontalAlignment="Left"
VerticalAlignment="Center"

2
shangjian/XGL/FormItem/Main.xaml.cs
Unescape Escape View File

@ -98,6 +98,8 @@ namespace XGL.FormItem
}
else
{
tbDevice.Visibility = Visibility.Collapsed;
shebei.Visibility = Visibility.Collapsed;
DryingRoomUC dryingRoomUC = new DryingRoomUC();
this.Index.Content = dryingRoomUC;
}

73
shangjian/XGL/obj/x86/Debug/FormItem/Main.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84CC84ABB2A43A21EBE699A00C7C6E77D0AC1C22377A9346B423E5E739555B93"
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E38DC8F69DCC9829AAB04D5A881B058BA816B655E361D925290D51D85F8B778A"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -67,7 +67,15 @@ namespace XGL.FormItem {
#line hidden
#line 358 "..\..\..\..\FormItem\Main.xaml"
#line 352 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock shebei;
#line default
#line hidden
#line 359 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock tbDevice;
@ -75,7 +83,7 @@ namespace XGL.FormItem {
#line hidden
#line 382 "..\..\..\..\FormItem\Main.xaml"
#line 383 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label LbDeviceState;
@ -83,7 +91,7 @@ namespace XGL.FormItem {
#line hidden
#line 412 "..\..\..\..\FormItem\Main.xaml"
#line 413 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock tbOperator;
@ -91,7 +99,7 @@ namespace XGL.FormItem {
#line hidden
#line 423 "..\..\..\..\FormItem\Main.xaml"
#line 424 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid UpperStart2;
@ -99,7 +107,7 @@ namespace XGL.FormItem {
#line hidden
#line 430 "..\..\..\..\FormItem\Main.xaml"
#line 431 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Index;
@ -107,7 +115,7 @@ namespace XGL.FormItem {
#line hidden
#line 459 "..\..\..\..\FormItem\Main.xaml"
#line 460 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label LabDate;
@ -115,7 +123,7 @@ namespace XGL.FormItem {
#line hidden
#line 470 "..\..\..\..\FormItem\Main.xaml"
#line 471 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label LabTime;
@ -123,7 +131,7 @@ namespace XGL.FormItem {
#line hidden
#line 520 "..\..\..\..\FormItem\Main.xaml"
#line 521 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel DownStart;
@ -131,7 +139,7 @@ namespace XGL.FormItem {
#line hidden
#line 542 "..\..\..\..\FormItem\Main.xaml"
#line 543 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock myTb;
@ -139,7 +147,7 @@ namespace XGL.FormItem {
#line hidden
#line 545 "..\..\..\..\FormItem\Main.xaml"
#line 546 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Documents.Run btnText;
@ -147,7 +155,7 @@ namespace XGL.FormItem {
#line hidden
#line 557 "..\..\..\..\FormItem\Main.xaml"
#line 558 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label lbVersion;
@ -155,7 +163,7 @@ namespace XGL.FormItem {
#line hidden
#line 566 "..\..\..\..\FormItem\Main.xaml"
#line 567 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button notsos;
@ -163,7 +171,7 @@ namespace XGL.FormItem {
#line hidden
#line 569 "..\..\..\..\FormItem\Main.xaml"
#line 570 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnZXH;
@ -171,7 +179,7 @@ namespace XGL.FormItem {
#line hidden
#line 573 "..\..\..\..\FormItem\Main.xaml"
#line 574 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnFault;
@ -232,60 +240,63 @@ namespace XGL.FormItem {
this.tbLineCode = ((System.Windows.Controls.TextBlock)(target));
return;
case 5:
this.tbDevice = ((System.Windows.Controls.TextBlock)(target));
this.shebei = ((System.Windows.Controls.TextBlock)(target));
return;
case 6:
this.LbDeviceState = ((System.Windows.Controls.Label)(target));
this.tbDevice = ((System.Windows.Controls.TextBlock)(target));
return;
case 7:
this.tbOperator = ((System.Windows.Controls.TextBlock)(target));
this.LbDeviceState = ((System.Windows.Controls.Label)(target));
return;
case 8:
this.UpperStart2 = ((System.Windows.Controls.Grid)(target));
this.tbOperator = ((System.Windows.Controls.TextBlock)(target));
return;
case 9:
this.Index = ((System.Windows.Controls.ContentControl)(target));
this.UpperStart2 = ((System.Windows.Controls.Grid)(target));
return;
case 10:
this.LabDate = ((System.Windows.Controls.Label)(target));
this.Index = ((System.Windows.Controls.ContentControl)(target));
return;
case 11:
this.LabTime = ((System.Windows.Controls.Label)(target));
this.LabDate = ((System.Windows.Controls.Label)(target));
return;
case 12:
this.DownStart = ((System.Windows.Controls.StackPanel)(target));
this.LabTime = ((System.Windows.Controls.Label)(target));
return;
case 13:
this.myTb = ((System.Windows.Controls.TextBlock)(target));
this.DownStart = ((System.Windows.Controls.StackPanel)(target));
return;
case 14:
this.btnText = ((System.Windows.Documents.Run)(target));
this.myTb = ((System.Windows.Controls.TextBlock)(target));
return;
case 15:
this.lbVersion = ((System.Windows.Controls.Label)(target));
this.btnText = ((System.Windows.Documents.Run)(target));
return;
case 16:
this.lbVersion = ((System.Windows.Controls.Label)(target));
return;
case 17:
this.notsos = ((System.Windows.Controls.Button)(target));
#line 566 "..\..\..\..\FormItem\Main.xaml"
#line 567 "..\..\..\..\FormItem\Main.xaml"
this.notsos.Click += new System.Windows.RoutedEventHandler(this.notsos_Click);
#line default
#line hidden
return;
case 17:
case 18:
this.btnZXH = ((System.Windows.Controls.Button)(target));
#line 569 "..\..\..\..\FormItem\Main.xaml"
#line 570 "..\..\..\..\FormItem\Main.xaml"
this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
#line default
#line hidden
return;
case 18:
case 19:
this.btnFault = ((System.Windows.Controls.Button)(target));
#line 578 "..\..\..\..\FormItem\Main.xaml"
#line 579 "..\..\..\..\FormItem\Main.xaml"
this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
#line default

73
shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84CC84ABB2A43A21EBE699A00C7C6E77D0AC1C22377A9346B423E5E739555B93"
#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E38DC8F69DCC9829AAB04D5A881B058BA816B655E361D925290D51D85F8B778A"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -67,7 +67,15 @@ namespace XGL.FormItem {
#line hidden
#line 358 "..\..\..\..\FormItem\Main.xaml"
#line 352 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock shebei;
#line default
#line hidden
#line 359 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock tbDevice;
@ -75,7 +83,7 @@ namespace XGL.FormItem {
#line hidden
#line 382 "..\..\..\..\FormItem\Main.xaml"
#line 383 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label LbDeviceState;
@ -83,7 +91,7 @@ namespace XGL.FormItem {
#line hidden
#line 412 "..\..\..\..\FormItem\Main.xaml"
#line 413 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock tbOperator;
@ -91,7 +99,7 @@ namespace XGL.FormItem {
#line hidden
#line 423 "..\..\..\..\FormItem\Main.xaml"
#line 424 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Grid UpperStart2;
@ -99,7 +107,7 @@ namespace XGL.FormItem {
#line hidden
#line 430 "..\..\..\..\FormItem\Main.xaml"
#line 431 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.ContentControl Index;
@ -107,7 +115,7 @@ namespace XGL.FormItem {
#line hidden
#line 459 "..\..\..\..\FormItem\Main.xaml"
#line 460 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label LabDate;
@ -115,7 +123,7 @@ namespace XGL.FormItem {
#line hidden
#line 470 "..\..\..\..\FormItem\Main.xaml"
#line 471 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label LabTime;
@ -123,7 +131,7 @@ namespace XGL.FormItem {
#line hidden
#line 520 "..\..\..\..\FormItem\Main.xaml"
#line 521 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.StackPanel DownStart;
@ -131,7 +139,7 @@ namespace XGL.FormItem {
#line hidden
#line 542 "..\..\..\..\FormItem\Main.xaml"
#line 543 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock myTb;
@ -139,7 +147,7 @@ namespace XGL.FormItem {
#line hidden
#line 545 "..\..\..\..\FormItem\Main.xaml"
#line 546 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Documents.Run btnText;
@ -147,7 +155,7 @@ namespace XGL.FormItem {
#line hidden
#line 557 "..\..\..\..\FormItem\Main.xaml"
#line 558 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Label lbVersion;
@ -155,7 +163,7 @@ namespace XGL.FormItem {
#line hidden
#line 566 "..\..\..\..\FormItem\Main.xaml"
#line 567 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button notsos;
@ -163,7 +171,7 @@ namespace XGL.FormItem {
#line hidden
#line 569 "..\..\..\..\FormItem\Main.xaml"
#line 570 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnZXH;
@ -171,7 +179,7 @@ namespace XGL.FormItem {
#line hidden
#line 573 "..\..\..\..\FormItem\Main.xaml"
#line 574 "..\..\..\..\FormItem\Main.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button btnFault;
@ -232,60 +240,63 @@ namespace XGL.FormItem {
this.tbLineCode = ((System.Windows.Controls.TextBlock)(target));
return;
case 5:
this.tbDevice = ((System.Windows.Controls.TextBlock)(target));
this.shebei = ((System.Windows.Controls.TextBlock)(target));
return;
case 6:
this.LbDeviceState = ((System.Windows.Controls.Label)(target));
this.tbDevice = ((System.Windows.Controls.TextBlock)(target));
return;
case 7:
this.tbOperator = ((System.Windows.Controls.TextBlock)(target));
this.LbDeviceState = ((System.Windows.Controls.Label)(target));
return;
case 8:
this.UpperStart2 = ((System.Windows.Controls.Grid)(target));
this.tbOperator = ((System.Windows.Controls.TextBlock)(target));
return;
case 9:
this.Index = ((System.Windows.Controls.ContentControl)(target));
this.UpperStart2 = ((System.Windows.Controls.Grid)(target));
return;
case 10:
this.LabDate = ((System.Windows.Controls.Label)(target));
this.Index = ((System.Windows.Controls.ContentControl)(target));
return;
case 11:
this.LabTime = ((System.Windows.Controls.Label)(target));
this.LabDate = ((System.Windows.Controls.Label)(target));
return;
case 12:
this.DownStart = ((System.Windows.Controls.StackPanel)(target));
this.LabTime = ((System.Windows.Controls.Label)(target));
return;
case 13:
this.myTb = ((System.Windows.Controls.TextBlock)(target));
this.DownStart = ((System.Windows.Controls.StackPanel)(target));
return;
case 14:
this.btnText = ((System.Windows.Documents.Run)(target));
this.myTb = ((System.Windows.Controls.TextBlock)(target));
return;
case 15:
this.lbVersion = ((System.Windows.Controls.Label)(target));
this.btnText = ((System.Windows.Documents.Run)(target));
return;
case 16:
this.lbVersion = ((System.Windows.Controls.Label)(target));
return;
case 17:
this.notsos = ((System.Windows.Controls.Button)(target));
#line 566 "..\..\..\..\FormItem\Main.xaml"
#line 567 "..\..\..\..\FormItem\Main.xaml"
this.notsos.Click += new System.Windows.RoutedEventHandler(this.notsos_Click);
#line default
#line hidden
return;
case 17:
case 18:
this.btnZXH = ((System.Windows.Controls.Button)(target));
#line 569 "..\..\..\..\FormItem\Main.xaml"
#line 570 "..\..\..\..\FormItem\Main.xaml"
this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click);
#line default
#line hidden
return;
case 18:
case 19:
this.btnFault = ((System.Windows.Controls.Button)(target));
#line 578 "..\..\..\..\FormItem\Main.xaml"
#line 579 "..\..\..\..\FormItem\Main.xaml"
this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click);
#line default

BIN
shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml
View File

Binary file not shown.

2
shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C41C0F6408F571D0A43946E277603A73C43EE476D5D0A621C63C1A2021A4F740"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0A5FD97D2D955461CAEDBE69C6CAF78B96F3F157BD1BF36EC001B750938330D8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

2
shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C41C0F6408F571D0A43946E277603A73C43EE476D5D0A621C63C1A2021A4F740"
#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0A5FD97D2D955461CAEDBE69C6CAF78B96F3F157BD1BF36EC001B750938330D8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

BIN
shangjian/XGL/obj/x86/Debug/XGL.exe
View File

Binary file not shown.

BIN
shangjian/XGL/obj/x86/Debug/XGL.g.resources
View File

Binary file not shown.

BIN
shangjian/XGL/obj/x86/Debug/XGL.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save