Kaynağa Gözat

202511271702

YJ2025020924 4 ay önce
ebeveyn
işleme
a5d9ff43ea

+ 1 - 1
Model/Alarm.cs

@@ -205,7 +205,7 @@ namespace Model
             ("Application.A33_Encapsulation1_Auto.b_Error[4]" , "A33封装站加温过低" , true),
             ("Application.A33_Encapsulation1_Auto.b_Error[5]" , "A33封装站封合罩丢失" , true),
             ("Application.A33_Encapsulation1_Auto.b_Error[6]" , "A33封装站叠料报警" , true),
-            ("Application.A33_Encapsulation1_Auto.b_Error[7]" , "A33封装站封装站整租未到位" , true),
+            ("Application.A33_Encapsulation1_Auto.b_Error[7]" , "A33封装站整租未到位" , true),
             ("Application.A33_Encapsulation1_Auto.b_Error[8]" , "A33封装站盖膜余量少于两卷,及时更换" , true),
             ("Application.A33_Encapsulation1_Auto.b_Error[9]" , "A33封装站载带余量少于两卷,及时更换" , true),
             ("Application.A33_Encapsulation1_Auto.b_Error[10]" , "A33封装站模式2上下吸嘴有残料" , true),

+ 114 - 74
Model/Tips.cs

@@ -21,80 +21,120 @@ namespace Model
 
         public static List<(string Node,string Message,bool DesiredValue)>TipsNodeWithMessage = new List<(string Node, string Message, bool DesiredValue)>
         {
-            ("Application.Var_Hand_Turntable.b转盘轴使能状态" , "A00转盘轴未使能",false),
-            ("Application.GVL_A01_Auto.b下压轴使能状态" , "A00转盘轴未回原",false),
-            ("Application.GVL_A01_Auto.b分离轴使能状态" , "A00转盘轴未回原",false),
-            ("Application.GVL_A04_Auto.b下压轴使能状态" , "A04下压轴未使能",false),
-            ("Application.GVL_A04_Auto.b旋转轴使能状态" , "A04旋转轴未使能",false),
-            ("Application.GVL_A05_Auto.b下压轴使能状态" , "A05下压轴未使能",false),
-            ("Application.GVL_A06_Auto.b下压轴使能状态" , "A06下压轴未使能",false),
-            ("Application.GVL_A07_Auto.b下压轴使能状态" , "A07下压轴未使能",false),
-            ("Application.GVL_A08_Auto.b下压轴使能状态" , "A08下压轴未使能",false),
-            ("Application.GVL_A09_Auto.b料盒轴使能状态" , "A09料盒轴未使能",false),
-            ("Application.GVL_A10_Auto.b料盒轴使能状态" , "A10料盒轴未使能",false),
-            ("Application.GVL_A11_Auto.b下压轴使能状态" , "A11下压轴未使能",false),
-            ("Application.GVL_A15_Auto.b下压轴使能状态" , "A15下压轴未使能",false),
-            ("Application.GVL_A15_Auto.b热测升降轴使能状态" , "A15热测升降轴未使能",false),
-            ("Application.GVL_A15_Auto.b热测盘使能状态" , "A15热测盘未使能",false),
-            ("Application.GVL_A15_Auto.b翻转升降轴使能状态" , "A15翻转升降轴未使能",false),
-            ("Application.GVL_A15_Auto.b翻转轴使能状态" , "A15翻转轴未使能",false),
-            ("Application.GVL_A20_Auto.b下压轴使能状态" , "A20下压轴未使能",false),
-            ("Application.GVL_A21_Auto.b下压轴使能状态" , "A21下压轴未使能",false),
-            ("Application.GVL_A22_Auto.b料盒轴使能状态" , "A22料盒轴未使能",false),
-            ("Application.GVL_A23_Auto.b下压轴使能状态" , "A23下压轴未使能",false),
-            ("Application.GVL_A24_Auto.b下压轴使能状态" , "A24下压轴未使能",false),
-            ("Application.GVL_A24_Auto.b镭射盘使能状态" , "A24镭射盘未使能",false),
-            ("Application.GVL_A26_Auto.b下压轴使能状态" , "A26下压轴未使能",false),
-            ("Application.GVL_A27_Auto.b下压轴使能状态" , "A27下压轴未使能",false),
-            ("Application.GVL_A28_Auto.b下压轴使能状态" , "A28下压轴未使能",false),
-            ("Application.GVL_A28_Auto.b旋转轴使能状态" , "A28旋转轴未使能",false),
-            ("Application.GVL_A29_Auto.b下压轴使能状态" , "A29下压轴未使能",false),
-            ("Application.GVL_A30_Auto.b料盒轴使能状态" , "A30料盒轴未使能",false),
-            ("Application.GVL_A31_Auto.b下压轴使能状态" , "A31下压轴未使能",false),
-            ("Application.Var_Hand_A33_Encapsulation1.b下压轴使能状态" , "A33下压轴未使能",false),
-            ("Application.Var_Hand_A33_Encapsulation1.b封合轴使能状态" , "A33封合轴未使能",false),
-            ("Application.Var_Hand_A33_Encapsulation1.b走带轴使能状态" , "A33走带轴未使能",false),
-            ("Application.GVL_A35_Auto.b下压轴使能状态" , "A35下压轴未使能",false),
-            ("Application.Var_Hand_A37_Encapsulation2.b下压轴使能状态" , "A37下压轴未使能",false),
-            ("Application.Var_Hand_A37_Encapsulation2.b封合轴使能状态" , "A37封合轴未使能",false),
-            ("Application.Var_Hand_A37_Encapsulation2.b走带轴使能状态" , "A37走带轴未使能",false),
-
-
-            ("Application.Var_Hand_Turntable.b转盘轴回原完成" , "A00转盘轴未回原",false),
-            ("Application.GVL_A01_Auto.b下压轴回原完成" , "A01入料站下压轴未回原",false),
-            ("Application.GVL_A01_Auto.b分离轴回原完成" , "A01入料站分离轴未回原",false),
-            ("Application.GVL_A04_Auto.b下压轴回原完成" , "A04下压轴未回原",false),
-            ("Application.GVL_A04_Auto.b旋转轴回原完成" , "A04旋转轴未回原",false),
-            ("Application.GVL_A05_Auto.b下压轴回原完成" , "A05下压轴未回原",false),
-            ("Application.GVL_A06_Auto.b下压轴回原完成" , "A06下压轴未回原",false),
-            ("Application.GVL_A07_Auto.b下压轴回原完成" , "A07下压轴未回原",false),
-            ("Application.GVL_A08_Auto.b下压轴回原完成" , "A08下压轴未回原",false),
-            ("Application.GVL_A09_Auto.b料盒轴回原完成" , "A09料盒轴未回原",false),
-            ("Application.GVL_A10_Auto.b料盒轴回原完成" , "A10料盒轴未回原",false),
-            ("Application.GVL_A11_Auto.b下压轴回原完成" , "A11下压轴未回原",false),
-            ("Application.GVL_A15_Auto.b下压轴回原完成" , "A15下压轴未回原",false),
-            ("Application.GVL_A15_Auto.b热测升降轴回原完成" , "A15热测升降轴未回原",false),
-            ("Application.GVL_A15_Auto.b热测盘回原完成" , "A15热测盘未回原",false),
-            ("Application.GVL_A15_Auto.b翻转升降轴回原完成" , "A15翻转升降轴未回原",false),
-            ("Application.GVL_A15_Auto.b翻转轴回原完成" , "A15翻转轴未回原",false),
-            ("Application.GVL_A20_Auto.b下压轴回原完成" , "A20下压轴未回原",false),
-            ("Application.GVL_A21_Auto.b下压轴回原完成" , "A21下压轴未回原",false),
-            ("Application.GVL_A22_Auto.b料盒轴回原完成" , "A22料盒轴未回原",false),
-            ("Application.GVL_A23_Auto.b下压轴回原完成" , "A23下压轴未回原",false),
-            ("Application.GVL_A24_Auto.b下压轴回原完成" , "A24下压轴未回原",false),
-            ("Application.GVL_A24_Auto.b镭射盘回原完成" , "A24镭射盘未回原",false),
-            ("Application.GVL_A26_Auto.b下压轴回原完成" , "A26下压轴未回原",false),
-            ("Application.GVL_A27_Auto.b下压轴回原完成" , "A27下压轴未回原",false),
-            ("Application.GVL_A28_Auto.b下压轴回原完成" , "A28下压轴未回原",false),
-            ("Application.GVL_A28_Auto.b旋转轴回原完成" , "A28旋转轴未回原",false),
-            ("Application.GVL_A29_Auto.b下压轴回原完成" , "A29下压轴未回原",false),
-            ("Application.GVL_A30_Auto.b料盒轴回原完成" , "A30料盒轴未回原",false),
-            ("Application.GVL_A31_Auto.b下压轴回原完成" , "A31下压轴未回原",false),
-            ("Application.Var_Hand_A33_Encapsulation1.b下压轴回原完成" , "A33下压轴未回原",false),
-            ("Application.Var_Hand_A33_Encapsulation1.b封合轴回原完成" , "A33封合轴未回原",false),
-            ("Application.GVL_A35_Auto.b下压轴回原完成" , "A35下压轴未回原",false),
-            ("Application.Var_Hand_A37_Encapsulation2.b下压轴回原完成" , "A37下压轴未回原",false),
-            ("Application.Var_Hand_A37_Encapsulation2.b封合轴回原完成" , "A37封合轴未回原",false),
+            ("Application.A00_Turntable_Manual.b转盘轴使能状态" , "A00转盘轴未使能",false),
+
+            ("Application.A01_FeedInStation_Auto.b下压轴使能状态" , "A01入料站下压轴未使能",false),
+            ("Application.A01_FeedInStation_Auto.b分离轴使能状态" , "A01入料站分离轴未使能",false),
+
+            ("Application.A02_TestStation_Auto.b下压轴使能状态" , "A02电测站下压轴未使能",false),
+
+            ("Application.A03_DirectionTrun_Auto.b下压轴使能状态" , "A03转向站1下压轴未使能",false),
+            ("Application.A03_DirectionTrun_Auto.b旋转轴使能状态" , "A03转向站1旋转轴未使能",false),
+
+            ("Application.A04_TestStation_Auto.b下压轴使能状态" , "A04测试站1下压轴未使能",false),
+
+            ("Application.A05_TestStation_Auto.b下压轴使能状态" , "A05测试站2下压轴未使能",false),
+
+            ("Application.A06_TestStation_Auto.b下压轴使能状态" , "A06测试站3下压轴未使能",false),
+
+            ("Application.A07_TestStation_Auto.b下压轴使能状态" , "A07测试站4下压轴未使能",false),
+
+            ("Application.A08_TestNGContainer_Auto.b料盒轴使能状态" , "A08四料盒1料盒轴未使能",false),
+
+            ("Application.A09_TestNGContainer_Auto.b料盒轴使能状态" , "A09四料盒2料盒轴未使能",false),
+
+            ("Application.A10_LocateStation_Auto.b下压轴使能状态" , "A10定位站1下压轴未使能",false),
+
+            ("Application.A14_ThermalTest_Auto.b下压轴使能状态" , "A14热测站下压轴未使能",false),
+            ("Application.A14_ThermalTest_Auto.b热测升降轴使能状态" , "A14热测站热测升降轴未使能",false),
+            ("Application.A14_ThermalTest_Auto.b热测盘使能状态" , "A14热测站热测盘未使能",false),
+            ("Application.A14_ThermalTest_Auto.b翻转升降轴使能状态" , "A14热测站翻转升降轴未使能",false),
+            ("Application.A14_ThermalTest_Auto.b翻转轴使能状态" , "A14热测站翻转轴未使能",false),
+
+            ("Application.A18_CoolingStation_Auto.b下压轴使能状态" , "A18降温站1下压轴未使能",false),
+
+            ("Application.A19_CoolingStation_Auto.b下压轴使能状态" , "A19降温站2下压轴未使能",false),
+
+            ("Application.A20_TestNGContainer_Auto.b料盒轴使能状态" , "A20四料盒3料盒轴未使能",false),
+
+            ("Application.A21_LocateStation_Auto.b下压轴使能状态" , "A21定位站2下压轴未使能",false),
+
+            ("Application.A23_LaserMarking_Auto.b下压轴使能状态" , "A24镭射站下压轴未使能",false),
+            ("Application.A23_LaserMarking_Auto.b镭射盘使能状态" , "A24镭射站镭射盘未使能",false),
+
+            ("Application.A25_TestStation_Auto.b下压轴使能状态" , "A25测试站5下压轴未使能",false),
+
+            ("Application.A26_DirectionTurn_Auto.b下压轴使能状态" , "A26转向站1下压轴未使能",false),
+            ("Application.A26_DirectionTrun_Auto.b旋转轴使能状态" , "A26转向站1旋转轴未使能",false),
+
+            ("Application.A27_3DTestStation_Auto.b下压轴使能状态" , "A29 3D检测站下压轴未使能",false),
+
+            ("Application.A28_TestNGContainer_Auto.b料盒轴使能状态" , "A28四料盒4料盒轴未使能",false),
+
+            ("Application.A29_TestNGContainer_Auto.b料盒轴使能状态" , "A29四料盒5料盒轴未使能",false),
+
+            ("Application.A30_LocateStation_Auto.b下压轴使能状态" , "A30封装前定位站下压轴未使能",false),
+
+            ("Application.A33_Encapsulation1_Manual.b下压轴使能状态" , "A33封装站下压轴未使能",false),
+            ("Application.A33_Encapsulation1_Manual.b封合轴使能状态" , "A33封装站封合轴未使能",false),
+            ("Application.A33_Encapsulation1_Manual.b走带轴使能状态" , "A33封装站走带轴未使能",false),
+
+            ("Application.A00_Turntable_Manual.b转盘轴回原完成" , "A00转盘轴未回原",false),
+
+            ("Application.A01_FeedInStation_Auto.b下压轴回原完成" , "A01入料站下压轴未回原",false),
+            ("Application.A01_FeedInStation_Auto.b分离轴回原完成" , "A01入料站分离轴未回原",false),
+
+            ("Application.A02_TestStation_Auto.b下压轴回原完成" , "A02电测站下压轴未回原",false),
+
+            ("Application.A03_DirectionTrun_Auto.b下压轴回原完成" , "A03转向站1下压轴未回原",false),
+            ("Application.A03_DirectionTrun_Auto.b旋转轴回原完成" , "A03转向站1旋转轴未回原",false),
+
+            ("Application.A04_TestStation_Auto.b下压轴回原完成" , "A04测试站1下压轴未回原",false),
+
+            ("Application.A05_TestStation_Auto.b下压轴回原完成" , "A05测试站2下压轴未回原",false),
+
+            ("Application.A06_TestStation_Auto.b下压轴回原完成" , "A06测试站3下压轴未回原",false),
+
+            ("Application.A07_TestStation_Auto.b下压轴回原完成" , "A07测试站4下压轴未回原",false),
+
+            ("Application.A08_TestNGContainer_Auto.b料盒轴回原完成" , "A08四料盒1料盒轴未回原",false),
+
+            ("Application.A09_TestNGContainer_Auto.b料盒轴回原完成" , "A08四料盒2料盒轴未回原",false),
+
+            ("Application.A10_LocateStation_Auto.b下压轴回原完成" , "A10定位站1下压轴未回原",false),
+
+            ("Application.A14_ThermalTest_Auto.b下压轴回原完成" , "A15热测站下压轴未回原",false),
+            ("Application.A14_ThermalTest_Auto.b热测升降轴回原完成" , "A15热测站热测升降轴未回原",false),
+            ("Application.A14_ThermalTest_Auto.b热测盘回原完成" , "A15热测站热测盘未回原",false),
+            ("Application.A14_ThermalTest_Auto.b翻转升降轴回原完成" , "A15热测站翻转升降轴未回原",false),
+            ("Application.A14_ThermalTest_Auto.b翻转轴回原完成" , "A15热测站翻转轴未回原",false),
+
+            ("Application.A18_CoolingStation_Auto.b下压轴回原完成" , "A18降温站1下压轴未回原",false),
+
+            ("Application.A19_CoolingStation_Auto.b下压轴回原完成" , "A19降温站2下压轴未回原",false),
+
+            ("Application.A20_TestNGContainer_Auto.b料盒轴回原完成" , "A20四料盒3料盒轴未回原",false),
+
+            ("Application.A21_LocateStation_Auto.b下压轴回原完成" , "A21定位站2下压轴未回原",false),
+
+            ("Application.A23_LaserMarking_Auto.b下压轴回原完成" , "A24镭射站下压轴未回原",false),
+            ("Application.A23_LaserMarking_Auto.b镭射盘回原完成" , "A24镭射站镭射盘未回原",false),
+
+            ("Application.A25_TestStation_Auto.b下压轴回原完成" , "A25测试站5下压轴未回原",false),
+
+            ("Application.A26_DirectionTurn_Auto.b下压轴回原完成" , "A26转向站2下压轴未回原",false),
+            ("Application.A26_DirectionTurn_Auto.b旋转轴回原完成" , "A26转向站2旋转轴未回原",false),
+
+            ("Application.A27_3DTestStation_Auto.b下压轴回原完成" , "A27 3D测试站下压轴未回原",false),
+
+            ("Application.A28_TestNGContainer_Auto.b料盒轴回原完成" , "A28四料盒4料盒轴未回原",false),
+            ("Application.A29_TestNGContainer_Auto.b料盒轴回原完成" , "A29四料盒5料盒轴未回原",false),
+
+            ("Application.A30_LocateStation_Auto.b下压轴回原完成" , "A30封装前定位站下压轴未回原",false),
+
+            ("Application.A33_Encapsulation1_Manual.b下压轴回原完成" , "A33封装站下压轴未回原",false),
+            ("Application.A33_Encapsulation1_Manual.b封合轴回原完成" , "A33封装站封合轴未回原",false),
+            ("Application.A33_Encapsulation1_Manual.b走带轴回原完成" , "A33封装站走带轴未回原",false),
         };
     }
     public class TipsDisplay

+ 3 - 3
YangjieTester/MainForm.Designer.cs

@@ -104,11 +104,11 @@
             // 
             // osA33走带计数清空弹窗选择
             // 
-            this.osA33走带计数清空弹窗选择.EnsureNode1 = new Node("Application.Var_Hand_A33_Encapsulation1.确认走带计数清空", NodeType.BOOL, "HMIset");
-            this.osA33走带计数清空弹窗选择.EnsureNode2 = new Node("Application.Var_Hand_A33_Encapsulation1.取消走带计数清空", NodeType.BOOL, "HMIset");
+            this.osA33走带计数清空弹窗选择.EnsureNode1 = new Node("Application.A33_Encapsulation1_Manual.确认走带计数清空", NodeType.BOOL, "HMIset");
+            this.osA33走带计数清空弹窗选择.EnsureNode2 = new Node("Application.A33_Encapsulation1_Manual.取消走带计数清空", NodeType.BOOL, "HMIset");
             this.osA33走带计数清空弹窗选择.FormCaption = "询问";
             this.osA33走带计数清空弹窗选择.Message = "此操作需先清空走带计数,确认清空?";
-            this.osA33走带计数清空弹窗选择.ReadNode = new Node("Application.Var_Hand_A33_Encapsulation1.走带计数清空弹窗", NodeType.BOOL, "HMIscreen");
+            this.osA33走带计数清空弹窗选择.ReadNode = new Node("Application.A33_Encapsulation1_Manual.走带计数清空弹窗", NodeType.BOOL, "HMIscreen");
             this.osA33走带计数清空弹窗选择.Text1 = "确认";
             this.osA33走带计数清空弹窗选择.Text2 = "取消";
             // 

Dosya farkı çok büyük olduğundan ihmal edildi
+ 264 - 207
YangjieTester/主界面/TestCountForm.Designer.cs


+ 123 - 36
YangjieTester/主界面/TestModeSettingForm.Designer.cs

@@ -55,6 +55,10 @@
             this.txt热测仿真值 = new PlcUiControl.PlcUiNumberInput();
             this.uiLabel5 = new Sunny.UI.UILabel();
             this.btn热测仿真 = new PlcUiControl.PlcUiButton();
+            this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.plcUiNumberInput1 = new PlcUiControl.PlcUiNumberInput();
+            this.uiLabel6 = new Sunny.UI.UILabel();
+            this.plcUiButton1 = new PlcUiControl.PlcUiButton();
             this.uiTabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.tabPage2.SuspendLayout();
@@ -62,6 +66,7 @@
             this.tabPage4.SuspendLayout();
             this.tabPage5.SuspendLayout();
             this.tabPage6.SuspendLayout();
+            this.tabPage7.SuspendLayout();
             this.SuspendLayout();
             // 
             // cob测试模式
@@ -82,13 +87,13 @@
             this.cob测试模式.MinimumSize = new System.Drawing.Size(63, 0);
             this.cob测试模式.Name = "cob测试模式";
             this.cob测试模式.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cob测试模式.ReadNode = new Node("Application.GVL_A05_Auto.ui工作模式", NodeType.UINT, "工作模式:=1串测/2并测——HMIset");
+            this.cob测试模式.ReadNode = new Node("Application.A04_TestStation_Auto.ui工作模式", NodeType.UDINT, "工作模式:=1串测/2并测——HMIset");
             this.cob测试模式.Size = new System.Drawing.Size(125, 29);
             this.cob测试模式.SymbolSize = 24;
             this.cob测试模式.TabIndex = 29;
             this.cob测试模式.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.cob测试模式.Watermark = "";
-            this.cob测试模式.WriteNode = new Node("Application.GVL_A05_Auto.ui工作模式", NodeType.UINT, "工作模式:=1串测/2并测——HMIset");
+            this.cob测试模式.WriteNode = new Node("Application.A04_TestStation_Auto.ui工作模式", NodeType.UDINT, "工作模式:=1串测/2并测——HMIset");
             // 
             // uiLabel15
             // 
@@ -97,12 +102,13 @@
             this.uiLabel15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             this.uiLabel15.Location = new System.Drawing.Point(3, 52);
             this.uiLabel15.Name = "uiLabel15";
-            this.uiLabel15.Size = new System.Drawing.Size(111, 16);
+            this.uiLabel15.Size = new System.Drawing.Size(87, 16);
             this.uiLabel15.TabIndex = 28;
-            this.uiLabel15.Text = "测试站1~4模式";
+            this.uiLabel15.Text = "测试站模式";
             // 
             // uiTabControl1
             // 
+            this.uiTabControl1.Controls.Add(this.tabPage7);
             this.uiTabControl1.Controls.Add(this.tabPage1);
             this.uiTabControl1.Controls.Add(this.tabPage2);
             this.uiTabControl1.Controls.Add(this.tabPage3);
@@ -116,7 +122,7 @@
             this.uiTabControl1.MainPage = "";
             this.uiTabControl1.Name = "uiTabControl1";
             this.uiTabControl1.SelectedIndex = 0;
-            this.uiTabControl1.Size = new System.Drawing.Size(502, 235);
+            this.uiTabControl1.Size = new System.Drawing.Size(566, 235);
             this.uiTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl1.TabIndex = 30;
             this.uiTabControl1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -128,7 +134,7 @@
             this.tabPage1.Controls.Add(this.btn测试1仿真);
             this.tabPage1.Location = new System.Drawing.Point(0, 40);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(502, 195);
+            this.tabPage1.Size = new System.Drawing.Size(537, 195);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "测试1";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -146,14 +152,14 @@
             this.txt测试1仿真值.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试1仿真值.Name = "txt测试1仿真值";
             this.txt测试1仿真值.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试1仿真值.ReadNode = new Node("Application.GVL_A05_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试1仿真值.ReadNode = new Node("Application.A04_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             this.txt测试1仿真值.ShowText = false;
             this.txt测试1仿真值.Size = new System.Drawing.Size(72, 27);
             this.txt测试1仿真值.TabIndex = 193;
             this.txt测试1仿真值.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试1仿真值.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试1仿真值.Watermark = "";
-            this.txt测试1仿真值.WriteNode = new Node("Application.GVL_A05_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试1仿真值.WriteNode = new Node("Application.A04_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             // 
             // uiLabel47
             // 
@@ -188,13 +194,13 @@
             this.btn测试1仿真.OnColor = System.Drawing.Color.Green;
             this.btn测试1仿真.OnSymbol = 61452;
             this.btn测试1仿真.OnText = "仿真测试开";
-            this.btn测试1仿真.ReadNode = new Node("Application.GVL_A05_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试1仿真.ReadNode = new Node("Application.A04_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             this.btn测试1仿真.Size = new System.Drawing.Size(150, 42);
             this.btn测试1仿真.Symbol = 61453;
             this.btn测试1仿真.TabIndex = 191;
             this.btn测试1仿真.Text = "仿真测试关";
             this.btn测试1仿真.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试1仿真.WriteNode = new Node("Application.GVL_A05_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试1仿真.WriteNode = new Node("Application.A04_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             // 
             // tabPage2
             // 
@@ -203,7 +209,7 @@
             this.tabPage2.Controls.Add(this.btn测试2仿真);
             this.tabPage2.Location = new System.Drawing.Point(0, 40);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(502, 195);
+            this.tabPage2.Size = new System.Drawing.Size(537, 195);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "测试2";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -221,14 +227,14 @@
             this.txt测试2仿真值.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试2仿真值.Name = "txt测试2仿真值";
             this.txt测试2仿真值.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试2仿真值.ReadNode = new Node("Application.GVL_A06_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试2仿真值.ReadNode = new Node("Application.A05_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             this.txt测试2仿真值.ShowText = false;
             this.txt测试2仿真值.Size = new System.Drawing.Size(72, 27);
             this.txt测试2仿真值.TabIndex = 196;
             this.txt测试2仿真值.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试2仿真值.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试2仿真值.Watermark = "";
-            this.txt测试2仿真值.WriteNode = new Node("Application.GVL_A06_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试2仿真值.WriteNode = new Node("Application.A05_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             // 
             // uiLabel1
             // 
@@ -263,13 +269,13 @@
             this.btn测试2仿真.OnColor = System.Drawing.Color.Green;
             this.btn测试2仿真.OnSymbol = 61452;
             this.btn测试2仿真.OnText = "仿真测试开";
-            this.btn测试2仿真.ReadNode = new Node("Application.GVL_A06_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试2仿真.ReadNode = new Node("Application.A05_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             this.btn测试2仿真.Size = new System.Drawing.Size(150, 42);
             this.btn测试2仿真.Symbol = 61453;
             this.btn测试2仿真.TabIndex = 194;
             this.btn测试2仿真.Text = "仿真测试关";
             this.btn测试2仿真.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试2仿真.WriteNode = new Node("Application.GVL_A06_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试2仿真.WriteNode = new Node("Application.A05_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             // 
             // tabPage3
             // 
@@ -278,7 +284,7 @@
             this.tabPage3.Controls.Add(this.btn测试3仿真);
             this.tabPage3.Location = new System.Drawing.Point(0, 40);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(502, 195);
+            this.tabPage3.Size = new System.Drawing.Size(537, 195);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "测试3";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -296,14 +302,14 @@
             this.txt测试3仿真值.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试3仿真值.Name = "txt测试3仿真值";
             this.txt测试3仿真值.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试3仿真值.ReadNode = new Node("Application.GVL_A07_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试3仿真值.ReadNode = new Node("Application.A06_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             this.txt测试3仿真值.ShowText = false;
             this.txt测试3仿真值.Size = new System.Drawing.Size(72, 27);
             this.txt测试3仿真值.TabIndex = 196;
             this.txt测试3仿真值.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试3仿真值.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试3仿真值.Watermark = "";
-            this.txt测试3仿真值.WriteNode = new Node("Application.GVL_A07_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试3仿真值.WriteNode = new Node("Application.A06_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             // 
             // uiLabel2
             // 
@@ -338,13 +344,13 @@
             this.btn测试3仿真.OnColor = System.Drawing.Color.Green;
             this.btn测试3仿真.OnSymbol = 61452;
             this.btn测试3仿真.OnText = "仿真测试开";
-            this.btn测试3仿真.ReadNode = new Node("Application.GVL_A07_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试3仿真.ReadNode = new Node("Application.A06_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             this.btn测试3仿真.Size = new System.Drawing.Size(150, 42);
             this.btn测试3仿真.Symbol = 61453;
             this.btn测试3仿真.TabIndex = 194;
             this.btn测试3仿真.Text = "仿真测试关";
             this.btn测试3仿真.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试3仿真.WriteNode = new Node("Application.GVL_A07_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试3仿真.WriteNode = new Node("Application.A06_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             // 
             // tabPage4
             // 
@@ -353,7 +359,7 @@
             this.tabPage4.Controls.Add(this.btn测试4仿真);
             this.tabPage4.Location = new System.Drawing.Point(0, 40);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(502, 195);
+            this.tabPage4.Size = new System.Drawing.Size(566, 195);
             this.tabPage4.TabIndex = 3;
             this.tabPage4.Text = "测试4";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -371,14 +377,14 @@
             this.txt测试4仿真值.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试4仿真值.Name = "txt测试4仿真值";
             this.txt测试4仿真值.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试4仿真值.ReadNode = new Node("Application.GVL_A08_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试4仿真值.ReadNode = new Node("Application.A07_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             this.txt测试4仿真值.ShowText = false;
             this.txt测试4仿真值.Size = new System.Drawing.Size(72, 27);
             this.txt测试4仿真值.TabIndex = 196;
             this.txt测试4仿真值.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试4仿真值.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试4仿真值.Watermark = "";
-            this.txt测试4仿真值.WriteNode = new Node("Application.GVL_A08_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试4仿真值.WriteNode = new Node("Application.A07_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             // 
             // uiLabel3
             // 
@@ -413,13 +419,13 @@
             this.btn测试4仿真.OnColor = System.Drawing.Color.Green;
             this.btn测试4仿真.OnSymbol = 61452;
             this.btn测试4仿真.OnText = "仿真测试开";
-            this.btn测试4仿真.ReadNode = new Node("Application.GVL_A08_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试4仿真.ReadNode = new Node("Application.A07_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             this.btn测试4仿真.Size = new System.Drawing.Size(150, 42);
             this.btn测试4仿真.Symbol = 61453;
             this.btn测试4仿真.TabIndex = 194;
             this.btn测试4仿真.Text = "仿真测试关";
             this.btn测试4仿真.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试4仿真.WriteNode = new Node("Application.GVL_A08_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试4仿真.WriteNode = new Node("Application.A07_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             // 
             // tabPage5
             // 
@@ -428,7 +434,7 @@
             this.tabPage5.Controls.Add(this.btn测试5仿真);
             this.tabPage5.Location = new System.Drawing.Point(0, 40);
             this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Size = new System.Drawing.Size(502, 195);
+            this.tabPage5.Size = new System.Drawing.Size(566, 195);
             this.tabPage5.TabIndex = 4;
             this.tabPage5.Text = "测试5";
             this.tabPage5.UseVisualStyleBackColor = true;
@@ -446,14 +452,14 @@
             this.txt测试5仿真值.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试5仿真值.Name = "txt测试5仿真值";
             this.txt测试5仿真值.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试5仿真值.ReadNode = new Node("Application.GVL_A27_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试5仿真值.ReadNode = new Node("Application.A25_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             this.txt测试5仿真值.ShowText = false;
             this.txt测试5仿真值.Size = new System.Drawing.Size(72, 27);
             this.txt测试5仿真值.TabIndex = 196;
             this.txt测试5仿真值.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试5仿真值.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试5仿真值.Watermark = "";
-            this.txt测试5仿真值.WriteNode = new Node("Application.GVL_A27_Auto.b_仿真测试结果", NodeType.UINT, null);
+            this.txt测试5仿真值.WriteNode = new Node("Application.A25_TestStation_Auto.b_仿真测试结果", NodeType.BOOL, null);
             // 
             // uiLabel4
             // 
@@ -488,13 +494,13 @@
             this.btn测试5仿真.OnColor = System.Drawing.Color.Green;
             this.btn测试5仿真.OnSymbol = 61452;
             this.btn测试5仿真.OnText = "仿真测试开";
-            this.btn测试5仿真.ReadNode = new Node("Application.GVL_A27_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试5仿真.ReadNode = new Node("Application.A25_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             this.btn测试5仿真.Size = new System.Drawing.Size(150, 42);
             this.btn测试5仿真.Symbol = 61453;
             this.btn测试5仿真.TabIndex = 194;
             this.btn测试5仿真.Text = "仿真测试关";
             this.btn测试5仿真.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试5仿真.WriteNode = new Node("Application.GVL_A27_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.btn测试5仿真.WriteNode = new Node("Application.A25_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             // 
             // tabPage6
             // 
@@ -503,7 +509,7 @@
             this.tabPage6.Controls.Add(this.btn热测仿真);
             this.tabPage6.Location = new System.Drawing.Point(0, 40);
             this.tabPage6.Name = "tabPage6";
-            this.tabPage6.Size = new System.Drawing.Size(502, 195);
+            this.tabPage6.Size = new System.Drawing.Size(566, 195);
             this.tabPage6.TabIndex = 5;
             this.tabPage6.Text = "热测";
             this.tabPage6.UseVisualStyleBackColor = true;
@@ -521,14 +527,14 @@
             this.txt热测仿真值.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt热测仿真值.Name = "txt热测仿真值";
             this.txt热测仿真值.Padding = new System.Windows.Forms.Padding(5);
-            this.txt热测仿真值.ReadNode = new Node("Application.GVL_A15_Auto.ui热测仿真结果", NodeType.UINT, null);
+            this.txt热测仿真值.ReadNode = new Node("Application.A14_ThermalTest_Auto.ui热测仿真结果", NodeType.UDINT, null);
             this.txt热测仿真值.ShowText = false;
             this.txt热测仿真值.Size = new System.Drawing.Size(72, 27);
             this.txt热测仿真值.TabIndex = 199;
             this.txt热测仿真值.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt热测仿真值.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt热测仿真值.Watermark = "";
-            this.txt热测仿真值.WriteNode = new Node("Application.GVL_A15_Auto.ui热测仿真结果", NodeType.UINT, null);
+            this.txt热测仿真值.WriteNode = new Node("Application.A14_ThermalTest_Auto.ui热测仿真结果", NodeType.UDINT, null);
             // 
             // uiLabel5
             // 
@@ -563,18 +569,93 @@
             this.btn热测仿真.OnColor = System.Drawing.Color.Green;
             this.btn热测仿真.OnSymbol = 61452;
             this.btn热测仿真.OnText = "仿真测试开";
-            this.btn热测仿真.ReadNode = new Node("Application.GVL_A15_Auto.b热测仿真开关", NodeType.BOOL, null);
+            this.btn热测仿真.ReadNode = new Node("Application.A14_ThermalTest_Auto.b热测仿真开关", NodeType.BOOL, null);
             this.btn热测仿真.Size = new System.Drawing.Size(150, 42);
             this.btn热测仿真.Symbol = 61453;
             this.btn热测仿真.TabIndex = 197;
             this.btn热测仿真.Text = "仿真测试关";
             this.btn热测仿真.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn热测仿真.WriteNode = new Node("Application.GVL_A15_Auto.b热测仿真开关", NodeType.BOOL, null);
+            this.btn热测仿真.WriteNode = new Node("Application.A14_ThermalTest_Auto.b热测仿真开关", NodeType.BOOL, null);
+            // 
+            // tabPage7
+            // 
+            this.tabPage7.Controls.Add(this.plcUiNumberInput1);
+            this.tabPage7.Controls.Add(this.uiLabel6);
+            this.tabPage7.Controls.Add(this.plcUiButton1);
+            this.tabPage7.Location = new System.Drawing.Point(0, 40);
+            this.tabPage7.Name = "tabPage7";
+            this.tabPage7.Size = new System.Drawing.Size(537, 195);
+            this.tabPage7.TabIndex = 6;
+            this.tabPage7.Text = "电测";
+            this.tabPage7.UseVisualStyleBackColor = true;
+            // 
+            // plcUiNumberInput1
+            // 
+            this.plcUiNumberInput1.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.plcUiNumberInput1.DisabilityTriggerNode = null;
+            this.plcUiNumberInput1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiNumberInput1.Gain = 1D;
+            this.plcUiNumberInput1.IntegerDigits = 0;
+            this.plcUiNumberInput1.InvisibilityTriggerNode = null;
+            this.plcUiNumberInput1.Location = new System.Drawing.Point(81, 98);
+            this.plcUiNumberInput1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.plcUiNumberInput1.MinimumSize = new System.Drawing.Size(1, 16);
+            this.plcUiNumberInput1.Name = "plcUiNumberInput1";
+            this.plcUiNumberInput1.Padding = new System.Windows.Forms.Padding(5);
+            this.plcUiNumberInput1.ReadNode = new Node("Application.A02_TestStation_Auto.b_仿真测试结果", NodeType.UDINT, null);
+            this.plcUiNumberInput1.ShowText = false;
+            this.plcUiNumberInput1.Size = new System.Drawing.Size(72, 27);
+            this.plcUiNumberInput1.TabIndex = 196;
+            this.plcUiNumberInput1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.plcUiNumberInput1.Type = Sunny.UI.UITextBox.UIEditType.Integer;
+            this.plcUiNumberInput1.Watermark = "";
+            this.plcUiNumberInput1.WriteNode = new Node("Application.A02_TestStation_Auto.b_仿真测试结果", NodeType.UDINT, null);
+            // 
+            // uiLabel6
+            // 
+            this.uiLabel6.AutoSize = true;
+            this.uiLabel6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.uiLabel6.Location = new System.Drawing.Point(3, 104);
+            this.uiLabel6.Name = "uiLabel6";
+            this.uiLabel6.Size = new System.Drawing.Size(71, 16);
+            this.uiLabel6.TabIndex = 195;
+            this.uiLabel6.Text = "仿真结果";
+            // 
+            // plcUiButton1
+            // 
+            this.plcUiButton1.ButtonType = PlcUiControl.ButtonType.交替型;
+            this.plcUiButton1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.plcUiButton1.DisabilityTriggerNode = null;
+            this.plcUiButton1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+            this.plcUiButton1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+            this.plcUiButton1.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+            this.plcUiButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiButton1.InvisibilityTriggerNode = null;
+            this.plcUiButton1.Location = new System.Drawing.Point(3, 33);
+            this.plcUiButton1.Maximum = 0D;
+            this.plcUiButton1.Minimum = 0D;
+            this.plcUiButton1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.plcUiButton1.Name = "plcUiButton1";
+            this.plcUiButton1.NeedUserEnsure = false;
+            this.plcUiButton1.OffColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+            this.plcUiButton1.OffSymbol = 61453;
+            this.plcUiButton1.OffText = "仿真测试关";
+            this.plcUiButton1.OnColor = System.Drawing.Color.Green;
+            this.plcUiButton1.OnSymbol = 61452;
+            this.plcUiButton1.OnText = "仿真测试开";
+            this.plcUiButton1.ReadNode = new Node("Application.A02_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
+            this.plcUiButton1.Size = new System.Drawing.Size(150, 42);
+            this.plcUiButton1.Symbol = 61453;
+            this.plcUiButton1.TabIndex = 194;
+            this.plcUiButton1.Text = "仿真测试关";
+            this.plcUiButton1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiButton1.WriteNode = new Node("Application.A02_TestStation_Auto.b_仿真测试", NodeType.BOOL, null);
             // 
             // TestModeSettingForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(508, 321);
+            this.ClientSize = new System.Drawing.Size(573, 321);
             this.Controls.Add(this.uiTabControl1);
             this.Controls.Add(this.cob测试模式);
             this.Controls.Add(this.uiLabel15);
@@ -596,6 +677,8 @@
             this.tabPage5.PerformLayout();
             this.tabPage6.ResumeLayout(false);
             this.tabPage6.PerformLayout();
+            this.tabPage7.ResumeLayout(false);
+            this.tabPage7.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -631,5 +714,9 @@
         private PlcUiControl.PlcUiNumberInput txt热测仿真值;
         private Sunny.UI.UILabel uiLabel5;
         private PlcUiControl.PlcUiButton btn热测仿真;
+        private System.Windows.Forms.TabPage tabPage7;
+        private PlcUiControl.PlcUiNumberInput plcUiNumberInput1;
+        private Sunny.UI.UILabel uiLabel6;
+        private PlcUiControl.PlcUiButton plcUiButton1;
     }
 }

+ 165 - 125
YangjieTester/主界面/TestNGStopSettingForm.Designer.cs

@@ -32,8 +32,6 @@
             this.btn封装1打标复检影像NG停止 = new PlcUiControl.PlcUiButton();
             this.btn3D影像NG停止 = new PlcUiControl.PlcUiButton();
             this.btn封装1封合后影像NG停止 = new PlcUiControl.PlcUiButton();
-            this.btn封装2封合后影像NG停止 = new PlcUiControl.PlcUiButton();
-            this.btn封装2打标复检影像NG停止 = new PlcUiControl.PlcUiButton();
             this.btn测试1NG停止屏蔽 = new PlcUiControl.PlcUiButton();
             this.btn测试2NG停止 = new PlcUiControl.PlcUiButton();
             this.btn测试3NG停止 = new PlcUiControl.PlcUiButton();
@@ -53,6 +51,10 @@
             this.txt热测停止Bin号 = new PlcUiControl.PlcUiNumberInput();
             this.uiLabel5 = new Sunny.UI.UILabel();
             this.uiLabel6 = new Sunny.UI.UILabel();
+            this.plcUiNumberInput1 = new PlcUiControl.PlcUiNumberInput();
+            this.uiLabel7 = new Sunny.UI.UILabel();
+            this.plcUiButton1 = new PlcUiControl.PlcUiButton();
+            this.plcUiButton2 = new PlcUiControl.PlcUiButton();
             this.SuspendLayout();
             // 
             // btn打标影像NG停止
@@ -65,7 +67,7 @@
             this.btn打标影像NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn打标影像NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn打标影像NG停止.InvisibilityTriggerNode = null;
-            this.btn打标影像NG停止.Location = new System.Drawing.Point(18, 57);
+            this.btn打标影像NG停止.Location = new System.Drawing.Point(26, 80);
             this.btn打标影像NG停止.Maximum = 0D;
             this.btn打标影像NG停止.Minimum = 0D;
             this.btn打标影像NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -73,15 +75,15 @@
             this.btn打标影像NG停止.NeedUserEnsure = false;
             this.btn打标影像NG停止.OffColor = System.Drawing.Color.Red;
             this.btn打标影像NG停止.OffSymbol = 61453;
-            this.btn打标影像NG停止.OffText = "打标影像NG停止屏蔽";
+            this.btn打标影像NG停止.OffText = "印字影像NG停止屏蔽";
             this.btn打标影像NG停止.OnColor = System.Drawing.Color.Green;
             this.btn打标影像NG停止.OnSymbol = 61452;
-            this.btn打标影像NG停止.OnText = "打标影像NG停止";
+            this.btn打标影像NG停止.OnText = "印字影像NG停止";
             this.btn打标影像NG停止.ReadNode = null;
             this.btn打标影像NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn打标影像NG停止.Symbol = 61453;
             this.btn打标影像NG停止.TabIndex = 190;
-            this.btn打标影像NG停止.Text = "打标影像NG停止屏蔽";
+            this.btn打标影像NG停止.Text = "印字影像NG停止屏蔽";
             this.btn打标影像NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn打标影像NG停止.Visible = false;
             this.btn打标影像NG停止.WriteNode = null;
@@ -96,7 +98,7 @@
             this.btn封装1打标复检影像NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn封装1打标复检影像NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn封装1打标复检影像NG停止.InvisibilityTriggerNode = null;
-            this.btn封装1打标复检影像NG停止.Location = new System.Drawing.Point(18, 187);
+            this.btn封装1打标复检影像NG停止.Location = new System.Drawing.Point(26, 274);
             this.btn封装1打标复检影像NG停止.Maximum = 0D;
             this.btn封装1打标复检影像NG停止.Minimum = 0D;
             this.btn封装1打标复检影像NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -104,15 +106,15 @@
             this.btn封装1打标复检影像NG停止.NeedUserEnsure = false;
             this.btn封装1打标复检影像NG停止.OffColor = System.Drawing.Color.Red;
             this.btn封装1打标复检影像NG停止.OffSymbol = 61453;
-            this.btn封装1打标复检影像NG停止.OffText = "封装1打标复检影像NG停止屏蔽";
+            this.btn封装1打标复检影像NG停止.OffText = "封装打标复检影像NG停止屏蔽";
             this.btn封装1打标复检影像NG停止.OnColor = System.Drawing.Color.Green;
             this.btn封装1打标复检影像NG停止.OnSymbol = 61452;
-            this.btn封装1打标复检影像NG停止.OnText = "封装1打标复检影像NG停止";
+            this.btn封装1打标复检影像NG停止.OnText = "封装打标复检影像NG停止";
             this.btn封装1打标复检影像NG停止.ReadNode = null;
             this.btn封装1打标复检影像NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn封装1打标复检影像NG停止.Symbol = 61453;
             this.btn封装1打标复检影像NG停止.TabIndex = 191;
-            this.btn封装1打标复检影像NG停止.Text = "封装1打标复检影像NG停止屏蔽";
+            this.btn封装1打标复检影像NG停止.Text = "封装打标复检影像NG停止屏蔽";
             this.btn封装1打标复检影像NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn封装1打标复检影像NG停止.Visible = false;
             this.btn封装1打标复检影像NG停止.WriteNode = null;
@@ -127,7 +129,7 @@
             this.btn3D影像NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn3D影像NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn3D影像NG停止.InvisibilityTriggerNode = null;
-            this.btn3D影像NG停止.Location = new System.Drawing.Point(18, 122);
+            this.btn3D影像NG停止.Location = new System.Drawing.Point(26, 209);
             this.btn3D影像NG停止.Maximum = 0D;
             this.btn3D影像NG停止.Minimum = 0D;
             this.btn3D影像NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -158,7 +160,7 @@
             this.btn封装1封合后影像NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn封装1封合后影像NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn封装1封合后影像NG停止.InvisibilityTriggerNode = null;
-            this.btn封装1封合后影像NG停止.Location = new System.Drawing.Point(18, 252);
+            this.btn封装1封合后影像NG停止.Location = new System.Drawing.Point(26, 339);
             this.btn封装1封合后影像NG停止.Maximum = 0D;
             this.btn封装1封合后影像NG停止.Minimum = 0D;
             this.btn封装1封合后影像NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -166,81 +168,19 @@
             this.btn封装1封合后影像NG停止.NeedUserEnsure = false;
             this.btn封装1封合后影像NG停止.OffColor = System.Drawing.Color.Red;
             this.btn封装1封合后影像NG停止.OffSymbol = 61453;
-            this.btn封装1封合后影像NG停止.OffText = "封装1封合后影像NG停止屏蔽";
+            this.btn封装1封合后影像NG停止.OffText = "封装封合后影像NG停止屏蔽";
             this.btn封装1封合后影像NG停止.OnColor = System.Drawing.Color.Green;
             this.btn封装1封合后影像NG停止.OnSymbol = 61452;
-            this.btn封装1封合后影像NG停止.OnText = "封装1封合后影像NG停止";
+            this.btn封装1封合后影像NG停止.OnText = "封装封合后影像NG停止";
             this.btn封装1封合后影像NG停止.ReadNode = null;
             this.btn封装1封合后影像NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn封装1封合后影像NG停止.Symbol = 61453;
             this.btn封装1封合后影像NG停止.TabIndex = 193;
-            this.btn封装1封合后影像NG停止.Text = "封装1封合后影像NG停止屏蔽";
+            this.btn封装1封合后影像NG停止.Text = "封装封合后影像NG停止屏蔽";
             this.btn封装1封合后影像NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn封装1封合后影像NG停止.Visible = false;
             this.btn封装1封合后影像NG停止.WriteNode = null;
             // 
-            // btn封装2封合后影像NG停止
-            // 
-            this.btn封装2封合后影像NG停止.ButtonType = PlcUiControl.ButtonType.交替型;
-            this.btn封装2封合后影像NG停止.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btn封装2封合后影像NG停止.DisabilityTriggerNode = null;
-            this.btn封装2封合后影像NG停止.FillColor = System.Drawing.Color.Red;
-            this.btn封装2封合后影像NG停止.FillHoverColor = System.Drawing.Color.Red;
-            this.btn封装2封合后影像NG停止.FillSelectedColor = System.Drawing.Color.Red;
-            this.btn封装2封合后影像NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn封装2封合后影像NG停止.InvisibilityTriggerNode = null;
-            this.btn封装2封合后影像NG停止.Location = new System.Drawing.Point(18, 382);
-            this.btn封装2封合后影像NG停止.Maximum = 0D;
-            this.btn封装2封合后影像NG停止.Minimum = 0D;
-            this.btn封装2封合后影像NG停止.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btn封装2封合后影像NG停止.Name = "btn封装2封合后影像NG停止";
-            this.btn封装2封合后影像NG停止.NeedUserEnsure = false;
-            this.btn封装2封合后影像NG停止.OffColor = System.Drawing.Color.Red;
-            this.btn封装2封合后影像NG停止.OffSymbol = 61453;
-            this.btn封装2封合后影像NG停止.OffText = "封装2封合后影像NG停止屏蔽";
-            this.btn封装2封合后影像NG停止.OnColor = System.Drawing.Color.Green;
-            this.btn封装2封合后影像NG停止.OnSymbol = 61452;
-            this.btn封装2封合后影像NG停止.OnText = "封装2封合后影像NG停止";
-            this.btn封装2封合后影像NG停止.ReadNode = null;
-            this.btn封装2封合后影像NG停止.Size = new System.Drawing.Size(219, 45);
-            this.btn封装2封合后影像NG停止.Symbol = 61453;
-            this.btn封装2封合后影像NG停止.TabIndex = 194;
-            this.btn封装2封合后影像NG停止.Text = "封装2封合后影像NG停止屏蔽";
-            this.btn封装2封合后影像NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn封装2封合后影像NG停止.Visible = false;
-            this.btn封装2封合后影像NG停止.WriteNode = null;
-            // 
-            // btn封装2打标复检影像NG停止
-            // 
-            this.btn封装2打标复检影像NG停止.ButtonType = PlcUiControl.ButtonType.交替型;
-            this.btn封装2打标复检影像NG停止.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btn封装2打标复检影像NG停止.DisabilityTriggerNode = null;
-            this.btn封装2打标复检影像NG停止.FillColor = System.Drawing.Color.Red;
-            this.btn封装2打标复检影像NG停止.FillHoverColor = System.Drawing.Color.Red;
-            this.btn封装2打标复检影像NG停止.FillSelectedColor = System.Drawing.Color.Red;
-            this.btn封装2打标复检影像NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn封装2打标复检影像NG停止.InvisibilityTriggerNode = null;
-            this.btn封装2打标复检影像NG停止.Location = new System.Drawing.Point(18, 317);
-            this.btn封装2打标复检影像NG停止.Maximum = 0D;
-            this.btn封装2打标复检影像NG停止.Minimum = 0D;
-            this.btn封装2打标复检影像NG停止.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btn封装2打标复检影像NG停止.Name = "btn封装2打标复检影像NG停止";
-            this.btn封装2打标复检影像NG停止.NeedUserEnsure = false;
-            this.btn封装2打标复检影像NG停止.OffColor = System.Drawing.Color.Red;
-            this.btn封装2打标复检影像NG停止.OffSymbol = 61453;
-            this.btn封装2打标复检影像NG停止.OffText = "封装2打标复检影像NG停止屏蔽";
-            this.btn封装2打标复检影像NG停止.OnColor = System.Drawing.Color.Green;
-            this.btn封装2打标复检影像NG停止.OnSymbol = 61452;
-            this.btn封装2打标复检影像NG停止.OnText = "封装2打标复检影像NG停止";
-            this.btn封装2打标复检影像NG停止.ReadNode = null;
-            this.btn封装2打标复检影像NG停止.Size = new System.Drawing.Size(219, 45);
-            this.btn封装2打标复检影像NG停止.Symbol = 61453;
-            this.btn封装2打标复检影像NG停止.TabIndex = 195;
-            this.btn封装2打标复检影像NG停止.Text = "封装2打标复检影像NG停止屏蔽";
-            this.btn封装2打标复检影像NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn封装2打标复检影像NG停止.Visible = false;
-            this.btn封装2打标复检影像NG停止.WriteNode = null;
-            // 
             // btn测试1NG停止屏蔽
             // 
             this.btn测试1NG停止屏蔽.ButtonType = PlcUiControl.ButtonType.交替型;
@@ -251,7 +191,7 @@
             this.btn测试1NG停止屏蔽.FillSelectedColor = System.Drawing.Color.Red;
             this.btn测试1NG停止屏蔽.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn测试1NG停止屏蔽.InvisibilityTriggerNode = null;
-            this.btn测试1NG停止屏蔽.Location = new System.Drawing.Point(243, 57);
+            this.btn测试1NG停止屏蔽.Location = new System.Drawing.Point(265, 144);
             this.btn测试1NG停止屏蔽.Maximum = 0D;
             this.btn测试1NG停止屏蔽.Minimum = 0D;
             this.btn测试1NG停止屏蔽.MinimumSize = new System.Drawing.Size(1, 1);
@@ -263,13 +203,13 @@
             this.btn测试1NG停止屏蔽.OnColor = System.Drawing.Color.Green;
             this.btn测试1NG停止屏蔽.OnSymbol = 61452;
             this.btn测试1NG停止屏蔽.OnText = "测试1NG停止";
-            this.btn测试1NG停止屏蔽.ReadNode = new Node("Application.GVL_A05_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试1NG停止屏蔽.ReadNode = new Node("Application.A04_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             this.btn测试1NG停止屏蔽.Size = new System.Drawing.Size(219, 45);
             this.btn测试1NG停止屏蔽.Symbol = 61453;
             this.btn测试1NG停止屏蔽.TabIndex = 196;
             this.btn测试1NG停止屏蔽.Text = "测试1NG停止屏蔽";
             this.btn测试1NG停止屏蔽.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试1NG停止屏蔽.WriteNode = new Node("Application.GVL_A05_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试1NG停止屏蔽.WriteNode = new Node("Application.A04_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             // 
             // btn测试2NG停止
             // 
@@ -281,7 +221,7 @@
             this.btn测试2NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn测试2NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn测试2NG停止.InvisibilityTriggerNode = null;
-            this.btn测试2NG停止.Location = new System.Drawing.Point(243, 122);
+            this.btn测试2NG停止.Location = new System.Drawing.Point(265, 209);
             this.btn测试2NG停止.Maximum = 0D;
             this.btn测试2NG停止.Minimum = 0D;
             this.btn测试2NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -293,13 +233,13 @@
             this.btn测试2NG停止.OnColor = System.Drawing.Color.Green;
             this.btn测试2NG停止.OnSymbol = 61452;
             this.btn测试2NG停止.OnText = "测试2NG停止";
-            this.btn测试2NG停止.ReadNode = new Node("Application.GVL_A06_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试2NG停止.ReadNode = new Node("Application.A05_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             this.btn测试2NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn测试2NG停止.Symbol = 61453;
             this.btn测试2NG停止.TabIndex = 197;
             this.btn测试2NG停止.Text = "测试2NG停止屏蔽";
             this.btn测试2NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试2NG停止.WriteNode = new Node("Application.GVL_A06_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试2NG停止.WriteNode = new Node("Application.A05_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             // 
             // btn测试3NG停止
             // 
@@ -311,7 +251,7 @@
             this.btn测试3NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn测试3NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn测试3NG停止.InvisibilityTriggerNode = null;
-            this.btn测试3NG停止.Location = new System.Drawing.Point(243, 187);
+            this.btn测试3NG停止.Location = new System.Drawing.Point(265, 274);
             this.btn测试3NG停止.Maximum = 0D;
             this.btn测试3NG停止.Minimum = 0D;
             this.btn测试3NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -323,13 +263,13 @@
             this.btn测试3NG停止.OnColor = System.Drawing.Color.Green;
             this.btn测试3NG停止.OnSymbol = 61452;
             this.btn测试3NG停止.OnText = "测试3NG停止";
-            this.btn测试3NG停止.ReadNode = new Node("Application.GVL_A07_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试3NG停止.ReadNode = new Node("Application.A06_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             this.btn测试3NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn测试3NG停止.Symbol = 61453;
             this.btn测试3NG停止.TabIndex = 198;
             this.btn测试3NG停止.Text = "测试3NG停止屏蔽";
             this.btn测试3NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试3NG停止.WriteNode = new Node("Application.GVL_A07_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试3NG停止.WriteNode = new Node("Application.A06_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             // 
             // btn测试4NG停止
             // 
@@ -341,7 +281,7 @@
             this.btn测试4NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn测试4NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn测试4NG停止.InvisibilityTriggerNode = null;
-            this.btn测试4NG停止.Location = new System.Drawing.Point(243, 252);
+            this.btn测试4NG停止.Location = new System.Drawing.Point(265, 339);
             this.btn测试4NG停止.Maximum = 0D;
             this.btn测试4NG停止.Minimum = 0D;
             this.btn测试4NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -353,13 +293,13 @@
             this.btn测试4NG停止.OnColor = System.Drawing.Color.Green;
             this.btn测试4NG停止.OnSymbol = 61452;
             this.btn测试4NG停止.OnText = "测试4NG停止";
-            this.btn测试4NG停止.ReadNode = new Node("Application.GVL_A08_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试4NG停止.ReadNode = new Node("Application.A07_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             this.btn测试4NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn测试4NG停止.Symbol = 61453;
             this.btn测试4NG停止.TabIndex = 199;
             this.btn测试4NG停止.Text = "测试4NG停止屏蔽";
             this.btn测试4NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试4NG停止.WriteNode = new Node("Application.GVL_A08_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试4NG停止.WriteNode = new Node("Application.A07_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             // 
             // btn测试5NG停止
             // 
@@ -371,7 +311,7 @@
             this.btn测试5NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn测试5NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn测试5NG停止.InvisibilityTriggerNode = null;
-            this.btn测试5NG停止.Location = new System.Drawing.Point(243, 317);
+            this.btn测试5NG停止.Location = new System.Drawing.Point(265, 404);
             this.btn测试5NG停止.Maximum = 0D;
             this.btn测试5NG停止.Minimum = 0D;
             this.btn测试5NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -383,13 +323,13 @@
             this.btn测试5NG停止.OnColor = System.Drawing.Color.Green;
             this.btn测试5NG停止.OnSymbol = 61452;
             this.btn测试5NG停止.OnText = "测试5NG停止";
-            this.btn测试5NG停止.ReadNode = new Node("Application.GVL_A27_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试5NG停止.ReadNode = new Node("Application.A25_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             this.btn测试5NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn测试5NG停止.Symbol = 61453;
             this.btn测试5NG停止.TabIndex = 200;
             this.btn测试5NG停止.Text = "测试5NG停止屏蔽";
             this.btn测试5NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn测试5NG停止.WriteNode = new Node("Application.GVL_A27_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn测试5NG停止.WriteNode = new Node("Application.A25_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             // 
             // btn热测NG停止
             // 
@@ -401,7 +341,7 @@
             this.btn热测NG停止.FillSelectedColor = System.Drawing.Color.Red;
             this.btn热测NG停止.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn热测NG停止.InvisibilityTriggerNode = null;
-            this.btn热测NG停止.Location = new System.Drawing.Point(243, 382);
+            this.btn热测NG停止.Location = new System.Drawing.Point(265, 469);
             this.btn热测NG停止.Maximum = 0D;
             this.btn热测NG停止.Minimum = 0D;
             this.btn热测NG停止.MinimumSize = new System.Drawing.Size(1, 1);
@@ -413,13 +353,13 @@
             this.btn热测NG停止.OnColor = System.Drawing.Color.Green;
             this.btn热测NG停止.OnSymbol = 61452;
             this.btn热测NG停止.OnText = "热测NG停止";
-            this.btn热测NG停止.ReadNode = new Node("Application.GVL_A15_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn热测NG停止.ReadNode = new Node("Application.A14_ThermalTest_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             this.btn热测NG停止.Size = new System.Drawing.Size(219, 45);
             this.btn热测NG停止.Symbol = 61453;
             this.btn热测NG停止.TabIndex = 201;
             this.btn热测NG停止.Text = "热测NG停止屏蔽";
             this.btn热测NG停止.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn热测NG停止.WriteNode = new Node("Application.GVL_A15_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.btn热测NG停止.WriteNode = new Node("Application.A14_ThermalTest_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
             // 
             // txt测试1停止Bin号
             // 
@@ -429,28 +369,28 @@
             this.txt测试1停止Bin号.Gain = 1D;
             this.txt测试1停止Bin号.IntegerDigits = 0;
             this.txt测试1停止Bin号.InvisibilityTriggerNode = null;
-            this.txt测试1停止Bin号.Location = new System.Drawing.Point(487, 75);
+            this.txt测试1停止Bin号.Location = new System.Drawing.Point(509, 162);
             this.txt测试1停止Bin号.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt测试1停止Bin号.Maximum = 999D;
             this.txt测试1停止Bin号.Minimum = 0D;
             this.txt测试1停止Bin号.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试1停止Bin号.Name = "txt测试1停止Bin号";
             this.txt测试1停止Bin号.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试1停止Bin号.ReadNode = new Node("Application.GVL_A05_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试1停止Bin号.ReadNode = new Node("Application.A04_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             this.txt测试1停止Bin号.ShowText = false;
             this.txt测试1停止Bin号.Size = new System.Drawing.Size(76, 27);
             this.txt测试1停止Bin号.TabIndex = 203;
             this.txt测试1停止Bin号.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试1停止Bin号.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试1停止Bin号.Watermark = "";
-            this.txt测试1停止Bin号.WriteNode = new Node("Application.GVL_A05_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试1停止Bin号.WriteNode = new Node("Application.A04_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             // 
             // uiLabel18
             // 
             this.uiLabel18.AutoSize = true;
             this.uiLabel18.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel18.Location = new System.Drawing.Point(484, 57);
+            this.uiLabel18.Location = new System.Drawing.Point(506, 144);
             this.uiLabel18.Name = "uiLabel18";
             this.uiLabel18.Size = new System.Drawing.Size(79, 16);
             this.uiLabel18.TabIndex = 202;
@@ -464,28 +404,28 @@
             this.txt测试2停止Bin号.Gain = 1D;
             this.txt测试2停止Bin号.IntegerDigits = 0;
             this.txt测试2停止Bin号.InvisibilityTriggerNode = null;
-            this.txt测试2停止Bin号.Location = new System.Drawing.Point(487, 140);
+            this.txt测试2停止Bin号.Location = new System.Drawing.Point(509, 227);
             this.txt测试2停止Bin号.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt测试2停止Bin号.Maximum = 999D;
             this.txt测试2停止Bin号.Minimum = 0D;
             this.txt测试2停止Bin号.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试2停止Bin号.Name = "txt测试2停止Bin号";
             this.txt测试2停止Bin号.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试2停止Bin号.ReadNode = new Node("Application.GVL_A06_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试2停止Bin号.ReadNode = new Node("Application.A05_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             this.txt测试2停止Bin号.ShowText = false;
             this.txt测试2停止Bin号.Size = new System.Drawing.Size(76, 27);
             this.txt测试2停止Bin号.TabIndex = 205;
             this.txt测试2停止Bin号.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试2停止Bin号.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试2停止Bin号.Watermark = "";
-            this.txt测试2停止Bin号.WriteNode = new Node("Application.GVL_A06_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试2停止Bin号.WriteNode = new Node("Application.A05_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             // 
             // uiLabel1
             // 
             this.uiLabel1.AutoSize = true;
             this.uiLabel1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel1.Location = new System.Drawing.Point(484, 122);
+            this.uiLabel1.Location = new System.Drawing.Point(506, 209);
             this.uiLabel1.Name = "uiLabel1";
             this.uiLabel1.Size = new System.Drawing.Size(79, 16);
             this.uiLabel1.TabIndex = 204;
@@ -499,28 +439,28 @@
             this.txt测试3停止Bin号.Gain = 1D;
             this.txt测试3停止Bin号.IntegerDigits = 0;
             this.txt测试3停止Bin号.InvisibilityTriggerNode = null;
-            this.txt测试3停止Bin号.Location = new System.Drawing.Point(487, 205);
+            this.txt测试3停止Bin号.Location = new System.Drawing.Point(509, 292);
             this.txt测试3停止Bin号.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt测试3停止Bin号.Maximum = 999D;
             this.txt测试3停止Bin号.Minimum = 0D;
             this.txt测试3停止Bin号.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试3停止Bin号.Name = "txt测试3停止Bin号";
             this.txt测试3停止Bin号.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试3停止Bin号.ReadNode = new Node("Application.GVL_A07_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试3停止Bin号.ReadNode = new Node("Application.A06_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             this.txt测试3停止Bin号.ShowText = false;
             this.txt测试3停止Bin号.Size = new System.Drawing.Size(76, 27);
             this.txt测试3停止Bin号.TabIndex = 207;
             this.txt测试3停止Bin号.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试3停止Bin号.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试3停止Bin号.Watermark = "";
-            this.txt测试3停止Bin号.WriteNode = new Node("Application.GVL_A07_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试3停止Bin号.WriteNode = new Node("Application.A06_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             // 
             // uiLabel2
             // 
             this.uiLabel2.AutoSize = true;
             this.uiLabel2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel2.Location = new System.Drawing.Point(484, 187);
+            this.uiLabel2.Location = new System.Drawing.Point(506, 274);
             this.uiLabel2.Name = "uiLabel2";
             this.uiLabel2.Size = new System.Drawing.Size(79, 16);
             this.uiLabel2.TabIndex = 206;
@@ -534,28 +474,28 @@
             this.txt测试4停止Bin号.Gain = 1D;
             this.txt测试4停止Bin号.IntegerDigits = 0;
             this.txt测试4停止Bin号.InvisibilityTriggerNode = null;
-            this.txt测试4停止Bin号.Location = new System.Drawing.Point(487, 270);
+            this.txt测试4停止Bin号.Location = new System.Drawing.Point(509, 357);
             this.txt测试4停止Bin号.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt测试4停止Bin号.Maximum = 999D;
             this.txt测试4停止Bin号.Minimum = 0D;
             this.txt测试4停止Bin号.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试4停止Bin号.Name = "txt测试4停止Bin号";
             this.txt测试4停止Bin号.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试4停止Bin号.ReadNode = new Node("Application.GVL_A08_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试4停止Bin号.ReadNode = new Node("Application.A07_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             this.txt测试4停止Bin号.ShowText = false;
             this.txt测试4停止Bin号.Size = new System.Drawing.Size(76, 27);
             this.txt测试4停止Bin号.TabIndex = 209;
             this.txt测试4停止Bin号.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试4停止Bin号.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试4停止Bin号.Watermark = "";
-            this.txt测试4停止Bin号.WriteNode = new Node("Application.GVL_A08_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试4停止Bin号.WriteNode = new Node("Application.A07_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             // 
             // uiLabel3
             // 
             this.uiLabel3.AutoSize = true;
             this.uiLabel3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel3.Location = new System.Drawing.Point(484, 252);
+            this.uiLabel3.Location = new System.Drawing.Point(506, 339);
             this.uiLabel3.Name = "uiLabel3";
             this.uiLabel3.Size = new System.Drawing.Size(79, 16);
             this.uiLabel3.TabIndex = 208;
@@ -569,28 +509,28 @@
             this.txt测试5停止Bin号.Gain = 1D;
             this.txt测试5停止Bin号.IntegerDigits = 0;
             this.txt测试5停止Bin号.InvisibilityTriggerNode = null;
-            this.txt测试5停止Bin号.Location = new System.Drawing.Point(487, 335);
+            this.txt测试5停止Bin号.Location = new System.Drawing.Point(509, 422);
             this.txt测试5停止Bin号.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt测试5停止Bin号.Maximum = 999D;
             this.txt测试5停止Bin号.Minimum = 0D;
             this.txt测试5停止Bin号.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt测试5停止Bin号.Name = "txt测试5停止Bin号";
             this.txt测试5停止Bin号.Padding = new System.Windows.Forms.Padding(5);
-            this.txt测试5停止Bin号.ReadNode = new Node("Application.GVL_A27_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试5停止Bin号.ReadNode = new Node("Application.A25_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             this.txt测试5停止Bin号.ShowText = false;
             this.txt测试5停止Bin号.Size = new System.Drawing.Size(76, 27);
             this.txt测试5停止Bin号.TabIndex = 211;
             this.txt测试5停止Bin号.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt测试5停止Bin号.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt测试5停止Bin号.Watermark = "";
-            this.txt测试5停止Bin号.WriteNode = new Node("Application.GVL_A27_Auto.报警bin号", NodeType.UINT, null);
+            this.txt测试5停止Bin号.WriteNode = new Node("Application.A25_TestStation_Auto.报警bin号", NodeType.UDINT, null);
             // 
             // uiLabel4
             // 
             this.uiLabel4.AutoSize = true;
             this.uiLabel4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel4.Location = new System.Drawing.Point(484, 317);
+            this.uiLabel4.Location = new System.Drawing.Point(506, 404);
             this.uiLabel4.Name = "uiLabel4";
             this.uiLabel4.Size = new System.Drawing.Size(79, 16);
             this.uiLabel4.TabIndex = 210;
@@ -604,28 +544,28 @@
             this.txt热测停止Bin号.Gain = 1D;
             this.txt热测停止Bin号.IntegerDigits = 0;
             this.txt热测停止Bin号.InvisibilityTriggerNode = null;
-            this.txt热测停止Bin号.Location = new System.Drawing.Point(487, 400);
+            this.txt热测停止Bin号.Location = new System.Drawing.Point(509, 487);
             this.txt热测停止Bin号.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt热测停止Bin号.Maximum = 999D;
             this.txt热测停止Bin号.Minimum = 0D;
             this.txt热测停止Bin号.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt热测停止Bin号.Name = "txt热测停止Bin号";
             this.txt热测停止Bin号.Padding = new System.Windows.Forms.Padding(5);
-            this.txt热测停止Bin号.ReadNode = new Node("Application.GVL_A15_Auto.ui需要报警提示的异常Bin号", NodeType.UINT, "需要报警提示的异常Bin号");
+            this.txt热测停止Bin号.ReadNode = new Node("Application.A14_ThermalTest_Auto.ui需要报警提示的异常Bin号", NodeType.UDINT, "需要报警提示的异常Bin号");
             this.txt热测停止Bin号.ShowText = false;
             this.txt热测停止Bin号.Size = new System.Drawing.Size(76, 27);
             this.txt热测停止Bin号.TabIndex = 213;
             this.txt热测停止Bin号.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt热测停止Bin号.Type = Sunny.UI.UITextBox.UIEditType.Integer;
             this.txt热测停止Bin号.Watermark = "";
-            this.txt热测停止Bin号.WriteNode = new Node("Application.GVL_A15_Auto.ui需要报警提示的异常Bin号", NodeType.UINT, "需要报警提示的异常Bin号");
+            this.txt热测停止Bin号.WriteNode = new Node("Application.A14_ThermalTest_Auto.ui需要报警提示的异常Bin号", NodeType.UDINT, "需要报警提示的异常Bin号");
             // 
             // uiLabel5
             // 
             this.uiLabel5.AutoSize = true;
             this.uiLabel5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel5.Location = new System.Drawing.Point(484, 382);
+            this.uiLabel5.Location = new System.Drawing.Point(506, 469);
             this.uiLabel5.Name = "uiLabel5";
             this.uiLabel5.Size = new System.Drawing.Size(79, 16);
             this.uiLabel5.TabIndex = 212;
@@ -636,16 +576,116 @@
             this.uiLabel6.AutoSize = true;
             this.uiLabel6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel6.ForeColor = System.Drawing.Color.Red;
-            this.uiLabel6.Location = new System.Drawing.Point(168, 459);
+            this.uiLabel6.Location = new System.Drawing.Point(129, 565);
             this.uiLabel6.Name = "uiLabel6";
             this.uiLabel6.Size = new System.Drawing.Size(455, 16);
             this.uiLabel6.TabIndex = 214;
             this.uiLabel6.Text = "注:0是除了入带BIN其余BIN全部停止,99代表任意不良BIN停机";
             // 
+            // plcUiNumberInput1
+            // 
+            this.plcUiNumberInput1.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.plcUiNumberInput1.DisabilityTriggerNode = null;
+            this.plcUiNumberInput1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiNumberInput1.Gain = 1D;
+            this.plcUiNumberInput1.IntegerDigits = 0;
+            this.plcUiNumberInput1.InvisibilityTriggerNode = null;
+            this.plcUiNumberInput1.Location = new System.Drawing.Point(509, 98);
+            this.plcUiNumberInput1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.plcUiNumberInput1.Maximum = 999D;
+            this.plcUiNumberInput1.Minimum = 0D;
+            this.plcUiNumberInput1.MinimumSize = new System.Drawing.Size(1, 16);
+            this.plcUiNumberInput1.Name = "plcUiNumberInput1";
+            this.plcUiNumberInput1.Padding = new System.Windows.Forms.Padding(5);
+            this.plcUiNumberInput1.ReadNode = new Node("Application.A02_TestStation_Auto.报警bin号", NodeType.UDINT, null);
+            this.plcUiNumberInput1.ShowText = false;
+            this.plcUiNumberInput1.Size = new System.Drawing.Size(76, 27);
+            this.plcUiNumberInput1.TabIndex = 217;
+            this.plcUiNumberInput1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.plcUiNumberInput1.Type = Sunny.UI.UITextBox.UIEditType.Integer;
+            this.plcUiNumberInput1.Watermark = "";
+            this.plcUiNumberInput1.WriteNode = new Node("Application.A02_TestStation_Auto.报警bin号", NodeType.UDINT, null);
+            // 
+            // uiLabel7
+            // 
+            this.uiLabel7.AutoSize = true;
+            this.uiLabel7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.uiLabel7.Location = new System.Drawing.Point(506, 80);
+            this.uiLabel7.Name = "uiLabel7";
+            this.uiLabel7.Size = new System.Drawing.Size(79, 16);
+            this.uiLabel7.TabIndex = 216;
+            this.uiLabel7.Text = "停止Bin号";
+            // 
+            // plcUiButton1
+            // 
+            this.plcUiButton1.ButtonType = PlcUiControl.ButtonType.交替型;
+            this.plcUiButton1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.plcUiButton1.DisabilityTriggerNode = null;
+            this.plcUiButton1.FillColor = System.Drawing.Color.Red;
+            this.plcUiButton1.FillHoverColor = System.Drawing.Color.Red;
+            this.plcUiButton1.FillSelectedColor = System.Drawing.Color.Red;
+            this.plcUiButton1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiButton1.InvisibilityTriggerNode = null;
+            this.plcUiButton1.Location = new System.Drawing.Point(265, 80);
+            this.plcUiButton1.Maximum = 0D;
+            this.plcUiButton1.Minimum = 0D;
+            this.plcUiButton1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.plcUiButton1.Name = "plcUiButton1";
+            this.plcUiButton1.NeedUserEnsure = false;
+            this.plcUiButton1.OffColor = System.Drawing.Color.Red;
+            this.plcUiButton1.OffSymbol = 61453;
+            this.plcUiButton1.OffText = "电测NG停止屏蔽";
+            this.plcUiButton1.OnColor = System.Drawing.Color.Green;
+            this.plcUiButton1.OnSymbol = 61452;
+            this.plcUiButton1.OnText = "电测NG停止";
+            this.plcUiButton1.ReadNode = new Node("Application.A02_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            this.plcUiButton1.Size = new System.Drawing.Size(219, 45);
+            this.plcUiButton1.Symbol = 61453;
+            this.plcUiButton1.TabIndex = 215;
+            this.plcUiButton1.Text = "电测NG停止屏蔽";
+            this.plcUiButton1.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiButton1.WriteNode = new Node("Application.A02_TestStation_Auto.b_检测结果报警BIN开关", NodeType.BOOL, null);
+            // 
+            // plcUiButton2
+            // 
+            this.plcUiButton2.ButtonType = PlcUiControl.ButtonType.交替型;
+            this.plcUiButton2.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.plcUiButton2.DisabilityTriggerNode = null;
+            this.plcUiButton2.FillColor = System.Drawing.Color.Red;
+            this.plcUiButton2.FillHoverColor = System.Drawing.Color.Red;
+            this.plcUiButton2.FillSelectedColor = System.Drawing.Color.Red;
+            this.plcUiButton2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiButton2.InvisibilityTriggerNode = null;
+            this.plcUiButton2.Location = new System.Drawing.Point(26, 144);
+            this.plcUiButton2.Maximum = 0D;
+            this.plcUiButton2.Minimum = 0D;
+            this.plcUiButton2.MinimumSize = new System.Drawing.Size(1, 1);
+            this.plcUiButton2.Name = "plcUiButton2";
+            this.plcUiButton2.NeedUserEnsure = false;
+            this.plcUiButton2.OffColor = System.Drawing.Color.Red;
+            this.plcUiButton2.OffSymbol = 61453;
+            this.plcUiButton2.OffText = "表面影像NG停止屏蔽";
+            this.plcUiButton2.OnColor = System.Drawing.Color.Green;
+            this.plcUiButton2.OnSymbol = 61452;
+            this.plcUiButton2.OnText = "表面影像NG停止";
+            this.plcUiButton2.ReadNode = null;
+            this.plcUiButton2.Size = new System.Drawing.Size(219, 45);
+            this.plcUiButton2.Symbol = 61453;
+            this.plcUiButton2.TabIndex = 218;
+            this.plcUiButton2.Text = "表面影像NG停止屏蔽";
+            this.plcUiButton2.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.plcUiButton2.Visible = false;
+            this.plcUiButton2.WriteNode = null;
+            // 
             // TestNGStopSettingForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(676, 502);
+            this.ClientSize = new System.Drawing.Size(676, 629);
+            this.Controls.Add(this.plcUiButton2);
+            this.Controls.Add(this.plcUiNumberInput1);
+            this.Controls.Add(this.uiLabel7);
+            this.Controls.Add(this.plcUiButton1);
             this.Controls.Add(this.uiLabel6);
             this.Controls.Add(this.txt热测停止Bin号);
             this.Controls.Add(this.uiLabel5);
@@ -665,8 +705,6 @@
             this.Controls.Add(this.btn测试3NG停止);
             this.Controls.Add(this.btn测试2NG停止);
             this.Controls.Add(this.btn测试1NG停止屏蔽);
-            this.Controls.Add(this.btn封装2打标复检影像NG停止);
-            this.Controls.Add(this.btn封装2封合后影像NG停止);
             this.Controls.Add(this.btn封装1封合后影像NG停止);
             this.Controls.Add(this.btn3D影像NG停止);
             this.Controls.Add(this.btn封装1打标复检影像NG停止);
@@ -688,8 +726,6 @@
         private PlcUiControl.PlcUiButton btn3D影像NG停止;
         private PlcUiControl.PlcUiButton btn封装1打标复检影像NG停止;
         private PlcUiControl.PlcUiButton btn封装1封合后影像NG停止;
-        private PlcUiControl.PlcUiButton btn封装2封合后影像NG停止;
-        private PlcUiControl.PlcUiButton btn封装2打标复检影像NG停止;
         private PlcUiControl.PlcUiButton btn测试1NG停止屏蔽;
         private PlcUiControl.PlcUiButton btn测试2NG停止;
         private PlcUiControl.PlcUiButton btn测试3NG停止;
@@ -709,5 +745,9 @@
         private PlcUiControl.PlcUiNumberInput txt热测停止Bin号;
         private Sunny.UI.UILabel uiLabel5;
         private Sunny.UI.UILabel uiLabel6;
+        private PlcUiControl.PlcUiNumberInput plcUiNumberInput1;
+        private Sunny.UI.UILabel uiLabel7;
+        private PlcUiControl.PlcUiButton plcUiButton1;
+        private PlcUiControl.PlcUiButton plcUiButton2;
     }
 }

+ 2 - 14
YangjieTester/主界面/VisionModeSettingForm.Designer.cs

@@ -33,7 +33,6 @@
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.btn3D仿真拍照 = new PlcUiControl.PlcUiButton();
             this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.tabPage4 = new System.Windows.Forms.TabPage();
             this.uiTabControl1.SuspendLayout();
             this.tabPage2.SuspendLayout();
             this.SuspendLayout();
@@ -43,7 +42,6 @@
             this.uiTabControl1.Controls.Add(this.tabPage1);
             this.uiTabControl1.Controls.Add(this.tabPage2);
             this.uiTabControl1.Controls.Add(this.tabPage3);
-            this.uiTabControl1.Controls.Add(this.tabPage4);
             this.uiTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiTabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
             this.uiTabControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -110,20 +108,11 @@
             // 
             this.tabPage3.Location = new System.Drawing.Point(0, 40);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(200, 60);
+            this.tabPage3.Size = new System.Drawing.Size(521, 246);
             this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "封装1";
+            this.tabPage3.Text = "封装";
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
-            // tabPage4
-            // 
-            this.tabPage4.Location = new System.Drawing.Point(0, 40);
-            this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(200, 60);
-            this.tabPage4.TabIndex = 3;
-            this.tabPage4.Text = "封装2";
-            this.tabPage4.UseVisualStyleBackColor = true;
-            // 
             // VisionModeSettingForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -147,6 +136,5 @@
         private PlcUiControl.PlcUiButton btn3D仿真拍照;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.TabPage tabPage4;
     }
 }

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor