201511271816

YangjieTester/主界面/HomeForm.Designer.cs

@@ -70,6 +70,7 @@
             this.flowLayoutPanel5 = new System.Windows.Forms.FlowLayoutPanel();
             this.btn编带1最后一盘 = new PlcUiControl.PlcUiButton();
             this.btn编带1温控器开关 = new PlcUiControl.PlcUiButton();
+            this.btn编带1使用换盘机 = new PlcUiControl.PlcUiButton();
             this.btn编带1编带清除 = new PlcUiControl.PlcUiButton();
             this.btn编带1编带全检 = new PlcUiControl.PlcUiButton();
             this.btn编带1印字复检屏蔽 = new PlcUiControl.PlcUiButton();
@@ -81,7 +82,6 @@
             this.txtTips = new Sunny.UI.UITextBox();
             this.uiPanel3 = new Sunny.UI.UIPanel();
             this.uiPanel1 = new Sunny.UI.UIPanel();
-            this.btn编带1使用换盘机 = new PlcUiControl.PlcUiButton();
             this.uiTitlePanel1.SuspendLayout();
             this.panelAlarm.SuspendLayout();
             this.tabFastOperation.SuspendLayout();
@@ -482,7 +482,7 @@
             this.btn封装1首件打样.Size = new System.Drawing.Size(135, 40);
             this.btn封装1首件打样.Symbol = 61453;
             this.btn封装1首件打样.TabIndex = 188;
-            this.btn封装1首件打样.Text = "封装首件打样";
+            this.btn封装1首件打样.Text = "封装1首件打样";
             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.A33_Encapsulation1_Auto.b_QC样本带开启", NodeType.BOOL, null);
             // 
@@ -567,7 +567,7 @@
             this.btn封装温控器开关.Size = new System.Drawing.Size(135, 40);
             this.btn封装温控器开关.Symbol = 61453;
             this.btn封装温控器开关.TabIndex = 188;
-            this.btn封装温控器开关.Text = "封装温控器";
+            this.btn封装温控器开关.Text = "封装1温控器";
             this.btn封装温控器开关.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btn封装温控器开关.WriteNode = new Node("Application.A33_Encapsulation1_Manual.b温控开关", NodeType.BOOL, null);
             // 
@@ -913,6 +913,37 @@
             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.A33_Encapsulation1_Manual.b温控开关", NodeType.BOOL, null);
             // 
+            // btn编带1使用换盘机
+            // 
+            this.btn编带1使用换盘机.ButtonType = PlcUiControl.ButtonType.交替型;
+            this.btn编带1使用换盘机.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btn编带1使用换盘机.DisabilityTriggerNode = null;
+            this.btn编带1使用换盘机.FillColor = System.Drawing.Color.Gray;
+            this.btn编带1使用换盘机.FillHoverColor = System.Drawing.Color.Gray;
+            this.btn编带1使用换盘机.FillSelectedColor = System.Drawing.Color.Gray;
+            this.btn编带1使用换盘机.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btn编带1使用换盘机.InvisibilityTriggerNode = null;
+            this.btn编带1使用换盘机.Location = new System.Drawing.Point(310, 8);
+            this.btn编带1使用换盘机.Margin = new System.Windows.Forms.Padding(8);
+            this.btn编带1使用换盘机.Maximum = 0D;
+            this.btn编带1使用换盘机.Minimum = 0D;
+            this.btn编带1使用换盘机.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btn编带1使用换盘机.Name = "btn编带1使用换盘机";
+            this.btn编带1使用换盘机.NeedUserEnsure = true;
+            this.btn编带1使用换盘机.OffColor = System.Drawing.Color.Gray;
+            this.btn编带1使用换盘机.OffSymbol = 61453;
+            this.btn编带1使用换盘机.OffText = "使用换盘机";
+            this.btn编带1使用换盘机.OnColor = System.Drawing.Color.Green;
+            this.btn编带1使用换盘机.OnSymbol = 61452;
+            this.btn编带1使用换盘机.OnText = "使用换盘机";
+            this.btn编带1使用换盘机.ReadNode = new Node("Application.A33_Encapsulation1_Auto.b单盘停机", NodeType.BOOL, null);
+            this.btn编带1使用换盘机.Size = new System.Drawing.Size(135, 40);
+            this.btn编带1使用换盘机.Symbol = 61453;
+            this.btn编带1使用换盘机.TabIndex = 190;
+            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.A33_Encapsulation1_Auto.b单盘停机", NodeType.BOOL, null);
+            // 
             // btn编带1编带清除
             // 
             this.btn编带1编带清除.ButtonType = PlcUiControl.ButtonType.保持型;
@@ -943,7 +974,7 @@
             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.Var_Hand_A33_Encapsulation1.b编带清除", NodeType.BOOL, null);
+            this.btn编带1编带清除.WriteNode = new Node("Application.A33_Encapsulation1_Manual.b编带清除", NodeType.BOOL, null);
             // 
             // btn编带1编带全检
             // 
@@ -1197,37 +1228,6 @@
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // btn编带1使用换盘机
-            // 
-            this.btn编带1使用换盘机.ButtonType = PlcUiControl.ButtonType.交替型;
-            this.btn编带1使用换盘机.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btn编带1使用换盘机.DisabilityTriggerNode = null;
-            this.btn编带1使用换盘机.FillColor = System.Drawing.Color.Gray;
-            this.btn编带1使用换盘机.FillHoverColor = System.Drawing.Color.Gray;
-            this.btn编带1使用换盘机.FillSelectedColor = System.Drawing.Color.Gray;
-            this.btn编带1使用换盘机.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn编带1使用换盘机.InvisibilityTriggerNode = null;
-            this.btn编带1使用换盘机.Location = new System.Drawing.Point(310, 8);
-            this.btn编带1使用换盘机.Margin = new System.Windows.Forms.Padding(8);
-            this.btn编带1使用换盘机.Maximum = 0D;
-            this.btn编带1使用换盘机.Minimum = 0D;
-            this.btn编带1使用换盘机.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btn编带1使用换盘机.Name = "btn编带1使用换盘机";
-            this.btn编带1使用换盘机.NeedUserEnsure = true;
-            this.btn编带1使用换盘机.OffColor = System.Drawing.Color.Gray;
-            this.btn编带1使用换盘机.OffSymbol = 61453;
-            this.btn编带1使用换盘机.OffText = "使用换盘机";
-            this.btn编带1使用换盘机.OnColor = System.Drawing.Color.Green;
-            this.btn编带1使用换盘机.OnSymbol = 61452;
-            this.btn编带1使用换盘机.OnText = "使用换盘机";
-            this.btn编带1使用换盘机.ReadNode = new Node("Application.A33_Encapsulation1_Auto.b单盘停机", NodeType.BOOL, null);
-            this.btn编带1使用换盘机.Size = new System.Drawing.Size(135, 40);
-            this.btn编带1使用换盘机.Symbol = 61453;
-            this.btn编带1使用换盘机.TabIndex = 190;
-            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.A33_Encapsulation1_Auto.b单盘停机", NodeType.BOOL, null);
-            // 
             // HomeForm
             // 
             this.AllowShowTitle = false;

YangjieTester/主界面/SpeedMonitorForm.Designer.cs

@@ -68,8 +68,6 @@
             this.lbl1_3 = new System.Windows.Forms.Label();
             this.plcUiNumberDisplay18 = new PlcUiControl.PlcUiNumberDisplay();
             this.label20 = new System.Windows.Forms.Label();
-            this.plcUiNumberDisplay20 = new PlcUiControl.PlcUiNumberDisplay();
-            this.label22 = new System.Windows.Forms.Label();
             this.plcUiNumberDisplay23 = new PlcUiControl.PlcUiNumberDisplay();
             this.label25 = new System.Windows.Forms.Label();
             this.plcUiNumberDisplay24 = new PlcUiControl.PlcUiNumberDisplay();
@@ -404,7 +402,7 @@
             this.plcUiNumberDisplay9.Location = new System.Drawing.Point(471, 395);
             this.plcUiNumberDisplay9.Name = "plcUiNumberDisplay9";
             this.plcUiNumberDisplay9.Preffix = null;
-            this.plcUiNumberDisplay9.ReadNode = new Node("Application.GVL_A26_Auto.iA26_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay9.ReadNode = new Node("Application.A26_DirectionTurn_Auto.iA28_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay9.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay9.Suffix = null;
             this.plcUiNumberDisplay9.TabIndex = 44;
@@ -435,7 +433,7 @@
             this.plcUiNumberDisplay10.Location = new System.Drawing.Point(471, 355);
             this.plcUiNumberDisplay10.Name = "plcUiNumberDisplay10";
             this.plcUiNumberDisplay10.Preffix = null;
-            this.plcUiNumberDisplay10.ReadNode = new Node("Application.GVL_A24_Auto.iA24_周期运行时间", NodeType.INT, "镭射打标站运行周期耗时");
+            this.plcUiNumberDisplay10.ReadNode = new Node("Application.A25_TestStation_Auto.iA27_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay10.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay10.Suffix = null;
             this.plcUiNumberDisplay10.TabIndex = 42;
@@ -466,7 +464,7 @@
             this.plcUiNumberDisplay11.Location = new System.Drawing.Point(471, 315);
             this.plcUiNumberDisplay11.Name = "plcUiNumberDisplay11";
             this.plcUiNumberDisplay11.Preffix = null;
-            this.plcUiNumberDisplay11.ReadNode = new Node("Application.GVL_A23_Auto.iA23_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay11.ReadNode = new Node("Application.A23_LaserMarking_Auto.iA24_周期运行时间", NodeType.INT, "镭射打标站运行周期耗时");
             this.plcUiNumberDisplay11.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay11.Suffix = null;
             this.plcUiNumberDisplay11.TabIndex = 40;
@@ -497,7 +495,7 @@
             this.plcUiNumberDisplay12.Location = new System.Drawing.Point(471, 275);
             this.plcUiNumberDisplay12.Name = "plcUiNumberDisplay12";
             this.plcUiNumberDisplay12.Preffix = null;
-            this.plcUiNumberDisplay12.ReadNode = new Node("Application.GVL_A22_Auto.iA22_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay12.ReadNode = new Node("Application.A21_LocateStation_Auto.iA26_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay12.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay12.Suffix = null;
             this.plcUiNumberDisplay12.TabIndex = 38;
@@ -528,7 +526,7 @@
             this.plcUiNumberDisplay13.Location = new System.Drawing.Point(471, 235);
             this.plcUiNumberDisplay13.Name = "plcUiNumberDisplay13";
             this.plcUiNumberDisplay13.Preffix = null;
-            this.plcUiNumberDisplay13.ReadNode = new Node("Application.GVL_A21_Auto.iA21_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay13.ReadNode = new Node("Application.A20_TestNGContainer_Auto.iA22_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay13.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay13.Suffix = null;
             this.plcUiNumberDisplay13.TabIndex = 36;
@@ -559,7 +557,7 @@
             this.plcUiNumberDisplay14.Location = new System.Drawing.Point(471, 195);
             this.plcUiNumberDisplay14.Name = "plcUiNumberDisplay14";
             this.plcUiNumberDisplay14.Preffix = null;
-            this.plcUiNumberDisplay14.ReadNode = new Node("Application.GVL_A20_Auto.iA20_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay14.ReadNode = new Node("Application.A19_CoolingStation_Auto.iA20_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay14.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay14.Suffix = null;
             this.plcUiNumberDisplay14.TabIndex = 34;
@@ -673,10 +671,10 @@
             this.plcUiNumberDisplay18.Gain = 1D;
             this.plcUiNumberDisplay18.IntegerDigits = 0;
             this.plcUiNumberDisplay18.InvisibilityTriggerNode = null;
-            this.plcUiNumberDisplay18.Location = new System.Drawing.Point(783, 275);
+            this.plcUiNumberDisplay18.Location = new System.Drawing.Point(783, 235);
             this.plcUiNumberDisplay18.Name = "plcUiNumberDisplay18";
             this.plcUiNumberDisplay18.Preffix = null;
-            this.plcUiNumberDisplay18.ReadNode = new Node("Application.GVL_A35_Auto.iA35_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay18.ReadNode = new Node("Application.A35_OverflowBox_Auto.ui_CT", NodeType.UDINT, null);
             this.plcUiNumberDisplay18.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay18.Suffix = null;
             this.plcUiNumberDisplay18.TabIndex = 62;
@@ -687,44 +685,13 @@
             // label20
             // 
             this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label20.Location = new System.Drawing.Point(627, 275);
+            this.label20.Location = new System.Drawing.Point(627, 235);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(150, 40);
             this.label20.TabIndex = 61;
             this.label20.Text = "A35 溢料盒";
             this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // plcUiNumberDisplay20
-            // 
-            this.plcUiNumberDisplay20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.plcUiNumberDisplay20.DecimalPlaces = 0;
-            this.plcUiNumberDisplay20.DisabilityTriggerNode = null;
-            this.plcUiNumberDisplay20.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.plcUiNumberDisplay20.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.plcUiNumberDisplay20.Gain = 1D;
-            this.plcUiNumberDisplay20.IntegerDigits = 0;
-            this.plcUiNumberDisplay20.InvisibilityTriggerNode = null;
-            this.plcUiNumberDisplay20.Location = new System.Drawing.Point(783, 235);
-            this.plcUiNumberDisplay20.Name = "plcUiNumberDisplay20";
-            this.plcUiNumberDisplay20.Preffix = null;
-            this.plcUiNumberDisplay20.ReadNode = new Node("Application.Var_Auto_A33_Encapsulation1.ui_CT", NodeType.UINT, null);
-            this.plcUiNumberDisplay20.Size = new System.Drawing.Size(150, 40);
-            this.plcUiNumberDisplay20.Suffix = null;
-            this.plcUiNumberDisplay20.TabIndex = 58;
-            this.plcUiNumberDisplay20.Text = "1";
-            this.plcUiNumberDisplay20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.plcUiNumberDisplay20.WriteNode = null;
-            // 
-            // label22
-            // 
-            this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label22.Location = new System.Drawing.Point(627, 235);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(150, 40);
-            this.label22.TabIndex = 57;
-            this.label22.Text = "A33 封装站1";
-            this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // plcUiNumberDisplay23
             // 
             this.plcUiNumberDisplay23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -738,7 +705,7 @@
             this.plcUiNumberDisplay23.Location = new System.Drawing.Point(783, 155);
             this.plcUiNumberDisplay23.Name = "plcUiNumberDisplay23";
             this.plcUiNumberDisplay23.Preffix = null;
-            this.plcUiNumberDisplay23.ReadNode = new Node("Application.GVL_A30_Auto.iA30_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay23.ReadNode = new Node("Application.A30_LocateStation_Auto.iA31_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay23.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay23.Suffix = null;
             this.plcUiNumberDisplay23.TabIndex = 52;
@@ -769,7 +736,7 @@
             this.plcUiNumberDisplay24.Location = new System.Drawing.Point(783, 115);
             this.plcUiNumberDisplay24.Name = "plcUiNumberDisplay24";
             this.plcUiNumberDisplay24.Preffix = null;
-            this.plcUiNumberDisplay24.ReadNode = new Node("Application.GVL_A29_Auto.iA29_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay24.ReadNode = new Node("Application.A29_TestNGContainer_Auto.iA30_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay24.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay24.Suffix = null;
             this.plcUiNumberDisplay24.TabIndex = 50;
@@ -824,7 +791,7 @@
             this.plcUiNumberDisplay25.Location = new System.Drawing.Point(783, 75);
             this.plcUiNumberDisplay25.Name = "plcUiNumberDisplay25";
             this.plcUiNumberDisplay25.Preffix = null;
-            this.plcUiNumberDisplay25.ReadNode = new Node("Application.GVL_A28_Auto.iA28_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay25.ReadNode = new Node("Application.A28_TestNGContainer_Auto.iA22_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay25.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay25.Suffix = null;
             this.plcUiNumberDisplay25.TabIndex = 46;
@@ -865,7 +832,7 @@
             this.plcUiNumberDisplay26.Location = new System.Drawing.Point(159, 435);
             this.plcUiNumberDisplay26.Name = "plcUiNumberDisplay26";
             this.plcUiNumberDisplay26.Preffix = null;
-            this.plcUiNumberDisplay26.ReadNode = new Node("Application.A08_TestNGContainer_Auto.iA09_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay26.ReadNode = new Node("Application.A09_TestNGContainer_Auto.iA10_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay26.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay26.Suffix = null;
             this.plcUiNumberDisplay26.TabIndex = 66;
@@ -886,7 +853,7 @@
             this.plcUiNumberDisplay27.Location = new System.Drawing.Point(471, 435);
             this.plcUiNumberDisplay27.Name = "plcUiNumberDisplay27";
             this.plcUiNumberDisplay27.Preffix = null;
-            this.plcUiNumberDisplay27.ReadNode = new Node("Application.GVL_A27_Auto.iA27_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay27.ReadNode = new Node("Application.A27_3DTestStation_Auto.iA29_周期运行时间", NodeType.INT, "入料站运行周期耗时");
             this.plcUiNumberDisplay27.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay27.Suffix = null;
             this.plcUiNumberDisplay27.TabIndex = 68;
@@ -927,7 +894,7 @@
             this.plcUiNumberDisplay22.Location = new System.Drawing.Point(783, 195);
             this.plcUiNumberDisplay22.Name = "plcUiNumberDisplay22";
             this.plcUiNumberDisplay22.Preffix = null;
-            this.plcUiNumberDisplay22.ReadNode = new Node("Application.GVL_A31_Auto.iA31_周期运行时间", NodeType.INT, "入料站运行周期耗时");
+            this.plcUiNumberDisplay22.ReadNode = new Node("Application.A33_Encapsulation1_Auto.ui_CT", NodeType.UDINT, null);
             this.plcUiNumberDisplay22.Size = new System.Drawing.Size(150, 40);
             this.plcUiNumberDisplay22.Suffix = null;
             this.plcUiNumberDisplay22.TabIndex = 54;
@@ -976,8 +943,6 @@
             this.Controls.Add(this.label37);
             this.Controls.Add(this.plcUiNumberDisplay18);
             this.Controls.Add(this.label20);
-            this.Controls.Add(this.plcUiNumberDisplay20);
-            this.Controls.Add(this.label22);
             this.Controls.Add(this.plcUiNumberDisplay22);
             this.Controls.Add(this.label24);
             this.Controls.Add(this.plcUiNumberDisplay23);
@@ -1080,8 +1045,6 @@
         private System.Windows.Forms.Label lbl1_3;
         private PlcUiControl.PlcUiNumberDisplay plcUiNumberDisplay18;
         private System.Windows.Forms.Label label20;
-        private PlcUiControl.PlcUiNumberDisplay plcUiNumberDisplay20;
-        private System.Windows.Forms.Label label22;
         private PlcUiControl.PlcUiNumberDisplay plcUiNumberDisplay23;
         private System.Windows.Forms.Label label25;
         private PlcUiControl.PlcUiNumberDisplay plcUiNumberDisplay24;

YangjieTester/主界面/TapeSettingForm.Designer.cs

@@ -297,13 +297,13 @@
             this.btn载带1载带恢复.OnColor = System.Drawing.Color.Green;
             this.btn载带1载带恢复.OnSymbol = 0;
             this.btn载带1载带恢复.OnText = "载带恢复";
-            this.btn载带1载带恢复.ReadNode = new Node("Application.Var_Hand_A33_Encapsulation1.b载带余量设定按钮", NodeType.BOOL, "HMIset");
+            this.btn载带1载带恢复.ReadNode = new Node("Application.A33_Encapsulation1_Manual.b载带余量设定按钮", NodeType.BOOL, "HMIset");
             this.btn载带1载带恢复.Size = new System.Drawing.Size(125, 33);
             this.btn载带1载带恢复.Symbol = 0;
             this.btn载带1载带恢复.TabIndex = 195;
             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.Var_Hand_A33_Encapsulation1.b载带余量设定按钮", NodeType.BOOL, "HMIset");
+            this.btn载带1载带恢复.WriteNode = new Node("Application.A33_Encapsulation1_Manual.b载带余量设定按钮", NodeType.BOOL, "HMIset");
             // 
             // uiLabel8
             // 
@@ -330,14 +330,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.Var_Hand_A33_Encapsulation1.lr载带余量设定值", NodeType.LREAL, "HMIset");
+            this.txt载带1单卷载带长度.ReadNode = new Node("Application.A33_Encapsulation1_Manual.lr载带余量设定值", NodeType.LREAL, "HMIset");
             this.txt载带1单卷载带长度.ShowText = false;
             this.txt载带1单卷载带长度.Size = new System.Drawing.Size(125, 27);
             this.txt载带1单卷载带长度.TabIndex = 194;
             this.txt载带1单卷载带长度.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt载带1单卷载带长度.Type = Sunny.UI.UITextBox.UIEditType.Double;
             this.txt载带1单卷载带长度.Watermark = "";
-            this.txt载带1单卷载带长度.WriteNode = new Node("Application.Var_Hand_A33_Encapsulation1.lr载带余量设定值", NodeType.LREAL, "HMIset");
+            this.txt载带1单卷载带长度.WriteNode = new Node("Application.A33_Encapsulation1_Manual.lr载带余量设定值", NodeType.LREAL, "HMIset");
             // 
             // uiLabel63
             // 
@@ -423,13 +423,13 @@
             this.btn载带1膜盖恢复.OnColor = System.Drawing.Color.Green;
             this.btn载带1膜盖恢复.OnSymbol = 0;
             this.btn载带1膜盖恢复.OnText = "膜盖恢复";
-            this.btn载带1膜盖恢复.ReadNode = new Node("Application.Var_Hand_A33_Encapsulation1.b膜卷余量设定按钮", NodeType.BOOL, "HMIset");
+            this.btn载带1膜盖恢复.ReadNode = new Node("Application.A33_Encapsulation1_Manual.b膜卷余量设定按钮", NodeType.BOOL, "HMIset");
             this.btn载带1膜盖恢复.Size = new System.Drawing.Size(125, 31);
             this.btn载带1膜盖恢复.Symbol = 0;
             this.btn载带1膜盖恢复.TabIndex = 190;
             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.Var_Hand_A33_Encapsulation1.b膜卷余量设定按钮", NodeType.BOOL, "HMIset");
+            this.btn载带1膜盖恢复.WriteNode = new Node("Application.A33_Encapsulation1_Manual.b膜卷余量设定按钮", NodeType.BOOL, "HMIset");
             // 
             // txt载带1单卷膜盖长度
             // 
@@ -445,14 +445,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.Var_Hand_A33_Encapsulation1.lr膜卷余量设定值", NodeType.LREAL, "HMIset");
+            this.txt载带1单卷膜盖长度.ReadNode = new Node("Application.A33_Encapsulation1_Manual.lr膜卷余量设定值", NodeType.LREAL, "HMIset");
             this.txt载带1单卷膜盖长度.ShowText = false;
             this.txt载带1单卷膜盖长度.Size = new System.Drawing.Size(125, 27);
             this.txt载带1单卷膜盖长度.TabIndex = 75;
             this.txt载带1单卷膜盖长度.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.txt载带1单卷膜盖长度.Type = Sunny.UI.UITextBox.UIEditType.Double;
             this.txt载带1单卷膜盖长度.Watermark = "";
-            this.txt载带1单卷膜盖长度.WriteNode = new Node("Application.Var_Hand_A33_Encapsulation1.lr膜卷余量设定值", NodeType.LREAL, "HMIset");
+            this.txt载带1单卷膜盖长度.WriteNode = new Node("Application.A33_Encapsulation1_Manual.lr膜卷余量设定值", NodeType.LREAL, "HMIset");
             // 
             // uiLabel51
             // 

YangjieTester/主界面/VisionModeSettingForm.Designer.cs

@@ -96,19 +96,19 @@
             this.btn3D仿真拍照.OnColor = System.Drawing.Color.Green;
             this.btn3D仿真拍照.OnSymbol = 0;
             this.btn3D仿真拍照.OnText = "仿真拍照";
-            this.btn3D仿真拍照.ReadNode = new Node("Application.GVL_A29_Auto.b_仿真拍照", NodeType.BOOL, null);
+            this.btn3D仿真拍照.ReadNode = new Node("Application.A27_3DTestStation_Auto.b_仿真拍照", NodeType.BOOL, null);
             this.btn3D仿真拍照.Size = new System.Drawing.Size(150, 42);
             this.btn3D仿真拍照.Symbol = 0;
             this.btn3D仿真拍照.TabIndex = 191;
             this.btn3D仿真拍照.Text = "仿真拍照";
             this.btn3D仿真拍照.TipsFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn3D仿真拍照.WriteNode = new Node("Application.GVL_A29_Auto.b_仿真拍照", NodeType.BOOL, null);
+            this.btn3D仿真拍照.WriteNode = new Node("Application.A27_3DTestStation_Auto.b_仿真拍照", NodeType.BOOL, null);
             // 
             // tabPage3
             // 
             this.tabPage3.Location = new System.Drawing.Point(0, 40);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(521, 246);
+            this.tabPage3.Size = new System.Drawing.Size(200, 60);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "封装";
             this.tabPage3.UseVisualStyleBackColor = true;

YangjieTester/元件目标设置/CellTargetSettingForm.Designer.cs

@@ -175,7 +175,7 @@
             this.cob印字CCD检测NG料盒.MinimumSize = new System.Drawing.Size(63, 0);
             this.cob印字CCD检测NG料盒.Name = "cob印字CCD检测NG料盒";
             this.cob印字CCD检测NG料盒.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cob印字CCD检测NG料盒.ReadNode = new Node("Application.GVL_A24_Auto.ui自定义结果去向", NodeType.UINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
+            this.cob印字CCD检测NG料盒.ReadNode = new Node("Application.A23_LaserMarking_Auto.ui自定义结果去向", NodeType.UDINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
         "料盒4（1-4）");
             this.cob印字CCD检测NG料盒.Size = new System.Drawing.Size(127, 23);
             this.cob印字CCD检测NG料盒.SymbolSize = 24;
@@ -183,7 +183,7 @@
             this.cob印字CCD检测NG料盒.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.cob印字CCD检测NG料盒.UseItemNumberPreffix = true;
             this.cob印字CCD检测NG料盒.Watermark = "";
-            this.cob印字CCD检测NG料盒.WriteNode = new Node("Application.GVL_A24_Auto.ui自定义结果去向", NodeType.UINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
+            this.cob印字CCD检测NG料盒.WriteNode = new Node("Application.A23_LaserMarking_Auto.ui自定义结果去向", NodeType.UDINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
         "料盒4（1-4）");
             // 
             // uiLabel2
@@ -221,7 +221,7 @@
             this.cob3D检测NG料盒.MinimumSize = new System.Drawing.Size(63, 0);
             this.cob3D检测NG料盒.Name = "cob3D检测NG料盒";
             this.cob3D检测NG料盒.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cob3D检测NG料盒.ReadNode = new Node("Application.GVL_A29_Auto.ar自定义结果去向", NodeType.UINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
+            this.cob3D检测NG料盒.ReadNode = new Node("Application.A27_3DTestStation_Auto.ar自定义结果去向", NodeType.UDINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
         "料盒4（1-4）");
             this.cob3D检测NG料盒.Size = new System.Drawing.Size(127, 23);
             this.cob3D检测NG料盒.SymbolSize = 24;
@@ -229,7 +229,7 @@
             this.cob3D检测NG料盒.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.cob3D检测NG料盒.UseItemNumberPreffix = true;
             this.cob3D检测NG料盒.Watermark = "";
-            this.cob3D检测NG料盒.WriteNode = new Node("Application.GVL_A29_Auto.ar自定义结果去向", NodeType.UINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
+            this.cob3D检测NG料盒.WriteNode = new Node("Application.A27_3DTestStation_Auto.ar自定义结果去向", NodeType.UDINT, "1编带1；2编带2；11-12-13-14料盒1（1-4）；21-22-23-24料盒2（1-4）；31-32-33-34料盒3（1-4）；41-42-43-44" +
         "料盒4（1-4）");
             // 
             // cob测试4BIN12