C1横移修改

source/AssemblyLineClient/App.config

@@ -21,6 +21,7 @@
     <add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" />
     <add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" />
     <add key="ConfigPath_HYEquip" value="\LineConfig\HY\Config_HYEquip.csv" />
     <add key="ConfigPath_HYEquip" value="\LineConfig\HY\Config_HYEquip.csv" />
     <add key="ConfigPath_DischargeLine" value="\LineConfig\Config_DischargeLine.csv" />
     <add key="ConfigPath_DischargeLine" value="\LineConfig\Config_DischargeLine.csv" />
+    <add key ="ConfigPath_TrayList" value ="\LineConfig\TrayList.data"/>
     <add key="Line_Type" value="Line" />
     <add key="Line_Type" value="Line" />
     <add key="Line_CID" value="rc1250" />
     <add key="Line_CID" value="rc1250" />
     <!--end one store config-->
     <!--end one store config-->

source/AssemblyLineClient/FrmDischargeLine.Designer.cs

-namespace OnlineStore.AssemblyLine
-{
-    partial class FrmDischargeLine
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        #region Windows 窗体设计器生成的代码
-         
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmDischargeLine));
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.btnScan = new System.Windows.Forms.Button();
-            this.lblName = new System.Windows.Forms.Label();
-            this.chbDebug = new System.Windows.Forms.CheckBox();
-            this.lblStoreStatus = new System.Windows.Forms.Label();
-            this.btnStart = new System.Windows.Forms.Button();
-            this.btnStop = new System.Windows.Forms.Button();
-            this.btnReset = new System.Windows.Forms.Button();
-            this.btnScanCylinder = new System.Windows.Forms.Button();
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.btnLine2Test = new System.Windows.Forms.Button();
-            this.lblLineInfo = new System.Windows.Forms.Label();
-            this.btnStrart = new System.Windows.Forms.Button();
-            this.btnlineStop = new System.Windows.Forms.Button();
-            this.cmbLineType = new System.Windows.Forms.ComboBox();
-            this.btnLine1Test = new System.Windows.Forms.Button();
-            this.groupBox6 = new System.Windows.Forms.GroupBox();
-            this.lblThisSta = new System.Windows.Forms.Label();
-            this.lblTrayNum = new System.Windows.Forms.Label();
-            this.lblInstoreList = new System.Windows.Forms.Label();
-            this.lblMoveInfo = new System.Windows.Forms.Label();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.groupBox4 = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.groupBox5 = new System.Windows.Forms.GroupBox();
-            this.button2 = new System.Windows.Forms.Button();
-            this.btnNgMove = new System.Windows.Forms.Button();
-            this.btnSRun = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.btnRun2 = new System.Windows.Forms.Button();
-            this.btnRun3 = new System.Windows.Forms.Button();
-            this.btnRun1 = new System.Windows.Forms.Button();
-            this.btnStop1Up = new System.Windows.Forms.Button();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.txtDOIndex = new System.Windows.Forms.TextBox();
-            this.txtDoName = new System.Windows.Forms.TextBox();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.btnOpenDo = new System.Windows.Forms.Button();
-            this.btnWriteSingleDO = new System.Windows.Forms.Button();
-            this.txtWriteTime = new System.Windows.Forms.TextBox();
-            this.btnCloseAll = new System.Windows.Forms.Button();
-            this.label5 = new System.Windows.Forms.Label();
-            this.txtSlaveId = new System.Windows.Forms.TextBox();
-            this.cmbWriteIO = new System.Windows.Forms.ComboBox();
-            this.panel1.SuspendLayout();
-            this.tabControl1.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.groupBox6.SuspendLayout();
-            this.groupBox3.SuspendLayout();
-            this.groupBox4.SuspendLayout();
-            this.groupBox5.SuspendLayout();
-            this.groupBox1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // timer1
-            // 
-            this.timer1.Interval = 1000;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // panel1
-            // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel1.Controls.Add(this.btnScan);
-            this.panel1.Controls.Add(this.lblName);
-            this.panel1.Controls.Add(this.chbDebug);
-            this.panel1.Controls.Add(this.lblStoreStatus);
-            this.panel1.Controls.Add(this.btnStart);
-            this.panel1.Controls.Add(this.btnStop);
-            this.panel1.Controls.Add(this.btnReset);
-            this.panel1.Location = new System.Drawing.Point(2, 1);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1312, 56);
-            this.panel1.TabIndex = 258;
-            // 
-            // btnScan
-            // 
-            this.btnScan.BackColor = System.Drawing.Color.White;
-            this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnScan.Location = new System.Drawing.Point(532, 11);
-            this.btnScan.Name = "btnScan";
-            this.btnScan.Size = new System.Drawing.Size(110, 40);
-            this.btnScan.TabIndex = 249;
-            this.btnScan.Text = "扫码测试";
-            this.btnScan.UseVisualStyleBackColor = false;
-            this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
-            // 
-            // lblName
-            // 
-            this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
-            this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblName.ForeColor = System.Drawing.Color.Black;
-            this.lblName.Location = new System.Drawing.Point(5, 11);
-            this.lblName.Name = "lblName";
-            this.lblName.Size = new System.Drawing.Size(180, 40);
-            this.lblName.TabIndex = 248;
-            this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // chbDebug
-            // 
-            this.chbDebug.AutoSize = true;
-            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(660, 19);
-            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(84, 24);
-            this.chbDebug.TabIndex = 247;
-            this.chbDebug.Text = "调试状态";
-            this.chbDebug.UseVisualStyleBackColor = true;
-            this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
-            // 
-            // lblStoreStatus
-            // 
-            this.lblStoreStatus.AutoSize = true;
-            this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
-            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblStoreStatus.Location = new System.Drawing.Point(761, 21);
-            this.lblStoreStatus.Name = "lblStoreStatus";
-            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
-            this.lblStoreStatus.TabIndex = 245;
-            this.lblStoreStatus.Text = "等待启动";
-            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // btnStart
-            // 
-            this.btnStart.BackColor = System.Drawing.Color.White;
-            this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStart.Location = new System.Drawing.Point(190, 11);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(110, 40);
-            this.btnStart.TabIndex = 86;
-            this.btnStart.Text = "启动调试";
-            this.btnStart.UseVisualStyleBackColor = false;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
-            // btnStop
-            // 
-            this.btnStop.BackColor = System.Drawing.Color.White;
-            this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop.Location = new System.Drawing.Point(304, 11);
-            this.btnStop.Name = "btnStop";
-            this.btnStop.Size = new System.Drawing.Size(110, 40);
-            this.btnStop.TabIndex = 87;
-            this.btnStop.Text = "停止";
-            this.btnStop.UseVisualStyleBackColor = false;
-            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
-            // 
-            // btnReset
-            // 
-            this.btnReset.BackColor = System.Drawing.Color.White;
-            this.btnReset.Enabled = false;
-            this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnReset.Location = new System.Drawing.Point(418, 11);
-            this.btnReset.Name = "btnReset";
-            this.btnReset.Size = new System.Drawing.Size(110, 40);
-            this.btnReset.TabIndex = 95;
-            this.btnReset.Text = "复位";
-            this.btnReset.UseVisualStyleBackColor = false;
-            this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
-            // 
-            // btnScanCylinder
-            // 
-            this.btnScanCylinder.BackColor = System.Drawing.Color.White;
-            this.btnScanCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnScanCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnScanCylinder.Location = new System.Drawing.Point(271, 62);
-            this.btnScanCylinder.Name = "btnScanCylinder";
-            this.btnScanCylinder.Size = new System.Drawing.Size(128, 34);
-            this.btnScanCylinder.TabIndex = 266;
-            this.btnScanCylinder.Text = "扫码NG气缸前进";
-            this.btnScanCylinder.UseVisualStyleBackColor = false;
-            this.btnScanCylinder.Click += new System.EventHandler(this.btnScanCylinder_Click);
-            // 
-            // tabControl1
-            // 
-            this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tabControl1.Controls.Add(this.tabPage1);
-            this.tabControl1.Location = new System.Drawing.Point(4, 60);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1310, 519);
-            this.tabControl1.TabIndex = 257;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.groupBox2);
-            this.tabPage1.Controls.Add(this.groupBox6);
-            this.tabPage1.Controls.Add(this.groupBox3);
-            this.tabPage1.Controls.Add(this.groupBox4);
-            this.tabPage1.Controls.Add(this.groupBox5);
-            this.tabPage1.Controls.Add(this.groupBox1);
-            this.tabPage1.Location = new System.Drawing.Point(4, 26);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1302, 489);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "    IO列表     ";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.btnLine2Test);
-            this.groupBox2.Controls.Add(this.lblLineInfo);
-            this.groupBox2.Controls.Add(this.btnStrart);
-            this.groupBox2.Controls.Add(this.btnlineStop);
-            this.groupBox2.Controls.Add(this.cmbLineType);
-            this.groupBox2.Controls.Add(this.btnLine1Test);
-            this.groupBox2.Location = new System.Drawing.Point(491, 157);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(805, 66);
-            this.groupBox2.TabIndex = 279;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "皮带转动测试";
-            // 
-            // btnLine2Test
-            // 
-            this.btnLine2Test.BackColor = System.Drawing.Color.White;
-            this.btnLine2Test.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnLine2Test.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnLine2Test.Location = new System.Drawing.Point(662, 16);
-            this.btnLine2Test.Name = "btnLine2Test";
-            this.btnLine2Test.Size = new System.Drawing.Size(110, 40);
-            this.btnLine2Test.TabIndex = 250;
-            this.btnLine2Test.Text = "皮带线2出库测试";
-            this.btnLine2Test.UseVisualStyleBackColor = false;
-            this.btnLine2Test.Click += new System.EventHandler(this.btnLine2Test_Click);
-            // 
-            // lblLineInfo
-            // 
-            this.lblLineInfo.AutoSize = true;
-            this.lblLineInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblLineInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblLineInfo.Location = new System.Drawing.Point(8, 28);
-            this.lblLineInfo.Name = "lblLineInfo";
-            this.lblLineInfo.Size = new System.Drawing.Size(68, 17);
-            this.lblLineInfo.TabIndex = 280;
-            this.lblLineInfo.Text = "线体未启动";
-            // 
-            // btnStrart
-            // 
-            this.btnStrart.BackColor = System.Drawing.Color.White;
-            this.btnStrart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStrart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStrart.Location = new System.Drawing.Point(325, 19);
-            this.btnStrart.Name = "btnStrart";
-            this.btnStrart.Size = new System.Drawing.Size(100, 34);
-            this.btnStrart.TabIndex = 267;
-            this.btnStrart.Text = "开始";
-            this.btnStrart.UseVisualStyleBackColor = false;
-            this.btnStrart.Click += new System.EventHandler(this.btnStrart_Click);
-            // 
-            // btnlineStop
-            // 
-            this.btnlineStop.BackColor = System.Drawing.Color.White;
-            this.btnlineStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnlineStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnlineStop.Location = new System.Drawing.Point(434, 19);
-            this.btnlineStop.Name = "btnlineStop";
-            this.btnlineStop.Size = new System.Drawing.Size(100, 34);
-            this.btnlineStop.TabIndex = 266;
-            this.btnlineStop.Text = "停止";
-            this.btnlineStop.UseVisualStyleBackColor = false;
-            this.btnlineStop.Click += new System.EventHandler(this.btnlineStop_Click);
-            // 
-            // cmbLineType
-            // 
-            this.cmbLineType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbLineType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmbLineType.FormattingEnabled = true;
-            this.cmbLineType.Location = new System.Drawing.Point(85, 22);
-            this.cmbLineType.Name = "cmbLineType";
-            this.cmbLineType.Size = new System.Drawing.Size(231, 28);
-            this.cmbLineType.TabIndex = 0;
-            // 
-            // btnLine1Test
-            // 
-            this.btnLine1Test.BackColor = System.Drawing.Color.White;
-            this.btnLine1Test.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnLine1Test.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnLine1Test.Location = new System.Drawing.Point(543, 16);
-            this.btnLine1Test.Name = "btnLine1Test";
-            this.btnLine1Test.Size = new System.Drawing.Size(110, 40);
-            this.btnLine1Test.TabIndex = 101;
-            this.btnLine1Test.Text = "皮带线1出库测试";
-            this.btnLine1Test.UseVisualStyleBackColor = false;
-            this.btnLine1Test.Click += new System.EventHandler(this.btnOutStore_Click);
-            // 
-            // groupBox6
-            // 
-            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox6.Controls.Add(this.lblThisSta);
-            this.groupBox6.Controls.Add(this.lblTrayNum);
-            this.groupBox6.Controls.Add(this.lblInstoreList);
-            this.groupBox6.Controls.Add(this.lblMoveInfo);
-            this.groupBox6.Location = new System.Drawing.Point(491, 227);
-            this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(808, 256);
-            this.groupBox6.TabIndex = 278;
-            this.groupBox6.TabStop = false;
-            this.groupBox6.Text = "消息";
-            // 
-            // lblThisSta
-            // 
-            this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblThisSta.ForeColor = System.Drawing.Color.Red;
-            this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblThisSta.Location = new System.Drawing.Point(271, 14);
-            this.lblThisSta.Name = "lblThisSta";
-            this.lblThisSta.Size = new System.Drawing.Size(531, 137);
-            this.lblThisSta.TabIndex = 246;
-            this.lblThisSta.Text = "等待启动";
-            this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // lblTrayNum
-            // 
-            this.lblTrayNum.AutoSize = true;
-            this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblTrayNum.Location = new System.Drawing.Point(29, 29);
-            this.lblTrayNum.Name = "lblTrayNum";
-            this.lblTrayNum.Size = new System.Drawing.Size(0, 17);
-            this.lblTrayNum.TabIndex = 276;
-            this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // lblInstoreList
-            // 
-            this.lblInstoreList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
-            this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblInstoreList.Location = new System.Drawing.Point(267, 228);
-            this.lblInstoreList.Name = "lblInstoreList";
-            this.lblInstoreList.Size = new System.Drawing.Size(535, 53);
-            this.lblInstoreList.TabIndex = 277;
-            // 
-            // lblMoveInfo
-            // 
-            this.lblMoveInfo.AutoSize = true;
-            this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblMoveInfo.Location = new System.Drawing.Point(6, 22);
-            this.lblMoveInfo.Name = "lblMoveInfo";
-            this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
-            this.lblMoveInfo.TabIndex = 279;
-            this.lblMoveInfo.Text = "运动信息：";
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.groupBox3.Controls.Add(this.tableLayoutPanel1);
-            this.groupBox3.Location = new System.Drawing.Point(6, 6);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(240, 477);
-            this.groupBox3.TabIndex = 103;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "DI列表";
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel1.ColumnCount = 1;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 2;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 457);
-            this.tableLayoutPanel1.TabIndex = 102;
-            // 
-            // groupBox4
-            // 
-            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.groupBox4.Controls.Add(this.tableLayoutPanel2);
-            this.groupBox4.Location = new System.Drawing.Point(248, 6);
-            this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(240, 477);
-            this.groupBox4.TabIndex = 104;
-            this.groupBox4.TabStop = false;
-            this.groupBox4.Text = "DO列表";
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tableLayoutPanel2.ColumnCount = 1;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 2;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 457);
-            this.tableLayoutPanel2.TabIndex = 103;
-            // 
-            // groupBox5
-            // 
-            this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox5.Controls.Add(this.btnScanCylinder);
-            this.groupBox5.Controls.Add(this.button2);
-            this.groupBox5.Controls.Add(this.btnNgMove);
-            this.groupBox5.Controls.Add(this.btnSRun);
-            this.groupBox5.Controls.Add(this.button1);
-            this.groupBox5.Controls.Add(this.btnRun2);
-            this.groupBox5.Controls.Add(this.btnRun3);
-            this.groupBox5.Controls.Add(this.btnRun1);
-            this.groupBox5.Controls.Add(this.btnStop1Up);
-            this.groupBox5.Location = new System.Drawing.Point(876, 6);
-            this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(420, 147);
-            this.groupBox5.TabIndex = 255;
-            this.groupBox5.TabStop = false;
-            this.groupBox5.Text = "IO操作测试";
-            // 
-            // button2
-            // 
-            this.button2.BackColor = System.Drawing.Color.White;
-            this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button2.Location = new System.Drawing.Point(140, 62);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(128, 34);
-            this.button2.TabIndex = 266;
-            this.button2.Text = "分盘装置电机反转";
-            this.button2.UseVisualStyleBackColor = false;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // btnNgMove
-            // 
-            this.btnNgMove.BackColor = System.Drawing.Color.White;
-            this.btnNgMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNgMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnNgMove.Location = new System.Drawing.Point(271, 102);
-            this.btnNgMove.Name = "btnNgMove";
-            this.btnNgMove.Size = new System.Drawing.Size(128, 34);
-            this.btnNgMove.TabIndex = 264;
-            this.btnNgMove.Text = "入库NG气缸前进";
-            this.btnNgMove.UseVisualStyleBackColor = false;
-            this.btnNgMove.Click += new System.EventHandler(this.btnNgMove_Click);
-            // 
-            // btnSRun
-            // 
-            this.btnSRun.BackColor = System.Drawing.Color.White;
-            this.btnSRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSRun.Location = new System.Drawing.Point(140, 22);
-            this.btnSRun.Name = "btnSRun";
-            this.btnSRun.Size = new System.Drawing.Size(128, 34);
-            this.btnSRun.TabIndex = 263;
-            this.btnSRun.Text = "分盘装置电机正转";
-            this.btnSRun.UseVisualStyleBackColor = false;
-            this.btnSRun.Click += new System.EventHandler(this.btnSRun_Click);
-            // 
-            // button1
-            // 
-            this.button1.BackColor = System.Drawing.Color.White;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(140, 102);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(128, 34);
-            this.button1.TabIndex = 265;
-            this.button1.Text = "分盘装置电机停止";
-            this.button1.UseVisualStyleBackColor = false;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // btnRun2
-            // 
-            this.btnRun2.BackColor = System.Drawing.Color.White;
-            this.btnRun2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnRun2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRun2.Location = new System.Drawing.Point(8, 62);
-            this.btnRun2.Name = "btnRun2";
-            this.btnRun2.Size = new System.Drawing.Size(128, 34);
-            this.btnRun2.TabIndex = 262;
-            this.btnRun2.Text = "皮带线2运转";
-            this.btnRun2.UseVisualStyleBackColor = false;
-            this.btnRun2.Click += new System.EventHandler(this.btnRun2_Click);
-            // 
-            // btnRun3
-            // 
-            this.btnRun3.BackColor = System.Drawing.Color.White;
-            this.btnRun3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnRun3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRun3.Location = new System.Drawing.Point(8, 102);
-            this.btnRun3.Name = "btnRun3";
-            this.btnRun3.Size = new System.Drawing.Size(128, 34);
-            this.btnRun3.TabIndex = 261;
-            this.btnRun3.Text = "皮带线3运转";
-            this.btnRun3.UseVisualStyleBackColor = false;
-            this.btnRun3.Click += new System.EventHandler(this.btnRun3_Click);
-            // 
-            // btnRun1
-            // 
-            this.btnRun1.BackColor = System.Drawing.Color.White;
-            this.btnRun1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnRun1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRun1.Location = new System.Drawing.Point(8, 22);
-            this.btnRun1.Name = "btnRun1";
-            this.btnRun1.Size = new System.Drawing.Size(128, 34);
-            this.btnRun1.TabIndex = 260;
-            this.btnRun1.Text = "皮带线1运转";
-            this.btnRun1.UseVisualStyleBackColor = false;
-            this.btnRun1.Click += new System.EventHandler(this.btnRun1_Click);
-            // 
-            // btnStop1Up
-            // 
-            this.btnStop1Up.BackColor = System.Drawing.Color.White;
-            this.btnStop1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop1Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop1Up.Location = new System.Drawing.Point(271, 22);
-            this.btnStop1Up.Name = "btnStop1Up";
-            this.btnStop1Up.Size = new System.Drawing.Size(128, 34);
-            this.btnStop1Up.TabIndex = 256;
-            this.btnStop1Up.Text = "定位气缸上升";
-            this.btnStop1Up.UseVisualStyleBackColor = false;
-            this.btnStop1Up.Click += new System.EventHandler(this.btnStop1Up_Click);
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.txtDOIndex);
-            this.groupBox1.Controls.Add(this.txtDoName);
-            this.groupBox1.Controls.Add(this.label17);
-            this.groupBox1.Controls.Add(this.label14);
-            this.groupBox1.Controls.Add(this.btnOpenDo);
-            this.groupBox1.Controls.Add(this.btnWriteSingleDO);
-            this.groupBox1.Controls.Add(this.txtWriteTime);
-            this.groupBox1.Controls.Add(this.btnCloseAll);
-            this.groupBox1.Controls.Add(this.label5);
-            this.groupBox1.Controls.Add(this.txtSlaveId);
-            this.groupBox1.Controls.Add(this.cmbWriteIO);
-            this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox1.Location = new System.Drawing.Point(491, 6);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(382, 147);
-            this.groupBox1.TabIndex = 105;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "DO写入";
-            // 
-            // txtDOIndex
-            // 
-            this.txtDOIndex.Enabled = false;
-            this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDOIndex.Location = new System.Drawing.Point(201, 63);
-            this.txtDOIndex.MaxLength = 10;
-            this.txtDOIndex.Name = "txtDOIndex";
-            this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
-            this.txtDOIndex.TabIndex = 268;
-            this.txtDOIndex.Text = "0";
-            // 
-            // txtDoName
-            // 
-            this.txtDoName.Enabled = false;
-            this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDoName.Location = new System.Drawing.Point(40, 63);
-            this.txtDoName.MaxLength = 10;
-            this.txtDoName.Name = "txtDoName";
-            this.txtDoName.Size = new System.Drawing.Size(116, 23);
-            this.txtDoName.TabIndex = 267;
-            this.txtDoName.Text = "0";
-            // 
-            // label17
-            // 
-            this.label17.AutoSize = true;
-            this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label17.Location = new System.Drawing.Point(13, 66);
-            this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(22, 17);
-            this.label17.TabIndex = 266;
-            this.label17.Text = "IP:";
-            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label14.Location = new System.Drawing.Point(161, 66);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(35, 17);
-            this.label14.TabIndex = 265;
-            this.label14.Text = "地址:";
-            this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // btnOpenDo
-            // 
-            this.btnOpenDo.BackColor = System.Drawing.Color.White;
-            this.btnOpenDo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOpenDo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOpenDo.Location = new System.Drawing.Point(14, 102);
-            this.btnOpenDo.Name = "btnOpenDo";
-            this.btnOpenDo.Size = new System.Drawing.Size(100, 34);
-            this.btnOpenDo.TabIndex = 264;
-            this.btnOpenDo.Text = "打开";
-            this.btnOpenDo.UseVisualStyleBackColor = false;
-            this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
-            // 
-            // btnWriteSingleDO
-            // 
-            this.btnWriteSingleDO.BackColor = System.Drawing.Color.White;
-            this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnWriteSingleDO.Location = new System.Drawing.Point(126, 102);
-            this.btnWriteSingleDO.Name = "btnWriteSingleDO";
-            this.btnWriteSingleDO.Size = new System.Drawing.Size(100, 34);
-            this.btnWriteSingleDO.TabIndex = 261;
-            this.btnWriteSingleDO.Text = "关闭";
-            this.btnWriteSingleDO.UseVisualStyleBackColor = false;
-            this.btnWriteSingleDO.Click += new System.EventHandler(this.btnWriteSingleDO_Click);
-            // 
-            // txtWriteTime
-            // 
-            this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtWriteTime.Location = new System.Drawing.Point(318, 62);
-            this.txtWriteTime.MaxLength = 10;
-            this.txtWriteTime.Name = "txtWriteTime";
-            this.txtWriteTime.Size = new System.Drawing.Size(46, 23);
-            this.txtWriteTime.TabIndex = 263;
-            this.txtWriteTime.Text = "0";
-            // 
-            // btnCloseAll
-            // 
-            this.btnCloseAll.BackColor = System.Drawing.Color.White;
-            this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCloseAll.Location = new System.Drawing.Point(238, 102);
-            this.btnCloseAll.Name = "btnCloseAll";
-            this.btnCloseAll.Size = new System.Drawing.Size(128, 34);
-            this.btnCloseAll.TabIndex = 259;
-            this.btnCloseAll.Text = "关闭所有DO";
-            this.btnCloseAll.UseVisualStyleBackColor = false;
-            this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.label5.Location = new System.Drawing.Point(253, 65);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(60, 17);
-            this.label5.TabIndex = 262;
-            this.label5.Text = "定时(ms):";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // txtSlaveId
-            // 
-            this.txtSlaveId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtSlaveId.Location = new System.Drawing.Point(417, 26);
-            this.txtSlaveId.MaxLength = 10;
-            this.txtSlaveId.Name = "txtSlaveId";
-            this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
-            this.txtSlaveId.TabIndex = 255;
-            this.txtSlaveId.Text = "0";
-            this.txtSlaveId.Visible = false;
-            // 
-            // cmbWriteIO
-            // 
-            this.cmbWriteIO.DisplayMember = "ProName";
-            this.cmbWriteIO.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
-            this.cmbWriteIO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmbWriteIO.FormattingEnabled = true;
-            this.cmbWriteIO.ItemHeight = 22;
-            this.cmbWriteIO.Location = new System.Drawing.Point(11, 25);
-            this.cmbWriteIO.Name = "cmbWriteIO";
-            this.cmbWriteIO.Size = new System.Drawing.Size(356, 28);
-            this.cmbWriteIO.TabIndex = 234;
-            this.cmbWriteIO.ValueMember = "ProName";
-            this.cmbWriteIO.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.cmbWriteIO_DrawItem);
-            this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
-            // 
-            // FrmDischargeLine
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1318, 582);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.tabControl1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmDischargeLine";
-            this.Text = "出料流水线——";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
-            this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
-            this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            this.tabControl1.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.groupBox6.ResumeLayout(false);
-            this.groupBox6.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.groupBox4.ResumeLayout(false);
-            this.groupBox5.ResumeLayout(false);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private System.Windows.Forms.GroupBox groupBox4;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.ComboBox cmbWriteIO;
-        private System.Windows.Forms.TextBox txtSlaveId;
-        private System.Windows.Forms.GroupBox groupBox5;
-        private System.Windows.Forms.Label lblThisSta;
-        private System.Windows.Forms.Label lblStoreStatus;
-        private System.Windows.Forms.Button btnStart;
-        private System.Windows.Forms.Button btnStop;
-        private System.Windows.Forms.Button btnReset;
-        private System.Windows.Forms.Button btnLine1Test;
-        private System.Windows.Forms.CheckBox chbDebug;
-        private System.Windows.Forms.Button btnStop1Up;
-        private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Button btnCloseAll;
-        private System.Windows.Forms.Label lblTrayNum;
-        private System.Windows.Forms.GroupBox groupBox6;
-        private System.Windows.Forms.Label lblInstoreList;
-        private System.Windows.Forms.TextBox txtDOIndex;
-        private System.Windows.Forms.TextBox txtDoName;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Button btnOpenDo;
-        private System.Windows.Forms.Button btnWriteSingleDO;
-        private System.Windows.Forms.TextBox txtWriteTime;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Button btnSRun;
-        private System.Windows.Forms.Button btnRun2;
-        private System.Windows.Forms.Button btnRun3;
-        private System.Windows.Forms.Button btnRun1;
-        private System.Windows.Forms.Label lblName;
-        private System.Windows.Forms.Label lblMoveInfo;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.Button btnStrart;
-        private System.Windows.Forms.Button btnlineStop;
-        private System.Windows.Forms.ComboBox cmbLineType;
-        private System.Windows.Forms.Label lblLineInfo;
-        private System.Windows.Forms.Button btnScan;
-        private System.Windows.Forms.Button btnLine2Test;
-        private System.Windows.Forms.Button btnNgMove;
-        private System.Windows.Forms.Button btnScanCylinder;
-        private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.Button button2;
-    }
-}
-

source/AssemblyLineClient/FrmDischargeLine.cs

-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.IO;
-using System.Runtime.InteropServices;
-using OnlineStore.DeviceLibrary;
-using log4net;
-using System.Reflection;
-using UserFromControl;
-using OnlineStore.LoadCSVLibrary;
-using OnlineStore.Common;
-
-
-namespace OnlineStore.AssemblyLine
-{
-    internal partial class FrmDischargeLine : FrmEquipBase
-    {
-        private bool IsLoad = false;
-        private DischargeLine equipBean;
-
-        private string line1Name = "皮带线1";
-        private string line2Name = "皮带线2";
-        private string line3Name = "皮带线3";
-        internal FrmDischargeLine(DischargeLine moveEquip)
-        {
-            equipBase = moveEquip;
-            dlineRun = new LineTurnBean(equipBase.DeviceID);
-            this.equipBean = moveEquip;
-            Control.CheckForIllegalCrossThreadCalls = false;
-            InitializeComponent();
-            LoadIOList();
-        }
-
-        private void LoadIOList()
-        {
-            int roleindex = 0;
-            this.tableLayoutPanel1.RowStyles.Clear();
-            this.tableLayoutPanel1.RowCount = equipBean.Config.DIList.Count;
-            foreach (ConfigIO ioValue in equipBean.Config.DIList.Values)
-            {
-                this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 25));
-                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
-                this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
-                roleindex++;
-                DIControlList.Add(ioValue.ProName, control);
-            }
-
-            tableLayoutPanel2.RowStyles.Clear();
-            this.tableLayoutPanel2.RowCount = equipBean.Config.DOList.Count;
-            roleindex = 0;
-            foreach (ConfigIO ioValue in equipBean.Config.DOList.Values)
-            {
-                this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
-                IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
-                control.Click += Control_Click;
-                this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
-                roleindex++;
-                DOControlList.Add(ioValue.ProName, control);
-            }
-            this.SuspendLayout();    //此处为不闪屏，一定要有的！ 
-
-            cmbWriteIO.DataSource = new List<ConfigIO>(equipBean.Config.DOList.Values);
-            cmbWriteIO.ValueMember = "ProName";
-            cmbWriteIO.DisplayMember = "DisplayStr";
-
-        }
-        private void Control_Click(object sender, EventArgs e)
-        {
-            IOTextControl control = (IOTextControl)sender;
-            string name = control.Name.Substring(3, control.Name.Length - 3);
-            List<string> keyList = new List<string>(DOControlList.Keys);
-            int index = keyList.IndexOf(name);
-            if (index >= 0)
-            {
-                cmbWriteIO.SelectedIndex = index;
-            }
-        }
-        private LineTurnBean dlineRun = null;
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            try
-            {
-                if (!this.Visible)
-                {
-                    return;
-                }
-                if (this.Visible)
-                {
-                    ReadIOList();
-                    //lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
-                }
-                cmbLineType.Enabled = !dlineRun.InTurn;
-                if (dlineRun.InTurn)
-                {
-                    lblLineInfo.Text = "线体运转中";
-                    lblLineInfo.ForeColor = Color.Green;
-                }
-                else
-                {
-                    lblLineInfo.Text = "线体未运转";
-                    lblLineInfo.ForeColor = Color.Black;
-                }
-                if (equipBean.runStatus > LineRunStatus.Wait)
-                {
-                    lblName.BackColor = Color.Green;
-                    if (btnStart.Enabled)
-                    {
-                        FormStatus(true);
-                    }
-                }
-                else
-                {
-                    lblName.BackColor = System.Drawing.Color.DodgerBlue;
-                    if (!btnStart.Enabled)
-                    {
-                        FormStatus(false);
-                    }
-                }
-                lblMoveInfo.Text = equipBean.GetMoveStr();
-                lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
-                lblThisSta.Text = equipBean.WarnMsg;
-            }
-            catch (Exception ex)
-            {
-                LogUtil.error(equipBean.Name + "界面定时器出错：" ,ex);
-            }
-
-        }
-
-        private void FrmTest_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            // KNDAIManager.NeedShow = false;
-            try
-            {
-                if (this.timer1.Enabled)
-                {
-                    this.timer1.Enabled = false;
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.StackTrace, "Exception(异常)", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                LogUtil.error("",ex);
-            }
-        }
-        private void btnOpenDo_Click(object sender, EventArgs e)
-        {
-            WriteDO(IO_VALUE.HIGH);
-        }
-        private void btnWriteSingleDO_Click(object sender, EventArgs e)
-        {
-            WriteDO(IO_VALUE.LOW);
-        }
-        private void WriteDO(IO_VALUE value)
-        {
-            string deviceName = txtDoName.Text;
-            int index = FormUtil.GetIntValue(txtDOIndex);
-            //   IO_VALUE value = checkBox1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW;
-            int time = FormUtil.GetIntValue(txtWriteTime);
-            int slaveId = FormUtil.GetIntValue(txtSlaveId);
-            if (time > 0)
-            {
-                IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value, time);
-            }
-            else
-            {
-                IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value);
-            }
-        }
-
-
-        private ConfigIO GetSelectDO()
-        {
-            string text = cmbWriteIO.SelectedValue.ToString();
-            if (equipBean.Config.DOList.ContainsKey(text))
-            {
-                ConfigIO io = equipBean.Config.DOList[text];
-                return io;
-            }
-            return null;
-        }
-        IOTextControl selectControl = null;
-        private void cmbWriteIO_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (cmbWriteIO.SelectedIndex >= 0)
-            {
-                ConfigIO io = GetSelectDO();
-                if (io != null)
-                {
-                    // txtIp.Text = io.DeviceName;
-                    txtDOIndex.Text = io.GetIOAddr().ToString();
-                    txtDoName.Text = io.IO_IP;
-                    txtSlaveId.Text = io.SlaveID.ToString();
-                    IOTextControl newControl = DOControlList[io.ProName];
-                    if (selectControl != null) { selectControl.BackColor = Color.White; }
-                    newControl.BackColor = Color.SkyBlue;
-                    selectControl = newControl;
-                }
-            }
-        }
-
-        private void FrmStoreIOStatus_Load(object sender, EventArgs e)
-        {
-            chbDebug.Checked = equipBean.IsDebug;
-            lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
-            lblThisSta.Text = equipBean.WarnMsg;
-            lblName.Text = equipBean.Name;
-            btnNgMove.Visible = false;
-            if (equipBean.DeviceID.Equals(302))
-            {
-                line1Name = "皮带线4";
-                line2Name = "皮带线5";
-                line3Name = "皮带线6";
-                btnNgMove.Visible = true;
-            }
-            btnRun1.Text = line1Name + "运转";
-            btnRun2.Text = line2Name + "运转";
-            btnRun3.Text = line3Name + "运转";
-            btnLine1Test.Text = line1Name + "出库测试";
-            btnLine2Test.Text = line2Name + "出库测试";
-            this.cmbLineType.Items.AddRange(new object[] {
-            //line1Name+"运转-入口定位",
-            //line2Name+"运转-入口定位",
-            line3Name+"运转测试",
-            line1Name+"运转测试",
-            line2Name+"运转测试"});
-            cmbLineType.SelectedIndex = 0;
-            IsLoad = true;
-        }
-
-        private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
-        {
-            if (e.Index < 0)
-            {
-                return;
-            }
-            e.DrawBackground();
-            e.DrawFocusRectangle();
-            if (cmbWriteIO.Items.Count > e.Index)
-            {
-                ConfigIO io = (ConfigIO)cmbWriteIO.Items[e.Index];
-                e.Graphics.DrawString(io.DisplayStr, e.Font, new SolidBrush(e.ForeColor), e.Bounds.X, e.Bounds.Y + 3);
-            }
-        }
-        private void btnReadIO_Click(object sender, EventArgs e)
-        {
-            ReadIOList();
-        }
-
-        internal override void FormStatus(bool isStart)
-        {
-            btnStart.Enabled = !isStart;
-            btnStop.Enabled = true;
-            btnReset.Enabled = isStart;
-            //btnInStore.Enabled = isStart;
-            btnLine1Test.Enabled = isStart;
-        }
-        private void FrmIOStatus_Shown(object sender, EventArgs e)
-        {
-            timer1.Start();
-        }
-
-        private void btnStart_Click(object sender, EventArgs e)
-        {
-            LogUtil.info(equipBean.Name + "点击：启用调试");
-            StartDebug();
-        }
-        private void btnStop_Click(object sender, EventArgs e)
-        {
-            LogUtil.info(equipBean.Name + "点击：停止");
-            StopRun();
-        }
-        private void btnReset_Click(object sender, EventArgs e)
-        {
-            LogUtil.info(equipBean.Name + "点击：复位");
-            Reset();
-        }
-
-        private void chbDebug_CheckedChanged(object sender, EventArgs e)
-        {
-            if (!IsLoad)
-            {
-                return;
-            }
-
-            if (chbDebug.Checked)
-            {
-                if (!equipBean.IsDebug)
-                {
-                    DialogResult result = MessageBox.Show("是否切换到调试状态？", "是否确认切换", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
-                    if (result.Equals(DialogResult.Yes))
-                    {
-                        equipBean.IsDebug = true;
-                        equipBean.Config.IsDebug = 1;
-                        LineManager.SaveDischargeLineConfig(equipBean.Config);
-                        equipBean.ChangeDebug(true);
-                        LogUtil.info(equipBean.Name + "用户切换到调试状态 ");
-                    }
-                }
-            }
-            else
-            {
-                if (equipBean.IsDebug)
-                {
-                    DialogResult result = MessageBox.Show("是否切换到正常工作状态？", "是否确认切换", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
-                    if (result.Equals(DialogResult.Yes))
-                    {
-                        equipBean.IsDebug = false;
-                        equipBean.Config.IsDebug = 0;
-                        LineManager.SaveDischargeLineConfig(equipBean.Config);
-                        equipBean.ChangeDebug(false);
-                        LogUtil.info(equipBean.Name + "用户切换到正常工作状态 ");
-                    }
-                }
-            }
-        }
-
-        private void btnOutStore_Click(object sender, EventArgs e)
-        { 
-            bool result = equipBean.TrayLine1.StartOut(new InOutParam(0, "CodeTest", "1#AC1_1_1", 8, 7));
-            if (!result)
-            {
-                MessageBox.Show(line1Name+"出库测试失败");
-            }
-        } 
-        private void btnCloseAll_Click(object sender, EventArgs e)
-        {
-            foreach (Control con in groupBox5.Controls)
-            {
-                if (con is Button)
-                {
-                    con.BackColor = BackColor = Color.White;
-                }
-            }
-            foreach (ConfigIO io in equipBase.baseConfig.DOList.Values)
-            {
-                IOManager.instance.WriteSingleDO(io.IO_IP, io.SlaveID, io.GetIOAddr(), IO_VALUE.LOW);
-            }
-        }
-        private void btnStop1Up_Click(object sender, EventArgs e)
-        {
-            BtnMove(btnStop1Up, "定位气缸上升", "定位气缸下降", IO_Type.SeparateDevice_Down, IO_Type.SeparateDevice_Up);
-        }
-        private void btnRun1_Click(object sender, EventArgs e)
-        {
-            BtnMove(btnRun1, line1Name+"运转", line1Name+"停止", IO_Type.DLine_Run1);
-        }
-
-        private void btnRun2_Click(object sender, EventArgs e)
-        {
-            BtnMove(btnRun2, line2Name+"运转", line2Name+"停止", IO_Type.DLine_Run2);
-        }
-
-        private void btnRun3_Click(object sender, EventArgs e)
-        {
-            BtnMove(btnRun3, line3Name+"运转", line3Name+"停止", IO_Type.DLine_Run3);
-        }
-
-        private void btnSRun_Click(object sender, EventArgs e)
-        {
-            LogUtil.info(equipBase.Name + "点击【" + btnSRun.Text + "】 ");
-            equipBean.SeparateLineRun(); 
-        }
-
-        private void btnStrart_Click(object sender, EventArgs e)
-        {
-            if (dlineRun.InTurn)
-            {
-                MessageBox.Show("线体已在运转中，请先点击停止");
-                return;
-            }
-            int index = cmbLineType.SelectedIndex;
-            string moveIo = IO_Type.DLine_Run3;
-            string waitIo = IO_Type.Location_Check3;
-
-            if (index.Equals(1))
-            {
-                moveIo = IO_Type.DLine_Run1;
-                waitIo = IO_Type.ExitLocation_Check1;
-            }
-            else if (index.Equals(2))
-            {
-                moveIo = IO_Type.DLine_Run2;
-                waitIo = IO_Type.ExitLocation_Check2;
-            } 
-            dlineRun.StartLineRun(moveIo, waitIo,null);
-            cmbLineType.Enabled = false;
-        }
-
-        private void btnlineStop_Click(object sender, EventArgs e)
-        {
-            dlineRun.StopLineRun();
-        }
-
-        private void btnScan_Click(object sender, EventArgs e)
-        {
-            List<string> camers = equipBean.Config.GetCameraList();
-            List<string> LastCodeList = CodeManager.CameraScan(camers,equipBean.Name.Trim()+"测试",true);
-            string cameraStr = "";
-            foreach (string ca in camers)
-            {
-                cameraStr += ca + "#";
-            }
-            cameraStr = cameraStr.Substring(0, cameraStr.Length - 1);
-
-            string msg = CodeManager.ProcessCode(LastCodeList); 
-            LogUtil.info(equipBean.Name + "[" + cameraStr + "]扫码测试结果：\r\n" + msg);
-            MessageBox.Show(equipBean.Name + "[" + cameraStr + "]扫码测试结果：" + msg);
-        }
-
-        private void btnLine2Test_Click(object sender, EventArgs e)
-        {
-            bool isNg = true ; 
-            bool result = equipBean.TrayLine2.StartOut(new InOutParam(0, "CodeTest", "2#AC2_2_2", 8, 7,true));
-            if (!result)
-            {
-                MessageBox.Show(line2Name+"出库测试失败");
-            }
-        }
-
-        private void btnNgMove_Click(object sender, EventArgs e)
-        {
-            //判断line2是否停止
-            if (equipBase.IOValue(IO_Type.DLine_Run2).Equals(IO_VALUE.LOW))
-            {
-                BtnMove(btnNgMove, "入库NG气缸前进", "入库NG气缸后退", IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before);
-            }
-            else
-            {
-                MessageBox.Show(line2Name+"运转中，入库NG气缸不能动作");
-            }
-        }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            LogUtil.info(equipBase.Name + "点击【" + button1.Text + "】 ");
-            equipBean.SeparateStopRun(); 
-        }
-
-        private void btnScanCylinder_Click(object sender, EventArgs e)
-        {
-            if (equipBase.IOValue(IO_Type.DLine_Run3).Equals(IO_VALUE.LOW))
-            {
-                LogUtil.info(equipBase.Name + "点击【" + btnScanCylinder.Text + "】 ");
-                if (btnScanCylinder.Text.Equals("扫码NG气缸前进"))
-                {
-                    equipBean.ScanNgForward(null);
-                    btnScanCylinder.Text = "扫码NG气缸后退";
-                    btnScanCylinder.BackColor = Color.Aqua;
-                }
-                else
-                {
-                    equipBean.ScanNgBack(null);
-                    btnScanCylinder.Text = "扫码NG气缸前进";
-                    btnScanCylinder.BackColor = Color.SkyBlue;
-                }
-            } 
-            else
-            {
-                MessageBox.Show(line2Name + "运转中，扫码NG气缸不能动作");
-            }
-        }
-
-        private void button2_Click(object sender, EventArgs e)
-        { 
-            LogUtil.info(equipBase.Name + "点击【" + button2.Text + "】 ");
-            equipBean.SeparateStopRun();
-        }
-    }
-
-}
-
- 

source/AssemblyLineClient/FrmDischargeLine.resx

-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 11</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA
-        BADoAQAADg8AABAQEAABAAQAKAEAAPYQAAAwMAAAAQAIAKgOAAAeEgAAKCgAAAEACACoCwAAxiAAACAg
-        AAABAAgAqAgAAG4sAAAYGAAAAQAIAMgGAAAWNQAAEBAAAAEACABoBQAA3jsAADAwAAABACAAqCUAAEZB
-        AAAoKAAAAQAgAGgaAADuZgAAICAAAAEAIACoEAAAVoEAABgYAAABACAAiAkAAP6RAAAQEAAAAQAgAGgE
-        AACGmwAAKAAAADAAAABgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACA
-        gACAAAAAgACAAICAAACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAAwMDAAP///wAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAA/lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        D///8AAAAAAAAAAAAAAAAAAAAAAAAAAE7////0AAAAAAAAAAAAAAAAAEZHZGBABP/////+AAQkJWZkAA
-        AAAAAAAG6+t3YAD///////8AB7brd2AAAAAAAAAHvtt0AA/////////kAEd77UAAAAAAAAAGt3ZgBO//
-        ////////ACRnvlAAAAAAAAAHd0QAT///////////8EBHdmAAAAAAAAAEZ2QA////7uvb7v///kAkR0AA
-        AAAAAAAEdAAf///r69e+vb7///AAZ0AAAAAAAAAGUATv//vtvr2+t72+//9AB0AAAAAAAAAEAC///r6+
-        t76+vbe+7//gBCAAAAAAAAAABO//7t6+fX2+vre3vv//AAAAAAAAAAAAD///3r69t76+vb69vv//5AAA
-        AAAAAAAA///+vt5+3r7b69t723///wAAAAAAAAAP///3576+vre+vXvr23////AAAAAAAAD////73n19
-        7t6+vNvrdr7///8AAAAAAA7////t7r7ne+vtd9vr237////wAAAABP/////r7evt536+vr6+t7f////+
-        cAAAb//////r7r7evt7X1769vr3/////8AABD/////99fu5+7r7r7X6+t7f/////8AAAAP/////n7t7u
-        7Xfr6+vX233/////AAAAAA/////t7u7e7u3n7evr577////wAAAAAAD////+7u7u7t6+2+vr69////8A
-        AAAAAAAP///+3u7+7ufud33tt7////AAAAAAAAAA///+7u/u7e7evt6+vu///wAAAAAAAAAAD///7u7u
-        7u7N7r7evf//8AAAAAAAAAAEBP///u7u7ud9576+v//+QEAAAAAAAAAGcE7//u7u7t7r7efe7//wR0AA
-        AAAAAAAGe0D///7u7n5+fr6///8AfVAAAAAAAAALfXAP///u3n19vt7///BOt2AAAAAAAAAHd75A////
-        /u7u7v///kB3vrAAAAAAAAAE3rdwD///////////8ke+3kAAAAAAAAAE6+17ZP//////////AHvte3AA
-        AAAAAAAE6+vrcA/////////wRd63fVAAAAAAAAAG7XfXdgH///////8Aduvtd2AAAAAAAAAAVkdGVkAP
-        //////AGVkdGVgAAAAAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAD///////8AAP///n///wAA///8P///AAD///gf//8AAP//8A///wAA///gB///AAD8AAAAAD8AAPwA
-        AAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/
-        AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPgAAAAAHwAA8AAAAAAPAADgAAAAAAcAAMAA
-        AAAAAwAAgAAAAAABAACAAAAAAAEAAMAAAAAAAwAA4AAAAAAHAADwAAAAAA8AAPgAAAAAHwAA/AAAAAA/
-        AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwA
-        AAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD//+AH//8AAP//8A///wAA///4H///
-        AAD///w///8AAP///n///wAA////////AAAoAAAAKAAAAFAAAAABAAQAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
-        AADAwMAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF
-        cAAAAAAAAAAAAAAAAAAAAAAAAH/3AAAAAAAAAAAAAAAAAAAAAAAH//9wAAAAAAAAAAAAAAAAQAAAAH//
-        //cAAAAABAAAAAAABHt2VkAH/////3AFa3t2AAAAAAAAfXt2AH//////9wBGd9VAAAAAAAC3dkQH////
-        ////cAR7dgAAAAAAAGezAH/////////3BGZ2AAAAAAAAdkQH///uvr3u//9wBWcAAAAAAABkAH//++2+
-        vVvu//cERgAAAAAAAAQH//7et9vr29vv/3AEAAAAAAAAAH//6+e+t7e+t77/9wAAAAAAAAAH//7r1313
-        fb69tu//cAAAAAAAAH///m53e+t7e3vr7//3AAAAAAAH///uvtftfX3r22u+//9wAAAAAH///+vte+vr
-        6+vr6+7///cAAAAH////3nfu3u3r3r69tv///nAAAH/////r7evr6+vre9e+////9wAAf////75+7u3u
-        fn3rfbf////3AAAH////7e7t7uvtvrvr6////3AAAAB////u3u7t7ud+3r2+///3AAAAAAf//+7u7u7u
-        ve2+d37//3AAAAAAAH///u7v7u7r7evbf//3AAAAAAAAB///7u/t7Xfuvn7v/3AAAAAAAABAf//u7u7u
-        frd9vv/3BAAAAAAAAHdH//7u7n5+3tfv/3C3QAAAAAAAvVB//+7u1+vr7v/3C3cAAAAAAAB9e0f//+7n
-        7e7//3B96wAAAAAAALfeYH/////////3C+vmAAAAAAAAfr63R////////3B9e+ZAAAAAAAC3fXdwf///
-        ///3C3fetwAAAAAAAGdnt2QH/////3BHZ7dnAAAAAAAAAAAAAAB////3AAAAAAAAAAAAAAAAAAAAAAf/
-        /3AAAAAAAAAAAAAAAAAAAAAAAH/3AAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////8AAAD//+f//wAAAP//w///AAAA//+B//8A
-        AAD//wD//wAAAPgAAAAfAAAA+AAAAB8AAAD4AAAAHwAAAPgAAAAfAAAA+AAAAB8AAAD4AAAAHwAAAPgA
-        AAAfAAAA+AAAAB8AAAD4AAAAHwAAAPgAAAAfAAAA+AAAAB8AAADwAAAADwAAAOAAAAAHAAAAwAAAAAMA
-        AACAAAAAAQAAAIAAAAABAAAAwAAAAAMAAADgAAAABwAAAPAAAAAPAAAA+AAAAB8AAAD4AAAAHwAAAPgA
-        AAAfAAAA+AAAAB8AAAD4AAAAHwAAAPgAAAAfAAAA+AAAAB8AAAD4AAAAHwAAAPgAAAAfAAAA+AAAAB8A
-        AAD4AAAAHwAAAP//AP//AAAA//+B//8AAAD//8P//wAAAP//5///AAAA//////8AAAAoAAAAIAAAAEAA
-        AAABAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAICA
-        gAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AADAwMAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAG7gAAAAAAAAAAAAAAAAAADv/kAAAAAAAAAAAABARABO///gBARAAAAAAABH63tg
-        7////kZ3vrQAAAAAC+13Tv/////mt9dwAAAAAAfbdO///////gbr5AAAAABL5k7/7ut37v/iXXAAAAAA
-        DnDv/td729vv/kZ0AAAAAAZO/+vr6+vr6//lYAAAAAAA7/7r69t7e7v//gAAAAAATv/77efn13fbfv/k
-        AAAAAO//7ee+vbe9vr7//gAAAE7//+vt537uvr23///hAADv//933r7Xvbe3t////gAA7///5+7n7n7X
-        fXb///4AAA///+3u3u2+vr6+///mAAAA7//u7u7u7t69vv/+AAAAAA7//u/u7Xvr7c7/4AAAAAAA7/7u
-        7u7tfr3v/gAAAAAAB27/7+7ufuvu7+R0AAAAAEtw7/7u3r197/5GcAAAAAAO1U7//u7u7//gfrQAAAAA
-        S31w7//////+e11wAAAAAAfr607/////4WvtdAAAAABGd9dw7////kbm63AAAAAAAAQAAA7//+AABAAA
-        AAAAAAAAAAAA7/4AAAAAAAAAAAAAAAAAAA7nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAA///////+f////D////gf//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD+AA
-        AAfAAAADgAAAAYAAAAHAAAAD4AAAB/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD//4
-        H////D////5///////8oAAAAGAAAADAAAAABAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        gAAAgAAAAICAAIAAAACAAIAAgIAAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AADAwMAA////AAAA
-        AAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAf+cAAAAAAAAAQkYF7/9gBgYAAAAGvrdv///3vr5AAAAA
-        7mX/////R31AAAAAtl/+7r7v87cAAAAEd//b69vb/2dAAAAAT/7r6+vrf+cAAAAC/+vr7be3vv9wAAB/
-        /+3r5969vv/wAAf//33N6+t76///YAD//+3u5+3rt///cAB//+7u3te+3v/xAAAE//7u7u6+vv8gAAAA
-        f/7u7r197vYAAAAEZP/u7u6+/1ZAAAAA53/+7t7v925AAAAEt2H/////R74AAAAE7eZ////wft5AAAAA
-        BAQA//9wBAQAAAAAAAAAf/QAAAAAAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAP//////5////8P//+AA
-        B//gAAf/4AAH/+AAB//gAAf/4AAH/+AAB//AAAP/gAAB/4AAAf/AAAP/4AAH/+AAB//gAAf/4AAH/+AA
-        B//gAAf/4AAH///D////5////////ygAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAMDA
-        wAD///8AAAAADnAAAAAAAADufgAAAAAFZH/+RkQAAG6+///k5AAARu/ut/d2AABO+9vr3+QAB+7u7b6+
-        9+Du/+2+vrf/537/7u7Xe/9+Dn/u7uvt/uAAR/7t6+/gAABn7u7u97YAAE5u///m5gAABlDv9wZQAAAA
-        AH7uAAAAAAAADnAAAAD+f////D///8AD///AA///wAP//8AD//+AAf//AAD//wAA//+AAf//wAP//8AD
-        ///AA///wAP///w////+f///KAAAADAAAABgAAAAAQAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAEAgEABAQEAAgICAANDQ0AEQkGABISEgAUFBQAGRkZAB0dHQAnFg4AKBYOAC4aEQA9IhYAJSUlACws
-        LAAxMTEAODg4AD4+PgBFJxkAUy8fAFozIQBlOSUAcD8qAHJAKgB2QywAeUQtAEBAQABFRUUASEhIAFNT
-        UwBXV1cAXV1dAGFhYQBlZWUAampqAG5ubgBycnIAeHh4AH5+fgCHTDIAiEwyAMlTLgDLVTAAzVkzAMxZ
-        NADMXDoA0Fw2ANNgOADUYjoA1WQ8ANhnPgDYaD8AsWRCANVnQgDaaUAA3GxDANhrRADdbUQA3nBGANF2
-        TgDXclAA3ntXAOBxRgDhc0kA4XRKAON2TADkd00A5HhNAOh8TwDme1AA5nxSAOh9UQDpf1QA5IFVAOuA
-        UwDoglYA7IJVAOmCWADthlkA7IdcAO2IXQDwh1kA8ohZAPGKXADyjF8A9IxeAN2LbwDdi3AA3ZJ6AO6L
-        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
-        AAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUFBQAMBwQACgoKAA4ODgAcDwoAHBAKABAQ
-        EAAeHh4ALRkQACkpKQAuLi4AMDAwADY2NgA6OjoAPT09AEUnGQBjNyQAYzgkAGQ4JABtPSgAcT8pAHJA
-        KgBCQkIARkZGAElJSQBOTk4AV1dXAFlZWQBdXV0AYWFhAGVlZQBoaGgAbGxsAHl5eQB+fn4AiU0zAJBR
-        NQCYVjgAp14+AKlfPgCqYD8AyVMuAMlULwDMVzEAz1s1ANJfOADTYDkA1WQ8ANloPwCuYkAAsmRCALVm
-        QwC2ZkQAxW9JANVnQQDZaUAA3GxCANhrRADdbkQA0GlJAN9wRQDXc1IA335aAOBxRwDgckkA4nRJAON3
-        TADjeE4A5XlNAOF/UwDnfVIA4X9UAOd+VADpflEA6YFWAOyCVQDphFcA6oNYAOmEWQDthlgA7YleAPKI
-        WgD0ilsA8IpdAPKMXgDeknkA6YpjAO2LYADyjmEA9I5hAPCPZAD0kGMA8pFmAPSSZQDxkmgA9JNoAPOU
-        aQD0lWoA9JZsAPSYbgD0mnEA9ZxzAPWddQD2n3gA9aF7APWifAD2pH4A6Z+EAOCdiQD2pYEA9qmGAPar
-        iAD3ro0A97GRAPe0lgD4tpgA97ibAPi5ngD3u6EA97yiAPi7oAD4vaIA+b6kAPnApwD4w6sA+cStAO3G
-        uQD5xrAA+ciyAPnJtAD5zbgA+tC+APTOwAD608EA+dXFAPvZyQD72swA+9zNAPzi1gD86N8A/Pn3APr6
-        +gD9+vkA/Pz7AP39/QBQIgAAcDAAAJA+AACwTQAAz1sAAPBpAAD/eREA/4oxAP+dUQD/r3EA/8GRAP/S
-        sQD/5dEA////AAAAAAAvAwAAUAQAAHAGAACQCQAAsAoAAM8MAADwDgAA/yASAP8+MQD/XFEA/3pxAP+X
-        kQD/trEA/9TRAP///wAAAAAALwAOAFAAFwBwACEAkAArALAANgDPAEAA8ABJAP8RWgD/MXAA/1GGAP9x
-        nAD/kbIA/7HIAP/R3wD///8AAAAAAC8AIABQADYAcABMAJAAYgCwAHgAzwCOAPAApAD/EbMA/zG+AP9R
-        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
-        AAAAAAAAAAAAAAAAAAAAAAABAAAABQAAABAAAAAlAAAARgAAAHEAAACaAAAAvgAAAL4AAACaAAAAcAAA
-        AEYAAAAlAAAAEAAAAAUAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAADAAAABAAA
-        AAUAAAAFAAAABgAAAAYAAAAGAAAABgAAAAYAAAALAAAAFQAAACoAAABKAAAAdAAAAKIAAADNAAAA+gAA
-        APoAAADNAAAAogAAAHQAAABKAAAAKQAAABUAAAAKAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAA
-        AAYAAAAFAAAABQAAAAQAAAADAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAYAAAAMAAAAEgAAABYAAAAXAAAAGAAAABgAAAAYAAAAGQAAABwAAAAmAAAAOAAAAFcAAAB+AAAAqAAA
-        ANIAAAD7HR0d/xwcHP8AAAD7AAAA0gAAAKgAAAB+AAAAVgAAADgAAAAmAAAAHAAAABkAAAAYAAAAGAAA
-        ABgAAAAYAAAAGAAAABgAAAAXAAAAFgAAABIAAAAMAAAABgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAABAAAABgAAABEAAAAhAAAAMQAAADsAAABAAAAAQQAAAEEAAABCAAAARQAAAE0AAABcAAAAdAAA
-        AJUAAAC3AAAA2gAAAPwfHx//2tra/9jY2P8dHR3/AAAA/AAAANkAAAC3AAAAlQAAAHQAAABcAAAATAAA
-        AEUAAABCAAAAQQAAAEEAAABBAAAAQQAAAEEAAABAAAAAOwAAADEAAAAhAAAAEQAAAAYAAAABAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAADAAAADAAAACEAAABAAAAAXwAAAHQAAAB9AAAAfwAAAIAAAACCAAAAhwAA
-        AJEAAAChAAAAtwAAAM4AAADlAAAA/B8fH//Z2dn//f39//39/f/X19f/HR0d/wAAAPwAAADlAAAAzgAA
-        ALcAAAChAAAAkQAAAIcAAACCAAAAgAAAAH8AAAB/AAAAfwAAAH8AAAB9AAAAdAAAAF8AAABAAAAAIQAA
-        AAwAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAEgAAADEAAABfAAAAjQAAAKwAAAC5AAAAvQAA
-        AL8AAADBAAAAxgAAAM8AAADaAAAA5gAAAPEAAAD+HR0d/9ra2v/9/f3//f39//39/f/9/f3/2NjY/xwc
-        HP8AAAD9AAAA8QAAAOYAAADaAAAAzwAAAMYAAADBAAAAvwAAAL4AAAC+AAAAvgAAAL0AAAC5AAAArAAA
-        AI0AAABfAAAAMQAAABIAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFgAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8fHx//2dnZ//39/f/9/f3//f39//39
-        /f/9/f3//f39/9jY2P8eHh7/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAKwAAABzAAAAOwAAABYAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAA
-        AP88Ihb/eUQt/3lELf92Qyz/cD8p/2U5Jf9TLx7/PSIW/ycWDv8QCQX/AAAA/x8fH//Z2dn//v7+//7+
-        /f/+/v3//v7+//7+/f/+/v7//v7+//7+/v/X19f/Hh4e/wAAAP8QCQX/JxYO/z0iFv9TLx//ZTkl/3A/
-        Kf92Qyz/eUQt/3lELf88Ihb/AAAA/wAAALkAAAB9AAAAQAAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAGAAAAGAAAAP95RC3/84la/++HWP/kgVT/0XZN/7BkQf+HTDH/WjMh/y4aEf8EAgH/HR0d/9ra
-        2v/+/v3//v7+//7+/f/+/v3//v7+//39/f/+/v7//v7+//7+/v/+/v3/2NjY/xwcHP8DAgH/LhkQ/1oz
-        If+HTDL/sWRB/9F2Tf/kgVX/74dZ//OJWv95RC3/AAAA/wAAAL0AAAB/AAAAQQAAABgAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAAAP95RC3/74dY/+SBVP/Qdk3/sGRB/4ZMMf9aMyH/LhoR/wMC
-        Af8fHx//2tra//7+/f/+/v3//v79//39/f/+/v3//v79//39/f/+/v7//v7+//7+/v/+/v3//f39/9jY
-        2P8eHh3/AwIB/y4aEf9aMyH/h0wy/7FkQf/Rdk3/5IFV/++HWf95RC3/AAAA/wAAAL4AAAB/AAAAQQAA
-        ABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAAAP92Qyz/5YFV/9F2Tf+xZEH/h0wy/1oz
-        If8uGhD/BAIB/x8fH//Z2dn//v79//39/f/+/v3//v79//7+/f/9/f3//v79//7+/f/+/v7//v79//7+
-        /v/+/v7//f39//39/f/X19f/Hh4d/wQCAf8uGhH/WjMh/4dMMv+xZEL/0XZO/+WBVf92Qyz/AAAA/wAA
-        AL4AAAB/AAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAAAP9wPyn/0XZO/7Fk
-        Qf+HTDL/WzMh/y4aEf8DAgH/HR0d/9ra2f/9/f3//v79//39/f/+/v3//v79//7+/f/9/f3//f39//7+
-        /f/+/v3//f39//7+/v/+/v3//f39//39/f/9/f3/2NjY/xwcG/8EAgH/LhoR/1szIf+ITDL/sWRB/9F2
-        Tv9wPyn/AAAA/wAAAL4AAAB/AAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAHAAA
-        AP9lOSX/sGRB/4ZLMf9aMiH/LhoR/wMCAf8fHx//2tra//7+/f/+/v7//v79//7+/f/77ej/8L+r/+aW
-        ef/ee1f/2GtE/9VnQf/XcU//3Ipv/+i0o//46eX//f39//7+/f/9/f3//v7+/9jY2P8dHR3/AwIB/y4Z
-        EP9aMiH/hkwx/7FkQf9lOSX/AAAA/wAAAL8AAACAAAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAA
-        AAEAAAALAAAAJgAAAP9TLx7/h0wx/1oyIf8uGhD/BAIB/x8fH//Z2dn//v7+//7+/v/+/v7//O/q/++q
-        jv/keE7/4HFG/91tQ//aakD/2GY+/9VjO//SXzj/0Fw1/81ZMv/MWjX/3ZF6//jq5v/+/v3//v7+//7+
-        /v/Y2Nf/HR0d/wMCAf8uGRD/WjIh/4dMMv9TLx//AAAA/wAAAMEAAACCAAAAQgAAABgAAAAGAAAAAAAA
-        AAAAAAAAAAAAAQAAAAUAAAAVAAAAOAAAAP89Ihb/WjMh/y4aEf8EAgH/HR0d/9ra2v/+/v7//v79//7+
-        /f/51sb/7Ihd/+h8T//leUz/4nVJ/+BxR//dbkT/2mtB/9hnP//VYzz/0l85/9BcNf/NWTL/ylUw/8xd
-        O//sxLj//v7+//7+/v/+/v7/2NjY/xwcG/8DAgH/LhkQ/1ozIf89Ihb/AAAA/wAAAMYAAACHAAAARQAA
-        ABkAAAAGAAAAAAAAAAAAAAABAAAABQAAABAAAAAqAAAAVwAAAP8nFg7/LhoR/wMCAf8fHx//2tra//7+
-        /v/+/v7//v79//rNuf/wh1n/7YNV/+qAU//ofVD/5XlO/+N2S//hckj/3m9F/9trQv/YZz//1WQ8/9Jf
-        Of/QXDb/zVkz/8pVL//JUy//57Sk//7+/v/+/v7//v7+/9jY2P8eHh3/AwIB/y4aEf8nFg7/AAAA/wAA
-        AM8AAACRAAAATAAAABwAAAAGAAAAAAAAAAEAAAAFAAAADwAAACUAAABJAAAAfgAAAP8QCQX/BAIB/x8f
-        H//Z2dn//f39//39/f/+/v3/+9jI//SMXf/yilv/74dZ/+2FV//rglX/6H5S/+Z7T//jd0z/4XNJ/95w
-        Rv/ba0P/2Gc//9VkPP/TYDn/0Fw2/81ZM//KVTD/yVMv/+zEuP/+/v3//v79//39/f/X19f/Hh4d/wQC
-        Af8QCQX/AAAA/wAAANoAAAChAAAAXAAAACYAAAAKAAAAAQAAAAUAAAAPAAAAJAAAAEYAAAB0AAAAqAAA
-        AP8AAAD/HR0d/9ra2v/+/v7//v79//7+/f/98ev/9JNo//OMXv/zjV7/8o1f//GKXf/uhlr/64NX/+l/
-        VP/me1D/5HhN/+FzSv/ecEb/22xD/9hnP//WZDz/02A5/9BcNv/NWTP/ylUw/8xdO//46ub//v7+//39
-        /f/+/v3/2NjY/xwcHP8AAAD/AAAA/wAAAOYAAAC3AAAAdAAAADgAAAAVAAAABQAAAA8AAAAkAAAARgAA
-        AHIAAACiAAAA0gAAAP8fHx//2trZ//39/f/9/f3//f39//7+/f/4t5n/841f//SOYP/0j2L/9I9i//OP
-        Yv/xjF//7ohc/+yEWf/pgFX/5nxS/+R4Tv/hdEr/3nBG/9tsQ//ZaED/1mQ8/9NgOf/QXDb/zVkz/8tV
-        MP/dkXr//v39//39/f/9/f3//v79/9jY2P8eHh7/AAAA/wAAAPEAAADPAAAAlQAAAFYAAAApAAAADwAA
-        ACAAAABCAAAAbwAAAKAAAADPAAAA+x8fH//Z2dn//v79//7+/f/+/v3//v79//3x6//0kWT/849h//SR
-        ZP/0kmX/9JJm//STZv/zkWX/8Y1i/+6JXv/shlr/6YFW/+Z9Uv/jeU7/4XRK/95wR//bbEP/2WhA/9Zk
-        PP/TYDn/0Fw2/81ZMv/MWTX/+Orl//39/f/+/v3//v79//39/f/X19f/Hh4e/wAAAP4AAADlAAAAtwAA
-        AHwAAABGAAAAIAAAADQAAABjAAAAmAAAAMwAAAD6HR0d/9ra2v/+/v7//v79//7+/v/+/v7//v7+//rN
-        uP/0kGL/9JJl//SUaP/0lWr/9JVr//SWa//0lWr/85No//GPZP/ui2D/64dc/+mCV//mfVP/43lO/+B0
-        Sv/ecEf/22xD/9loQP/WZDz/0mA5/9BcNf/NWTL/6LSj//7+/v/+/v7//v7+//7+/v/+/v7/2NjY/xwc
-        HP8AAAD8AAAA2AAAAKAAAABmAAAANQAAAEMAAAB5AAAAugAAAPofHx/+2tra//7+/v/+/v7//v7+//7+
-        /v/+/v7//v7+//ixkf/0k2f/9JZr//WYb//1mnH/9Zpx//Wacf/1mXD/9Jhv//SWbP/xkWf/74xi/+yH
-        Xf/pglj/5n1T/+N5T//hdEr/3nBH/9xsQ//ZaD//1WQ8/9JfOf/QXDX/3Ypv//7+/f/+/v7//v7+//7+
-        /v/+/v7//f39/9jY2P8dHR3/AAAA+wAAAL8AAAB7AAAAQwAAAEEAAACNAAAA9h8fH//Z2dn//v7+//39
-        /f/9/f3//v7+//7+/f/+/v7//v7+//ahe//0lmz/9Ztx//Wedv/1n3j/9aB5//Wgef/1n3j/9Z11//Wb
-        cv/0mG7/8pJp/++NY//siF3/6YJY/+Z9U//jeU7/4XRK/95wRv/bbEP/2Gc//9VjPP/SXzj/13JQ//7+
-        /f/+/v7//v7+//7+/v/+/v7//f39//39/f/X19f/HR0d/wAAAPYAAACOAAAAQQAAAFQAAADvHR0d/9ra
-        2v/9/f3//v7+//39/f/9/f3//f39//39/f/+/v3//f39//Wbcv/1m3L/9aB5//akf//2poL/9qeD//an
-        g//2pYH/9aN9//Wgef/1nXX/9Jlw//KTaf/vjWL/64dc/+iBV//mfVL/43hO/+FzSf/eb0b/22tC/9dn
-        Pv/VYzv/1WdB//39/f/+/v3//v79//39/f/9/f3//f39//39/f/9/f3/2NjY/xwcHP8AAADvAAAAVAAA
-        AEMAAADrHh4e/tvb2//+/v7//v7+//7+/v/+/v3//v7+//7+/v/+/v7//v79//aed//1oHn/9qeD//es
-        iv/3r47/97CQ//ewkP/3roz/9qqI//angv/2onz/9Z52//SZcP/ykmj/7oxh/+uHXP/pgVb/5nxS/+R4
-        Tf/hc0n/3m9G/9prQf/YZj7/2GtE//7+/f/+/v3//v79//7+/v/+/v7//f39//7+/v/9/f3/2tra/x0d
-        Hf4AAADqAAAAQQAAAAwAAABGAAAA6yAgIP7a2tr//v7+//39/f/9/f3//v79//7+/f/+/v7//f39//eq
-        iP/2pYH/966N//i1l//4uJz/+Lqe//i6nf/4t5n/97KT//etjP/2p4T/9aJ8//Wddf/0l27/8ZFm/+6L
-        YP/rhVr/6YBV/+Z7UP/kd0z/4XJI/91uRP/aakD/3ntX//39/f/+/v3//v79//7+/f/+/v3//f39//39
-        /f/Z2dn/Hx8f/gAAAOsAAABIAAAADAAAAAMAAAAMAAAARQAAAO0gICD+29vb//39/f/9/f3//v79//7+
-        /f/+/v3//v79//i9ov/2qoj/97WX//i+o//4wqr/+cSt//nEq//4wKf/+Luf//e0lv/3rYz/9qaC//Wg
-        ef/1m3L/85Vr//CPZP/uiV7/64RY/+l/U//me0//43ZL/99xRv/dbUP/5pZ5//7+/f/+/v3//v79//7+
-        /f/+/v3//f39/9nZ2f8fHx//AAAA7wAAAFQAAAASAAAABAAAAAAAAAADAAAADAAAAEUAAADrHh4e/tvb
-        2//+/v7//v7+//7+/v/+/v7//v79//vXx//3r47/+Lyg//nGr//5zLj/+s+7//nNuf/5ybP/+MOr//i7
-        oP/3s5T/9qqI//ajfv/1nXX/9Jhu//OTaP/wjWL/7ohc/+uDV//pflL/5XlO/+J1Sf/gcUb/8b+r//7+
-        /f/+/v3//v79//7+/v/+/v7/2tra/x0dHf8AAADzAAAAcQAAACMAAAAJAAAAAQAAAAAAAAAAAAAAAwAA
-        AA0AAABJAAAA7CAgIP/a2tr//v79//7+/f/+/v3//v79//308P/4tJb/+MCm//nMuP/61MP/+tfH//rW
-        xf/60b7/+cm0//jAp//4t5r/966N//amgf/1n3j/9Zlw//SVav/zkWX/8Yxf/+6HWv/rglX/6H1Q/+V4
-        TP/keE7/++3o//39/f/+/v3//v7+//7+/f/Z2dn/Hx8f/wAAAPgAAACeAAAASgAAABsAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAQAAAASAAAAVQAAAP8gICD/29vb//7+/f/+/v3//f39//7+/f/60L3/+MCn//rO
-        u//62Mn/+9zP//vbzf/61sX/+c25//nErP/4up7/97CQ//eng//2oHn/9Zpx//WWa//0k2b/9I9i//GK
-        Xf/uhVj/64BT/+h8T//vqo3//v79//39/f/9/f3//v7+/9ra2v8fHx//AAAA/wAAAMwAAACFAAAARAAA
-        ABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAJAAAAIwAAAP8AAAD/Hh4e/9vb2//+/v7//v79//7+
-        /v/99vL/+cOq//nLt//618f/+93P//vcz//618f/+s+7//nFrf/4up7/97CQ//enhP/1oHn/9Zpx//SV
-        a//0kmb/9JBj//ONX//wiFr/7YNV/+yIXf/87+r//v7+//7+/f/+/v3/2tra/x0dHf8AAAD/AAAA/wAA
-        AMEAAACBAAAAQgAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGwAAAP9EJhn/EgoG/yAg
-        IP/a2tr//v7+//7+/v/+/v7//Ong//nFrv/50L3/+tfH//vYyf/61MP/+cy4//nDq//4uZz/96+P//an
-        g//1oHn/9Zpw//SVav/0kmX/9I9i//ONX//yi1z/8IdZ//nWxv/+/v7//v7+//7+/f/Z2dn/Hx8f/xMK
-        B/9FJxn/AAAA/wAAAL4AAACAAAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAA
-        AP9yQCr/sWRB/xEJBv8gICD/29vb//7+/f/+/v7//v7+//zj2P/4xa7/+cu3//nOu//5zLj/+cav//i+
-        pP/3tZf/9qyK//akf//1nnb/9Zhu//SUaP/0kWP/9I5g//OMXf/zjF7/+s25//7+/f/+/v7//v79/9ra
-        2f8fHx//EQoG/7JlQv9yQCr/AAAA/wAAAL4AAAB/AAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAGAAAAGAAAAP93Qyz/6INW/7FkQf8SCgb/Hh4e/9vb2//+/v7//v7+//7+/v/86eD/+cKq//jA
-        p//4v6b/+Lug//e1mP/3ro3/9qeD//Wgev/1mnH/9JVq//SSZf/0j2H/841f//WUaP/72Mj//v7+//7+
-        /v/+/v7/2tra/x0dHf8TCwf/smVC/+iCVv93Qyz/AAAA/wAAAL4AAAB/AAAAQQAAABgAAAAGAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAAAP95RC3/8IdZ/+eCVv+wY0H/EgoG/yAgIP/a2tr//v7+//7+
-        /f/+/v7//fby//rQvf/3tJX/9q6O//aqiP/2pYH/9aB5//Wbcv/0lmz/9JJm//SPYv/0kWT/+LeZ//3x
-        6//+/v3//v7+//7+/v/Z2dn/IB8f/xMLB/+yZEL/54JW//CHWf95RC3/AAAA/wAAAL4AAAB/AAAAQQAA
-        ABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAAAP96RS3/84la//CHWf/nglb/sWRB/xEK
-        Bv8gICD/29vb//7+/f/+/v7//v7+//7+/f/99PD/+9fH//m+o//3q4j/9p53//Wbcv/2oXv/+LGR//rN
-        uP/98ev//v79//7+/f/9/f3//v7+/9ra2v8gIB//EgoG/7JlQv/nglb/8IdZ//OJWv95RC3/AAAA/wAA
-        AL4AAAB/AAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAAAP96RS3/84la//OJ
-        Wv/wh1n/6INW/7FkQf8SCgb/Hh4e/9vb2//+/v7//v79//39/f/+/v3//v79//7+/f/9/f3//v79//39
-        /f/+/v7//v7+//7+/v/+/v3//f39//7+/f/9/f3/2tra/x0dHf8TCgf/smVC/+iCVv/wh1n/84la//OJ
-        Wv95RC3/AAAA/wAAAL0AAAB/AAAAQQAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAGAAA
-        AP96RS3/84la//OJWv/ziVr/8IdZ/+eCVv+wY0H/EgoG/yAgIP/a2tr//v7+//39/f/+/v3//v7+//7+
-        /f/+/v7//v7+//7+/f/+/v7//v7+//7+/v/+/v3//f39//7+/v/Z2dn/Hx8f/xMKB/+yZEL/54JW//CH
-        Wf/ziVr/84la//OJWv95RC3/AAAA/wAAALkAAAB9AAAAQAAAABgAAAAGAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAFAAAAFgAAAP96RS3/84la//OJWv/ziVr/84la//CHWf/nglb/sWRB/xEJBv8gICD/29vb//7+
-        /f/+/v3//v7+//7+/f/+/v3//v7+//39/f/+/v3//v79//7+/v/+/v7//f39/9ra2v8gHx//EQoG/7Jl
-        Qv/nglb/8IdZ//OJWv/ziVr/84la//OJWv95RC3/AAAA/wAAAKwAAABzAAAAOwAAABYAAAAFAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAEAAAAEgAAAP96RS3/84la//OJWv/ziVr/84la//OJWv/wh1n/6INW/7Fk
-        Qf8SCgb/Hh4e/9vb2//+/v3//v79//7+/f/+/v3//v79//39/f/+/v7//v79//7+/v/+/v3/2trZ/x0d
-        Hf8TCwf/smVC/+iCVv/wh1n/84la//OJWv/ziVr/84la//OJWv95RC3/AAAA/wAAAI0AAABfAAAAMQAA
-        ABIAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAADAAAAP89Ihb/ekUt/3pFLf96RS3/ekUt/3pF
-        Lf95RC3/d0Ms/3JAKv9EJhn/AAAA/yAgIP/a2tr//v7+//39/f/9/f3//v79//39/f/+/v3//v7+//7+
-        /v/Z2dn/Hx8f/wAAAP9FJxn/ckAq/3dDLP95RC3/eUQt/3lELf95RC3/eUQt/3lELf88Ihb/AAAA/wAA
-        AF8AAABAAAAAIQAAAAwAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABgAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8gICD/29vb//39/f/9/f3//v7+//39
-        /f/9/f3//v7+/9ra2v8fHx//AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAADEAAAAhAAAAEQAAAAYAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA
-        AAYAAAAMAAAAEgAAABYAAAAXAAAAGAAAABgAAAAYAAAAGAAAABgAAAAbAAAAIwAAAFUAAADsHh4e/tvb
-        2//+/v7//v7+//7+/v/+/v7/2tra/h0dHf8AAADrAAAAVAAAACMAAAAbAAAAGAAAABgAAAAYAAAAGAAA
-        ABgAAAAYAAAAGAAAABgAAAAXAAAAFgAAABIAAAAMAAAABgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAEAAAADAAAABAAAAAUAAAAFAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACQAA
-        ABIAAABJAAAA6yAgIP7a2tr//v7+//39/f/Z2dn/Hx8f/gAAAOoAAABIAAAAEgAAAAkAAAAGAAAABgAA
-        AAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAFAAAABQAAAAQAAAADAAAAAQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAQAAAAQAAAANAAAARQAAAO0gICD+29vb/tra2v4fHx/+AAAA7AAAAEQAAAANAAAABAAA
-        AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAADAAAAEIAAADqHh4e/h0dHf4AAADpAAAAQQAA
-        AAwAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAkAAAA9AAAA6QAA
-        AOgAAAA7AAAACQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAIAAAAFAAAANAAAADMAAAAFAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD//wAO/AAAAAAH
-        AA74AAAAAAMADvAAAAAAAQAO8AAAAAABAA7wAAAAAAEADvAAAAAAAQAO8AAAAAABAA7wAAAAAAEADvAA
-        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
-        Af9oaGj/+/v7//7+/f/+/v7//v79//7+/f/+/v3//f39//7+/v/+/v7//v7+//39/f/7+/v/ZWVl/wIB
-        Af8uGRD/Yzgk/5lWOP/Fb0n/4X9U/7JkQv8AAAD/AAAAuAAAAGwAAAAqAAAACgAAAAEAAAAAAAAAAAAA
-        AAAAAAADAAAAFgAAAP+nXj7/xW9J/5hWOP9kOCT/LRkQ/wIBAP9nZ2f/+/v7//39/f/9/f3//v79//7+
-        /f/9/f3//f39//39/f/9/f3//f39//7+/f/9/f3//f39//r6+v9lZWX/AgEB/y4aEP9kOCX/mVY4/8Vv
-        Sf+nXj7/AAAA/wAAALgAAABsAAAAKgAAAAoAAAABAAAAAAAAAAAAAAAAAAAABAAAABoAAAD/kFE1/5hW
-        OP9jNyT/LRkQ/wIBAf9oaGj/+/v7//7+/v/+/v3//fr4//TOwP/pn4T/335a/9hrRP/VZ0H/13NS/96S
-        ef/txbj//Pn3//7+/f/9/f3/+/v7/2VlZf8CAQH/LRkQ/2M3JP+YVjj/kFE1/wAAAP8AAAC5AAAAbAAA
-        ACoAAAAKAAAAAQAAAAAAAAAAAAAAAQAAAAkAAAAnAAAA/209KP9jOCT/LRkQ/wIBAf9oaGj/+/v7//7+
-        /f/+/v7/+NXG/+qKY//idUn/33BF/9xsQv/ZaD//1mQ8/9JfOP/PWzX/zFcx/9BpSf/tx7v//v79//7+
-        /v/7+/v/ZWVl/wIBAP8tGRD/Yzgk/209KP8AAAD/AAAAvQAAAG4AAAAqAAAACgAAAAEAAAAAAAAAAQAA
-        AAUAAAAXAAAAQgAAAP9FJxn/LRkQ/wIBAf9nZ2f//Pz8//7+/v/9/Pz/97uh/+yCVP/pfVD/5XpN/+J1
-        Sv/gcUf/3W1E/9lpQP/VZDz/0l85/89bNf/MVzH/yVMv/+Cdif/9/Pz//v7+//v7+/9lZWX/AgEB/y0Z
-        EP9FJxn/AAAA/wAAAMQAAAB2AAAALgAAAAoAAAABAAAAAAAAAAUAAAATAAAAMwAAAGwAAAD/HBAK/wIB
-        Af9oaGj/+/v7//7+/f/+/v3/+b6k//KKW//vhlj/7INW/+l/U//me0//43dM/+BySP/dbkX/2WlA/9Zl
-        PP/TYDn/z1s1/8xXMf/JUy7/4J2J//7+/f/+/v3/+/v6/2ZmZf8CAQH/HBAK/wAAAP8AAADRAAAAhwAA
-        ADkAAAAOAAAAAQAAAAUAAAATAAAAMAAAAGEAAACeAAAA/wAAAP9nZ2f/+/v7//7+/f/+/v3/+9rK//OM
-        Xv/zjF7/8oxe//CJXP/thVj/6YBV/+d8Uf/keE3/4HNJ/91uRf/aaUH/1mU9/9NgOf/PWzb/zFcx/8lU
-        L//tx7v//v79//39/f/7+/v/ZWVl/wAAAP8AAAD/AAAA4AAAAKEAAABSAAAAHAAAAAUAAAASAAAAMAAA
-        AGAAAACZAAAA0gAAAP9oaGj/+/v7//39/f/9/f3//fv5//Wcc//zjmD/9I9h//SPY//zj2L/8Itf/+2H
-        W//qglf/531S/+R4Tv/gc0r/3W9F/9pqQf/WZT3/02A5/89bNv/MVzH/0GlJ//z59//9/f3//v79//v7
-        +/9lZWX/AAAA/wAAAPAAAADCAAAAeQAAADgAAAATAAAAKgAAAFoAAACVAAAAzwAAAPxoaGj/+/v7//7+
-        /v/+/v7//v79//vYyP/0j2H/9JFk//SSZv/0k2f/9JNo//OSZv/wjWL/7Yhd/+qDWP/nflP/43hO/+Bz
-        Sv/dbkX/2mpB/9ZlPf/TYDn/z1s1/8xXMf/txbj//f39//7+/v/+/v3/+/v6/2VlZf8AAAD+AAAA4QAA
-        AKUAAABgAAAAKgAAAEIAAACBAAAAxwAAAPxnZ2f/+/v7//7+/v/+/v7//v7+//7+/v/4tpj/9JJl//SV
-        av/0l23/9Jhu//WYbv/0l23/85Rq//CPZf/til//6oRZ/+d+VP/jeU7/4HNK/91vRf/aaUH/1mU9/9Jf
-        Of/PWzX/35J5//7+/f/+/v7//v7+//7+/v/7+/v/ZWVl/wAAAP0AAADOAAAAhQAAAEIAAABIAAAAoAAA
-        APpoaGj/+/v7//7+/v/+/v3//v7+//7+/v/+/v7/9qJ8//SWbP/1m3L/9Z11//Wed//1nnf/9Z11//Wb
-        cv/0l27/8ZFn/+6LYP/qhFr/535U/+N5T//gc0r/3W5F/9ppQf/WZDz/0l84/9dzUv/9/f3//v7+//7+
-        /v/+/v7//f39//v7+/9lZWX/AAAA+wAAAKMAAABIAAAAYQAAAPRnZ2f/+/v7//7+/v/9/f3//f39//39
-        /f/+/v3//f39//Wacv/1nHT/9aJ8//algP/2poL/9qaC//akf//1oXv/9Z12//SZb//xkmj/7Ytg/+mE
-        Wf/nflP/43hO/+BzSf/dbkX/2WlA/9VkPP/VZ0H//f39//7+/f/9/f3//f39//39/f/9/f3/+vr6/2Vl
-        Zf8AAAD0AAAAYQAAAEwAAADxaGho/vv7+//+/v7//v7+//7+/f/+/v7//v7+//7+/f/2n3j/9qN9//ar
-        iP/3r4//97GR//exkf/3roz/9qmG//akf//1n3f/9Jlw//GRZ//til//6oNY/+d9Uv/keE3/4XJJ/91t
-        RP/ZaD//2GtE//39/f/+/v3//v79//7+/v/9/f3//v7+//v7+/9nZ2f+AAAA8AAAAEsAAAAKAAAATgAA
-        APFpaWn++/v7//39/f/9/f3//v7+//7+/f/9/f3/962M//aqh//3tJb/+Lqf//i9ov/4vKH/97ib//ey
-        k//2q4n/9qR+//Wddf/0l23/8I9k/+2IXf/qglf/53xR/+N3TP/fcUf/3GxC/99+Wv/9/f3//v79//7+
-        /f/+/v3//f39//v7+/9oaGj+AAAA8gAAAFIAAAALAAAAAgAAAAoAAABOAAAA8WhoaP78/Pz//f39//7+
-        /v/+/v3//v79//nErP/3sJD/+L6j//nGr//5ybT/+ciy//jDq//4u6D/97KT//aphv/1oXv/9Zpx//OU
-        af/wjWH/7Ydb/+qAVf/ne0//4nVK/99wRf/pn4T//f39//7+/f/+/v3//v7+//v7+/9nZ2f/AAAA9QAA
-        AGcAAAATAAAAAwAAAAAAAAACAAAACgAAAFAAAADxaWlp//v7+//+/v3//v7+//7+/f/84tb/97WX//nF
-        rv/60L7/+tXE//rTwf/5zbj/+MOr//i4nP/3ro3/9qR///WddP/0l2z/85Jm//CLX//thVj/6n9T/+Z6
-        Tv/idEj/9M/A//39/f/+/v7//v79//v7+/9oaGj/AAAA+QAAAJMAAAAyAAAADAAAAAEAAAAAAAAAAAAA
-        AAIAAAAOAAAAWwAAAP9paWn//Pz8//7+/f/+/v3//fv6//nBp//5x7H/+tbF//vczv/72sz/+tPB//nI
-        sv/5vaL/97GR//amgv/2nnf/9Zhu//STaP/zj2P/8Ilc/+yDVv/pflH/6Ypj//36+P/9/f3//v79//v7
-        +/9oaGj/AAAA/wAAAMkAAABxAAAAKwAAAAoAAAABAAAAAAAAAAAAAAAAAAAABQAAAB8AAAD/AQAA/2ho
-        aP/7+/v//v79//7+/v/86N//+cSt//rTwv/73M7/+9zO//rVxP/5yrT/+L2j//exkf/2p4P/9Z53//WY
-        bv/0k2f/9JBj//KNXv/vh1n/7IJU//jVx//+/v3//v79//v7+/9nZ2f/AQEA/wAAAP8AAAC6AAAAbQAA
-        ACoAAAAKAAAAAQAAAAAAAAAAAAAAAAAAAAMAAAAXAAAA/3E/Kf8MBwT/aWlp//v7+//+/v7//v7+//vc
-        zv/5yrT/+tPC//rWxf/60L7/+caw//i7n//3r4//9qWB//Wddf/0l23/9JNm//SPYv/zjV7/8opb//e8
-        ov/+/v7//v7+//v7+/9oaGj/DQcF/3JAKv8AAAD/AAAAuAAAAGwAAAAqAAAACgAAAAEAAAAAAAAAAAAA
-        AAAAAAADAAAAFgAAAP+uYkD/qV8+/wwHBP9oaGj//Pz8//7+/v/9/fz/+9zN//nErf/5x7H/+cWu//i+
-        o//3tJb/9quI//aifP/1mnL/9JVp//SRZP/0jmD/84xe//m+pP/9/Pz//v7+//z8+/9nZ2f/DQcF/6pg
-        P/+uYkD/AAAA/wAAALgAAABsAAAAKgAAAAoAAAABAAAAAAAAAAAAAAAAAAAAAwAAABYAAAD/tWZD/+mE
-        V/+pXz7/DQcE/2lpaf/7+/v//v79//7+/v/86N//+cCn//e1l//3sJD/9qqH//Wjff/1nHT/9JZr//SR
-        Zf/zjmD/9Ztz//vayv/+/v3//v7+//v7+/9oaGj/DQcF/6pgP//phFf/tWZD/wAAAP8AAAC4AAAAbAAA
-        ACoAAAAKAAAAAQAAAAAAAAAAAAAAAAAAAAMAAAAWAAAA/7ZnRP/xiFr/6YRX/6lfPv8MBwT/aWlp//z8
-        /P/+/v7//v7+//77+v/84tb/+cSs//eujP/2n3j/9Zty//aifP/4tpj/+9jI//36+f/+/v3//f39//z8
-        /P9oaGj/DAcE/6pgP//pg1f/8Yha/7ZnRP8AAAD/AAAAuAAAAGwAAAAqAAAACgAAAAEAAAAAAAAAAAAA
-        AAAAAAADAAAAFgAAAP+3Z0T/84la//GIWv/qhFf/qV8+/w0HBP9oaGj/+/v7//7+/f/9/f3//v79//7+
-        /f/9/f3//v79//39/f/+/v7//v7+//7+/v/9/f3//v79//v7+/9nZ2f/DQcE/6pgP//qhFf/8Yha//OJ
-        Wv+3Z0T/AAAA/wAAALcAAABrAAAAKgAAAAoAAAABAAAAAAAAAAAAAAAAAAAAAwAAABUAAAD/t2dE//SK
-        W//ziVv/8Yha/+mEV/+pXz7/DAcE/2lpaf/7+/v//f39//7+/v/+/v3//v79//7+/v/+/v3//v7+//7+
-        /v/+/v7//f39//v7+/9oaGj/DQcE/6pgP//pg1f/8Yha//OJWv/ziVr/t2dE/wAAAP8AAACxAAAAaAAA
-        ACgAAAAJAAAAAQAAAAAAAAAAAAAAAAAAAAMAAAASAAAA/7dnRP/0ilv/9Ipb//OJWv/xiFr/6YRX/6lf
-        Pv8MBwT/aGho//z8/P/+/v3//v7+//7+/f/+/v7//f39//7+/v/+/v7//v7+//v7+/9nZ2f/DQcE/6pg
-        P//phFf/8Yha//OJWv/ziVr/84la/7dnRP8AAAD/AAAAmgAAAFoAAAAjAAAACAAAAAEAAAAAAAAAAAAA
-        AAAAAAACAAAADQAAAP+JTTP/t2dE/7dnRP+3Z0T/tmdE/7VmQ/+uYkD/cT8p/wEAAP9paWn/+/v7//7+
-        /f/9/f3//v79//39/f/+/v7//v79//v7+/9oaGj/AQAA/3JAKv+uYkD/tWZD/7ZnRP+2Z0T/tmdE/7Zn
-        RP+JTTP/AAAA/wAAAGoAAAA+AAAAGAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAYAAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/2lpaf/8/Pz//f39//7+/v/9/f3//v7+//v7
-        +/9oaGj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAAzAAAAHgAA
-        AAwAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAA0AAAASAAAAFQAAABYAAAAWAAAAFgAA
-        ABYAAAAXAAAAHwAAAFoAAADxaGho/vv7+//+/v7//f39//v7+/9nZ2f+AAAA8QAAAFkAAAAfAAAAFwAA
-        ABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABUAAAAUAAAAEAAAAAkAAAADAAAAAQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAEAAAACAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAUAAAAOAAAAUAAA
-        APFpaWn++/v7//v7+/9oaGj+AAAA8AAAAE8AAAAOAAAABQAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAA
-        AAMAAAADAAAAAwAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAoAAABNAAAA8WhoaP5nZ2f+AAAA8AAA
-        AEsAAAAKAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAACAAAACQAAAEgAAADwAAAA7wAAAEYAAAAJAAAAAgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAEAAAAFAAAAPwAAAD0AAAAFAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        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
-        ABsAAABUAAAA/y0ZEP8ODg3/w8PC//7+/v/9+vn/9qiG/+6FV//qgFP/53tQ/+N2S//fcUf/22tC/9dm
-        Pf/SYDn/zlo0/8pVL//Xf2T//Pn3//7+/f/BwcH/Dg0M/y0ZEP8AAAD/AAAAwwAAAGEAAAAYAAAAAgAA
-        AAUAAAAZAAAARwAAAJAAAAD/Dg4N/8PDw//+/v7//v79//i7oP/zjF3/8oxe/++IWv/rg1b/531S/+R3
-        Tf/fcUj/22xD/9dmPv/TYDn/zlo0/8pVMP/fmYT//v79//39/f/BwcH/Dg0N/wAAAP8AAADYAAAAfwAA
-        ACoAAAAGAAAAGAAAAEYAAACKAAAA0g0NDf/Dw8L//f39//39/f/86uL/9I5g//SPYv/0kGP/849j/++K
-        Xv/shVn/6H9U/+R4Tv/fckj/22xD/9dmPv/TYDn/z1s1/8tWMf/14Nn//f39//7+/f/BwcH/DAwM/wAA
-        AO4AAACsAAAAUwAAABkAAAA6AAAAgQAAAM4NDQ39w8PD//7+/v/+/v7//v7+//i+pP/0kWT/9JNo//SV
-        af/0lWr/85Nn/++NYv/shlv/6H9V/+N5Tv/fckj/22xD/9dmPv/TYDn/zlo0/+GeiP/+/v3//v7+//7+
-        /v/BwcH/DAwM/gAAANsAAACJAAAAOgAAAFAAAAC1DQ0N/cPDw//+/v7//v7+//7+/v/+/v7/9qR///SW
-        a//1mnH/9Ztz//Wbc//1mnH/9JZs//CPZf/sh13/54BV/+N5T//fckj/22xD/9dmPv/SXzj/13dW//7+
-        /f/+/v7//v7+//39/f/BwcH/DAwM/QAAALkAAABRAAAAcA0NDfrDw8P//v7+//39/f/+/v3//v79//39
-        /f/1mnH/9Z52//ajfv/2pYH/9qWA//aifP/1nnb/9Jhv//CQZv/rh13/539V/+N4Tv/fckj/22tC/9Zl
-        Pf/VZkD//f39//39/f/+/v3//f39//39/f/BwcH/DAwM+gAAAHAAAABVDQ0N9sPDw//+/v7//f39//7+
-        /v/+/v7//v79//agev/2p4P/96+P//eyk//3spL/962M//ang//2oHn/9Jlv//CPZP/rhlv/6H5U/+R3
-        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
-        AAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAcAAABTDQ0N9g0NDfUAAABSAAAABwAAAAEAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAQAAABKAAAASQAAAAQAAAABAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAfgAAAB4AAAAcAA
-        AADAAAAAwAAAAMAAAADAAAAAwAAAAMAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AACAAAAAwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAOAAAAHgAAAB+AAAB//wD///+B//KAAAABgA
-        AAAwAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAACAAAAAwAA
-        AAMAAAADAAAACgAAACoAAABzAAAAyAAAAMgAAABzAAAAKgAAAAkAAAADAAAAAwAAAAMAAAADAAAAAgAA
-        AAIAAAAAAAAAAAAAAAAAAAAAAAAAAgAAABEAAAAlAAAALAAAAC0AAAAyAAAATAAAAIgAAADURUVF/kRE
-        RP4AAADUAAAAiAAAAEwAAAAyAAAALQAAACwAAAAsAAAAKgAAABwAAAAIAAAAAAAAAAAAAAAAAAAACQAA
-        ADwAAACDAAAAnAAAAKAAAACrAAAAxgAAAOhFRUX+9PT0//Pz8/9ERET+AAAA6AAAAMYAAACrAAAAoAAA
-        AJ4AAACeAAAAlgAAAGMAAAAcAAAAAgAAAAAAAAAAAAAADg8IBf88Ihb/OSAV/y4aEP8ZDgn/BAIB/0VF
-        Rf/09PT//f39//39/f/09PT/RERE/wQCAf8ZDgn/LhoR/zkgFf88Ihb/DwgF/wAAAJUAAAAqAAAAAwAA
-        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
-        rEGAAKxBgACsQYAArEHAAaxB/D+sQQ==
-</value>
-  </data>
-</root>
\ No newline at end of file

source/AssemblyLineClient/FrmEquipBase.Designer.cs

@@ -28,19 +28,157 @@
         /// </summary>
         /// </summary>
         private void InitializeComponent()
         private void InitializeComponent()
         {
         {
+            this.panBase = new System.Windows.Forms.Panel();
+            this.btnExit = new System.Windows.Forms.Button();
+            this.lblName = new System.Windows.Forms.Label();
+            this.chbDebug = new System.Windows.Forms.CheckBox();
+            this.lblStoreStatus = new System.Windows.Forms.Label();
+            this.btnOutStore = new System.Windows.Forms.Button();
+            this.btnStart = new System.Windows.Forms.Button();
+            this.btnInStore = new System.Windows.Forms.Button();
+            this.btnStop = new System.Windows.Forms.Button();
+            this.panBase.SuspendLayout();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
+            // panBase
+            // 
+            this.panBase.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panBase.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panBase.Controls.Add(this.btnExit);
+            this.panBase.Controls.Add(this.lblName);
+            this.panBase.Controls.Add(this.chbDebug);
+            this.panBase.Controls.Add(this.lblStoreStatus);
+            this.panBase.Controls.Add(this.btnOutStore);
+            this.panBase.Controls.Add(this.btnStart);
+            this.panBase.Controls.Add(this.btnInStore);
+            this.panBase.Controls.Add(this.btnStop);
+            this.panBase.Location = new System.Drawing.Point(2, 3);
+            this.panBase.Name = "panBase";
+            this.panBase.Size = new System.Drawing.Size(1177, 50);
+            this.panBase.TabIndex = 259;
+            // 
+            // btnExit
+            // 
+            this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnExit.BackColor = System.Drawing.Color.White;
+            this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnExit.Location = new System.Drawing.Point(1062, 4);
+            this.btnExit.Name = "btnExit";
+            this.btnExit.Size = new System.Drawing.Size(110, 40);
+            this.btnExit.TabIndex = 260;
+            this.btnExit.Text = "退出";
+            this.btnExit.UseVisualStyleBackColor = false;
+            // 
+            // lblName
+            // 
+            this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
+            this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblName.ForeColor = System.Drawing.Color.Black;
+            this.lblName.Location = new System.Drawing.Point(5, 4);
+            this.lblName.Name = "lblName";
+            this.lblName.Size = new System.Drawing.Size(180, 40);
+            this.lblName.TabIndex = 250;
+            this.lblName.Text = "进仓移栽";
+            this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // chbDebug
+            // 
+            this.chbDebug.AutoSize = true;
+            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chbDebug.Location = new System.Drawing.Point(682, 12);
+            this.chbDebug.Name = "chbDebug";
+            this.chbDebug.Size = new System.Drawing.Size(84, 24);
+            this.chbDebug.TabIndex = 247;
+            this.chbDebug.Text = "调试状态";
+            this.chbDebug.UseVisualStyleBackColor = true;
+            // 
+            // lblStoreStatus
+            // 
+            this.lblStoreStatus.AutoSize = true;
+            this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
+            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.lblStoreStatus.Location = new System.Drawing.Point(804, 14);
+            this.lblStoreStatus.Name = "lblStoreStatus";
+            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
+            this.lblStoreStatus.TabIndex = 245;
+            this.lblStoreStatus.Text = "等待启动";
+            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // btnOutStore
+            // 
+            this.btnOutStore.BackColor = System.Drawing.Color.White;
+            this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnOutStore.Location = new System.Drawing.Point(414, 4);
+            this.btnOutStore.Name = "btnOutStore";
+            this.btnOutStore.Size = new System.Drawing.Size(110, 40);
+            this.btnOutStore.TabIndex = 101;
+            this.btnOutStore.Text = "出库测试";
+            this.btnOutStore.UseVisualStyleBackColor = false;
+            // 
+            // btnStart
+            // 
+            this.btnStart.BackColor = System.Drawing.Color.White;
+            this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnStart.Location = new System.Drawing.Point(188, 4);
+            this.btnStart.Name = "btnStart";
+            this.btnStart.Size = new System.Drawing.Size(110, 40);
+            this.btnStart.TabIndex = 86;
+            this.btnStart.Text = "启动调试";
+            this.btnStart.UseVisualStyleBackColor = false;
+            // 
+            // btnInStore
+            // 
+            this.btnInStore.BackColor = System.Drawing.Color.White;
+            this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnInStore.Location = new System.Drawing.Point(527, 4);
+            this.btnInStore.Name = "btnInStore";
+            this.btnInStore.Size = new System.Drawing.Size(110, 40);
+            this.btnInStore.TabIndex = 102;
+            this.btnInStore.Text = "入库测试";
+            this.btnInStore.UseVisualStyleBackColor = false;
+            // 
+            // btnStop
+            // 
+            this.btnStop.BackColor = System.Drawing.Color.White;
+            this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnStop.Location = new System.Drawing.Point(301, 4);
+            this.btnStop.Name = "btnStop";
+            this.btnStop.Size = new System.Drawing.Size(110, 40);
+            this.btnStop.TabIndex = 87;
+            this.btnStop.Text = "停止";
+            this.btnStop.UseVisualStyleBackColor = false;
+            // 
             // FrmEquipBase
             // FrmEquipBase
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1318, 532);
+            this.ClientSize = new System.Drawing.Size(1184, 611);
+            this.Controls.Add(this.panBase);
             this.Name = "FrmEquipBase";
             this.Name = "FrmEquipBase";
             this.Text = "FrmEquipBase";
             this.Text = "FrmEquipBase";
+            this.panBase.ResumeLayout(false);
+            this.panBase.PerformLayout();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
 
 
         }
         }
 
 
         #endregion
         #endregion
+
+        protected System.Windows.Forms.Panel panBase;
+        protected System.Windows.Forms.Button btnExit;
+        protected System.Windows.Forms.Label lblName;
+        protected System.Windows.Forms.CheckBox chbDebug;
+        protected System.Windows.Forms.Label lblStoreStatus;
+        protected System.Windows.Forms.Button btnOutStore;
+        protected System.Windows.Forms.Button btnStart;
+        protected System.Windows.Forms.Button btnInStore;
+        protected System.Windows.Forms.Button btnStop;
     }
     }
 }
 }
\ No newline at end of file

source/AssemblyLineClient/FrmFeedingEquip.Designer.cs

@@ -57,11 +57,7 @@
             this.SL_LocationCylinder_Up = new System.Windows.Forms.Button();
             this.SL_LocationCylinder_Up = new System.Windows.Forms.Button();
             this.SL_MoveCylinder_Take = new System.Windows.Forms.Button();
             this.SL_MoveCylinder_Take = new System.Windows.Forms.Button();
             this.SL_ClampCylinder_Relax = new System.Windows.Forms.Button();
             this.SL_ClampCylinder_Relax = new System.Windows.Forms.Button();
-            this.chbDebug = new System.Windows.Forms.CheckBox();
             this.lblThisSta = new System.Windows.Forms.Label();
             this.lblThisSta = new System.Windows.Forms.Label();
-            this.lblStoreStatus = new System.Windows.Forms.Label();
-            this.btnStart = new System.Windows.Forms.Button();
-            this.btnStop = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
@@ -105,12 +101,10 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.btnMoveto = new System.Windows.Forms.Button();
             this.btnMoveto = new System.Windows.Forms.Button();
             this.txtSizePosition = new System.Windows.Forms.TextBox();
             this.txtSizePosition = new System.Windows.Forms.TextBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.btnClose = new System.Windows.Forms.Button();
             this.chbBoxSendShelf = new System.Windows.Forms.CheckBox();
             this.chbBoxSendShelf = new System.Windows.Forms.CheckBox();
             this.chbMoveStop = new System.Windows.Forms.CheckBox();
             this.chbMoveStop = new System.Windows.Forms.CheckBox();
-            this.lblName = new System.Windows.Forms.Label();
             this.btnScan = new System.Windows.Forms.Button();
             this.btnScan = new System.Windows.Forms.Button();
+            this.panBase.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -125,9 +119,55 @@
             this.groupDetial.SuspendLayout();
             this.groupDetial.SuspendLayout();
             this.groupBox9.SuspendLayout();
             this.groupBox9.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox2.SuspendLayout();
-            this.panel1.SuspendLayout();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
+            // panBase
+            // 
+            this.panBase.Controls.Add(this.chbMoveStop);
+            this.panBase.Controls.Add(this.chbBoxSendShelf);
+            this.panBase.Controls.Add(this.btnScan);
+            this.panBase.Size = new System.Drawing.Size(1273, 50);
+            this.panBase.Controls.SetChildIndex(this.btnStop, 0);
+            this.panBase.Controls.SetChildIndex(this.btnInStore, 0);
+            this.panBase.Controls.SetChildIndex(this.btnStart, 0);
+            this.panBase.Controls.SetChildIndex(this.btnOutStore, 0);
+            this.panBase.Controls.SetChildIndex(this.lblStoreStatus, 0);
+            this.panBase.Controls.SetChildIndex(this.chbDebug, 0);
+            this.panBase.Controls.SetChildIndex(this.btnScan, 0);
+            this.panBase.Controls.SetChildIndex(this.lblName, 0);
+            this.panBase.Controls.SetChildIndex(this.btnExit, 0);
+            this.panBase.Controls.SetChildIndex(this.chbBoxSendShelf, 0);
+            this.panBase.Controls.SetChildIndex(this.chbMoveStop, 0);
+            // 
+            // btnExit
+            // 
+            this.btnExit.Location = new System.Drawing.Point(1158, 4);
+            this.btnExit.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // chbDebug
+            // 
+            this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
+            // 
+            // lblStoreStatus
+            // 
+            this.lblStoreStatus.Location = new System.Drawing.Point(880, 13);
+            // 
+            // btnOutStore
+            // 
+            this.btnOutStore.Visible = false;
+            // 
+            // btnStart
+            // 
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // btnInStore
+            // 
+            this.btnInStore.Visible = false;
+            // 
+            // btnStop
+            // 
+            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
+            // 
             // timer1
             // timer1
             // 
             // 
             this.timer1.Interval = 1000;
             this.timer1.Interval = 1000;
@@ -665,18 +705,6 @@
             this.SL_ClampCylinder_Relax.UseVisualStyleBackColor = false;
             this.SL_ClampCylinder_Relax.UseVisualStyleBackColor = false;
             this.SL_ClampCylinder_Relax.Click += new System.EventHandler(this.btnFeedCylinder_Click);
             this.SL_ClampCylinder_Relax.Click += new System.EventHandler(this.btnFeedCylinder_Click);
             // 
             // 
-            // chbDebug
-            // 
-            this.chbDebug.AutoSize = true;
-            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(537, 12);
-            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(84, 24);
-            this.chbDebug.TabIndex = 247;
-            this.chbDebug.Text = "调试状态";
-            this.chbDebug.UseVisualStyleBackColor = true;
-            this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
-            // 
             // lblThisSta
             // lblThisSta
             // 
             // 
             this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -691,45 +719,6 @@
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
-            // lblStoreStatus
-            // 
-            this.lblStoreStatus.AutoSize = true;
-            this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
-            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblStoreStatus.Location = new System.Drawing.Point(865, 14);
-            this.lblStoreStatus.Name = "lblStoreStatus";
-            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
-            this.lblStoreStatus.TabIndex = 245;
-            this.lblStoreStatus.Text = "等待启动";
-            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // btnStart
-            // 
-            this.btnStart.BackColor = System.Drawing.Color.White;
-            this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStart.Location = new System.Drawing.Point(190, 4);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(110, 40);
-            this.btnStart.TabIndex = 86;
-            this.btnStart.Text = "启动调试";
-            this.btnStart.UseVisualStyleBackColor = false;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
-            // btnStop
-            // 
-            this.btnStop.BackColor = System.Drawing.Color.White;
-            this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop.Location = new System.Drawing.Point(305, 4);
-            this.btnStop.Name = "btnStop";
-            this.btnStop.Size = new System.Drawing.Size(110, 40);
-            this.btnStop.TabIndex = 87;
-            this.btnStop.Text = "停止";
-            this.btnStop.UseVisualStyleBackColor = false;
-            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
-            // 
             // tabControl1
             // tabControl1
             // 
             // 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -741,7 +730,7 @@
             this.tabControl1.Location = new System.Drawing.Point(5, 60);
             this.tabControl1.Location = new System.Drawing.Point(5, 60);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1270, 566);
+            this.tabControl1.Size = new System.Drawing.Size(1270, 573);
             this.tabControl1.TabIndex = 257;
             this.tabControl1.TabIndex = 257;
             // 
             // 
             // tabPage3
             // tabPage3
@@ -749,7 +738,7 @@
             this.tabPage3.Controls.Add(this.groupBox6);
             this.tabPage3.Controls.Add(this.groupBox6);
             this.tabPage3.Location = new System.Drawing.Point(4, 26);
             this.tabPage3.Location = new System.Drawing.Point(4, 26);
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(1262, 536);
+            this.tabPage3.Size = new System.Drawing.Size(1262, 543);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "状态信息";
             this.tabPage3.Text = "状态信息";
             this.tabPage3.UseVisualStyleBackColor = true;
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -768,7 +757,7 @@
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Controls.Add(this.lblThisSta);
             this.groupBox6.Location = new System.Drawing.Point(3, 3);
             this.groupBox6.Location = new System.Drawing.Point(3, 3);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(1256, 568);
+            this.groupBox6.Size = new System.Drawing.Size(1256, 575);
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabIndex = 278;
             this.groupBox6.TabStop = false;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "消息";
             this.groupBox6.Text = "消息";
@@ -1308,43 +1297,11 @@
             this.txtSizePosition.TabIndex = 305;
             this.txtSizePosition.TabIndex = 305;
             this.txtSizePosition.Text = "-1";
             this.txtSizePosition.Text = "-1";
             // 
             // 
-            // panel1
-            // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.btnClose);
-            this.panel1.Controls.Add(this.chbBoxSendShelf);
-            this.panel1.Controls.Add(this.chbMoveStop);
-            this.panel1.Controls.Add(this.lblName);
-            this.panel1.Controls.Add(this.btnScan);
-            this.panel1.Controls.Add(this.chbDebug);
-            this.panel1.Controls.Add(this.lblStoreStatus);
-            this.panel1.Controls.Add(this.btnStart);
-            this.panel1.Controls.Add(this.btnStop);
-            this.panel1.Location = new System.Drawing.Point(5, 4);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1270, 50);
-            this.panel1.TabIndex = 258;
-            // 
-            // btnClose
-            // 
-            this.btnClose.BackColor = System.Drawing.Color.White;
-            this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClose.Location = new System.Drawing.Point(1150, 4);
-            this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(110, 40);
-            this.btnClose.TabIndex = 259;
-            this.btnClose.Text = "退出";
-            this.btnClose.UseVisualStyleBackColor = false;
-            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
-            // 
             // chbBoxSendShelf
             // chbBoxSendShelf
             // 
             // 
             this.chbBoxSendShelf.AutoSize = true;
             this.chbBoxSendShelf.AutoSize = true;
             this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbBoxSendShelf.Location = new System.Drawing.Point(717, 12);
+            this.chbBoxSendShelf.Location = new System.Drawing.Point(530, 12);
             this.chbBoxSendShelf.Name = "chbBoxSendShelf";
             this.chbBoxSendShelf.Name = "chbBoxSendShelf";
             this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24);
             this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24);
             this.chbBoxSendShelf.TabIndex = 251;
             this.chbBoxSendShelf.TabIndex = 251;
@@ -1356,7 +1313,7 @@
             // 
             // 
             this.chbMoveStop.AutoSize = true;
             this.chbMoveStop.AutoSize = true;
             this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbMoveStop.Location = new System.Drawing.Point(627, 12);
+            this.chbMoveStop.Location = new System.Drawing.Point(772, 12);
             this.chbMoveStop.Name = "chbMoveStop";
             this.chbMoveStop.Name = "chbMoveStop";
             this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
             this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
             this.chbMoveStop.TabIndex = 250;
             this.chbMoveStop.TabIndex = 250;
@@ -1364,24 +1321,12 @@
             this.chbMoveStop.UseVisualStyleBackColor = true;
             this.chbMoveStop.UseVisualStyleBackColor = true;
             this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
             this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
             // 
             // 
-            // lblName
-            // 
-            this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
-            this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblName.ForeColor = System.Drawing.Color.Black;
-            this.lblName.Location = new System.Drawing.Point(5, 4);
-            this.lblName.Name = "lblName";
-            this.lblName.Size = new System.Drawing.Size(180, 40);
-            this.lblName.TabIndex = 249;
-            this.lblName.Text = "出料流水线";
-            this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // btnScan
             // btnScan
             // 
             // 
             this.btnScan.BackColor = System.Drawing.Color.White;
             this.btnScan.BackColor = System.Drawing.Color.White;
             this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnScan.Location = new System.Drawing.Point(420, 4);
+            this.btnScan.Location = new System.Drawing.Point(414, 4);
             this.btnScan.Name = "btnScan";
             this.btnScan.Name = "btnScan";
             this.btnScan.Size = new System.Drawing.Size(110, 40);
             this.btnScan.Size = new System.Drawing.Size(110, 40);
             this.btnScan.TabIndex = 248;
             this.btnScan.TabIndex = 248;
@@ -1394,7 +1339,6 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1281, 639);
             this.ClientSize = new System.Drawing.Size(1281, 639);
-            this.Controls.Add(this.panel1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.MaximizeBox = false;
@@ -1404,6 +1348,10 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
             this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
             this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
             this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
             this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
+            this.Controls.SetChildIndex(this.tabControl1, 0);
+            this.Controls.SetChildIndex(this.panBase, 0);
+            this.panBase.ResumeLayout(false);
+            this.panBase.PerformLayout();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.groupBox1.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.ResumeLayout(false);
@@ -1423,8 +1371,6 @@
             this.groupBox9.PerformLayout();
             this.groupBox9.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox2.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
 
 
         }
         }
@@ -1447,10 +1393,6 @@
         private System.Windows.Forms.Button SL_MoveCylinder_Take;
         private System.Windows.Forms.Button SL_MoveCylinder_Take;
         private System.Windows.Forms.Button SL_ClampCylinder_Relax;
         private System.Windows.Forms.Button SL_ClampCylinder_Relax;
         private System.Windows.Forms.Label lblThisSta;
         private System.Windows.Forms.Label lblThisSta;
-        private System.Windows.Forms.Label lblStoreStatus;
-        private System.Windows.Forms.Button btnStart;
-        private System.Windows.Forms.Button btnStop;
-        private System.Windows.Forms.CheckBox chbDebug;
         private System.Windows.Forms.Button SL_OutTopCylinder_Up;
         private System.Windows.Forms.Button SL_OutTopCylinder_Up;
         private System.Windows.Forms.Button SL_LocationCylinder_Up;
         private System.Windows.Forms.Button SL_LocationCylinder_Up;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabControl tabControl1;
@@ -1460,7 +1402,6 @@
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label4;
         internal System.Windows.Forms.Button btnMoveto;
         internal System.Windows.Forms.Button btnMoveto;
         internal System.Windows.Forms.TextBox txtSizePosition;
         internal System.Windows.Forms.TextBox txtSizePosition;
-        private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.GroupBox groupBox2;
         internal System.Windows.Forms.TextBox txtP1;
         internal System.Windows.Forms.TextBox txtP1;
@@ -1493,7 +1434,6 @@
         internal System.Windows.Forms.Button btnBP2;
         internal System.Windows.Forms.Button btnBP2;
         internal System.Windows.Forms.TextBox txtBP2;
         internal System.Windows.Forms.TextBox txtBP2;
         private System.Windows.Forms.Button btnScan;
         private System.Windows.Forms.Button btnScan;
-        private System.Windows.Forms.Label lblName;
         private System.Windows.Forms.Label lblMoveInfo;
         private System.Windows.Forms.Label lblMoveInfo;
         internal System.Windows.Forms.TextBox txtUpdownP3;
         internal System.Windows.Forms.TextBox txtUpdownP3;
         internal System.Windows.Forms.Button btnUpdownP3;
         internal System.Windows.Forms.Button btnUpdownP3;
@@ -1514,7 +1454,6 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.ComboBox cmbDSize;
         private System.Windows.Forms.ComboBox cmbDSize;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button SL_FixedCylinder_Up;
         private System.Windows.Forms.Button SL_FixedCylinder_Up;
         private System.Windows.Forms.Button SL_TopCylinder_Up;
         private System.Windows.Forms.Button SL_TopCylinder_Up;
         private System.Windows.Forms.Button SL_RollerLine_Run;
         private System.Windows.Forms.Button SL_RollerLine_Run;

source/AssemblyLineClient/FrmHYEquip.Designer.cs

@@ -53,12 +53,7 @@
             this.HY_LineRun = new System.Windows.Forms.Button();
             this.HY_LineRun = new System.Windows.Forms.Button();
             this.HY_TopCylinder_Up = new System.Windows.Forms.Button();
             this.HY_TopCylinder_Up = new System.Windows.Forms.Button();
             this.HY_LineBackRun = new System.Windows.Forms.Button();
             this.HY_LineBackRun = new System.Windows.Forms.Button();
-            this.chbDebug = new System.Windows.Forms.CheckBox();
             this.lblThisSta = new System.Windows.Forms.Label();
             this.lblThisSta = new System.Windows.Forms.Label();
-            this.lblStoreStatus = new System.Windows.Forms.Label();
-            this.btnStart = new System.Windows.Forms.Button();
-            this.btnStop = new System.Windows.Forms.Button();
-            this.btnOutStore = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
@@ -86,9 +81,7 @@
             this.btnP2 = new System.Windows.Forms.Button();
             this.btnP2 = new System.Windows.Forms.Button();
             this.txtP2 = new System.Windows.Forms.TextBox();
             this.txtP2 = new System.Windows.Forms.TextBox();
             this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
             this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.btnClose = new System.Windows.Forms.Button();
-            this.lblName = new System.Windows.Forms.Label();
+            this.panBase.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -99,9 +92,38 @@
             this.tabPage2.SuspendLayout();
             this.tabPage2.SuspendLayout();
             this.groupDetial.SuspendLayout();
             this.groupDetial.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox2.SuspendLayout();
-            this.panel1.SuspendLayout();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
+            // panBase
+            // 
+            this.panBase.Size = new System.Drawing.Size(1246, 50);
+            // 
+            // btnExit
+            // 
+            this.btnExit.Location = new System.Drawing.Point(1131, 4);
+            this.btnExit.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // chbDebug
+            // 
+            this.chbDebug.Click += new System.EventHandler(this.chbDebug_CheckedChanged);
+            // 
+            // btnOutStore
+            // 
+            this.btnOutStore.Text = "出料测试";
+            this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
+            // 
+            // btnStart
+            // 
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // btnInStore
+            // 
+            this.btnInStore.Visible = false;
+            // 
+            // btnStop
+            // 
+            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
+            // 
             // timer1
             // timer1
             // 
             // 
             this.timer1.Interval = 1000;
             this.timer1.Interval = 1000;
@@ -581,18 +603,6 @@
             this.HY_LineBackRun.UseVisualStyleBackColor = false;
             this.HY_LineBackRun.UseVisualStyleBackColor = false;
             this.HY_LineBackRun.Click += new System.EventHandler(this.btnLineBackRun_Click);
             this.HY_LineBackRun.Click += new System.EventHandler(this.btnLineBackRun_Click);
             // 
             // 
-            // chbDebug
-            // 
-            this.chbDebug.AutoSize = true;
-            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(558, 13);
-            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(84, 24);
-            this.chbDebug.TabIndex = 247;
-            this.chbDebug.Text = "调试状态";
-            this.chbDebug.UseVisualStyleBackColor = true;
-            this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
-            // 
             // lblThisSta
             // lblThisSta
             // 
             // 
             this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -608,58 +618,6 @@
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
-            // lblStoreStatus
-            // 
-            this.lblStoreStatus.AutoSize = true;
-            this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
-            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblStoreStatus.Location = new System.Drawing.Point(673, 15);
-            this.lblStoreStatus.Name = "lblStoreStatus";
-            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
-            this.lblStoreStatus.TabIndex = 245;
-            this.lblStoreStatus.Text = "等待启动";
-            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // btnStart
-            // 
-            this.btnStart.BackColor = System.Drawing.Color.White;
-            this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStart.Location = new System.Drawing.Point(190, 5);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(110, 40);
-            this.btnStart.TabIndex = 86;
-            this.btnStart.Text = "启动调试";
-            this.btnStart.UseVisualStyleBackColor = false;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
-            // btnStop
-            // 
-            this.btnStop.BackColor = System.Drawing.Color.White;
-            this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop.Location = new System.Drawing.Point(305, 5);
-            this.btnStop.Name = "btnStop";
-            this.btnStop.Size = new System.Drawing.Size(110, 40);
-            this.btnStop.TabIndex = 87;
-            this.btnStop.Text = "停止";
-            this.btnStop.UseVisualStyleBackColor = false;
-            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
-            // 
-            // btnOutStore
-            // 
-            this.btnOutStore.BackColor = System.Drawing.Color.White;
-            this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOutStore.Location = new System.Drawing.Point(420, 5);
-            this.btnOutStore.Name = "btnOutStore";
-            this.btnOutStore.Size = new System.Drawing.Size(110, 40);
-            this.btnOutStore.TabIndex = 101;
-            this.btnOutStore.Text = "出料测试";
-            this.btnOutStore.UseVisualStyleBackColor = false;
-            this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
-            // 
             // tabControl1
             // tabControl1
             // 
             // 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -1013,54 +971,11 @@
             this.axisMoveControl1.Size = new System.Drawing.Size(566, 427);
             this.axisMoveControl1.Size = new System.Drawing.Size(566, 427);
             this.axisMoveControl1.TabIndex = 0;
             this.axisMoveControl1.TabIndex = 0;
             // 
             // 
-            // panel1
-            // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.btnClose);
-            this.panel1.Controls.Add(this.lblName);
-            this.panel1.Controls.Add(this.chbDebug);
-            this.panel1.Controls.Add(this.lblStoreStatus);
-            this.panel1.Controls.Add(this.btnOutStore);
-            this.panel1.Controls.Add(this.btnStart);
-            this.panel1.Controls.Add(this.btnStop);
-            this.panel1.Location = new System.Drawing.Point(2, 1);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1246, 50);
-            this.panel1.TabIndex = 258;
-            // 
-            // btnClose
-            // 
-            this.btnClose.BackColor = System.Drawing.Color.White;
-            this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClose.Location = new System.Drawing.Point(1129, 5);
-            this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(110, 40);
-            this.btnClose.TabIndex = 260;
-            this.btnClose.Text = "退出";
-            this.btnClose.UseVisualStyleBackColor = false;
-            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
-            // 
-            // lblName
-            // 
-            this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
-            this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblName.ForeColor = System.Drawing.Color.Black;
-            this.lblName.Location = new System.Drawing.Point(5, 5);
-            this.lblName.Name = "lblName";
-            this.lblName.Size = new System.Drawing.Size(180, 40);
-            this.lblName.TabIndex = 259;
-            this.lblName.Text = "HY";
-            this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // FrmHYEquip
             // FrmHYEquip
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1254, 611);
             this.ClientSize = new System.Drawing.Size(1254, 611);
-            this.Controls.Add(this.panel1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.MaximizeBox = false;
@@ -1070,6 +985,10 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
             this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
             this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
             this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
             this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
+            this.Controls.SetChildIndex(this.tabControl1, 0);
+            this.Controls.SetChildIndex(this.panBase, 0);
+            this.panBase.ResumeLayout(false);
+            this.panBase.PerformLayout();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.groupBox1.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.ResumeLayout(false);
@@ -1084,8 +1003,6 @@
             this.groupDetial.PerformLayout();
             this.groupDetial.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox2.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
 
 
         }
         }
@@ -1104,16 +1021,10 @@
         private System.Windows.Forms.Button HY_TopCylinder_Up;
         private System.Windows.Forms.Button HY_TopCylinder_Up;
         private System.Windows.Forms.Button HY_LineBackRun;
         private System.Windows.Forms.Button HY_LineBackRun;
         private System.Windows.Forms.Label lblThisSta;
         private System.Windows.Forms.Label lblThisSta;
-        private System.Windows.Forms.Label lblStoreStatus;
-        private System.Windows.Forms.Button btnStart;
-        private System.Windows.Forms.Button btnStop;
-        private System.Windows.Forms.Button btnOutStore;
-        private System.Windows.Forms.CheckBox chbDebug;
         private System.Windows.Forms.Button HY_StopDown;
         private System.Windows.Forms.Button HY_StopDown;
         private System.Windows.Forms.Button HY_LineRun;
         private System.Windows.Forms.Button HY_LineRun;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.Label lblTrayNum;
         private System.Windows.Forms.Label lblTrayNum;
         private System.Windows.Forms.GroupBox groupBox6;
         private System.Windows.Forms.GroupBox groupBox6;
@@ -1137,7 +1048,6 @@
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label4;
         internal System.Windows.Forms.Button btnP2;
         internal System.Windows.Forms.Button btnP2;
         internal System.Windows.Forms.TextBox txtP2;
         internal System.Windows.Forms.TextBox txtP2;
-        private System.Windows.Forms.Label lblName;
         private System.Windows.Forms.Label lblMoveInfo;
         private System.Windows.Forms.Label lblMoveInfo;
         private System.Windows.Forms.GroupBox groupDetial;
         private System.Windows.Forms.GroupBox groupDetial;
         private System.Windows.Forms.Button btnDSave;
         private System.Windows.Forms.Button btnDSave;
@@ -1148,7 +1058,6 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.ComboBox cmbDSize;
         private System.Windows.Forms.ComboBox cmbDSize;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button HY_LocationCylinder_Up;
         private System.Windows.Forms.Button HY_LocationCylinder_Up;
         private System.Windows.Forms.Button HY_FrontStopDown;
         private System.Windows.Forms.Button HY_FrontStopDown;
         private System.Windows.Forms.Button HY_ClampCylinder_Work;
         private System.Windows.Forms.Button HY_ClampCylinder_Work;

source/AssemblyLineClient/FrmLineStore.Designer.cs

@@ -726,9 +726,9 @@
             this.lblWarnMsg.AutoEllipsis = true;
             this.lblWarnMsg.AutoEllipsis = true;
             this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
             this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
-            this.lblWarnMsg.Location = new System.Drawing.Point(351, 3);
+            this.lblWarnMsg.Location = new System.Drawing.Point(378, 3);
             this.lblWarnMsg.Name = "lblWarnMsg";
             this.lblWarnMsg.Name = "lblWarnMsg";
-            this.lblWarnMsg.Size = new System.Drawing.Size(985, 75);
+            this.lblWarnMsg.Size = new System.Drawing.Size(958, 75);
             this.lblWarnMsg.TabIndex = 96;
             this.lblWarnMsg.TabIndex = 96;
             this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
@@ -866,73 +866,73 @@
             // toolStripSeparator6
             // toolStripSeparator6
             // 
             // 
             this.toolStripSeparator6.Name = "toolStripSeparator6";
             this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
             this.toolStripSeparator6.Visible = false;
             this.toolStripSeparator6.Visible = false;
             // 
             // 
             // 二维码学习ToolStripMenuItem
             // 二维码学习ToolStripMenuItem
             // 
             // 
             this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
             this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
-            this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
+            this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.二维码学习ToolStripMenuItem.Text = "二维码学习";
             this.二维码学习ToolStripMenuItem.Text = "二维码学习";
             this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
             this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
             // 
             // 
             // toolStripSeparator7
             // toolStripSeparator7
             // 
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
             // 
             // 
             // 托盘初始化ToolStripMenuItem
             // 托盘初始化ToolStripMenuItem
             // 
             // 
             this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
             this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
-            this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
+            this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
             this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
             this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
             this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
             // 
             // 
             // toolStripSeparator9
             // toolStripSeparator9
             // 
             // 
             this.toolStripSeparator9.Name = "toolStripSeparator9";
             this.toolStripSeparator9.Name = "toolStripSeparator9";
-            this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
             // 
             // 
             // toolStripMenuItem2
             // toolStripMenuItem2
             // 
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
             this.toolStripMenuItem2.Text = "AGV调试";
             this.toolStripMenuItem2.Text = "AGV调试";
             this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
             this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
             // 
             // 
             // toolStripSeparator13
             // toolStripSeparator13
             // 
             // 
             this.toolStripSeparator13.Name = "toolStripSeparator13";
             this.toolStripSeparator13.Name = "toolStripSeparator13";
-            this.toolStripSeparator13.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
             // 
             // 
             // iO模块状态ToolStripMenuItem
             // iO模块状态ToolStripMenuItem
             // 
             // 
             this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
             this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
-            this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
+            this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态";
             this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态";
             this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
             this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
             // 
             // 
             // toolStripSeparator14
             // toolStripSeparator14
             // 
             // 
             this.toolStripSeparator14.Name = "toolStripSeparator14";
             this.toolStripSeparator14.Name = "toolStripSeparator14";
-            this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
             // 
             // 
             // 查看托盘信息ToolStripMenuItem
             // 查看托盘信息ToolStripMenuItem
             // 
             // 
             this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
             this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
-            this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
+            this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
             this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
             this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
             this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
             // 
             // 
             // toolStripSeparator12
             // toolStripSeparator12
             // 
             // 
             this.toolStripSeparator12.Name = "toolStripSeparator12";
             this.toolStripSeparator12.Name = "toolStripSeparator12";
-            this.toolStripSeparator12.Size = new System.Drawing.Size(173, 6);
+            this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
             // 
             // 
             // 清空托盘信息ToolStripMenuItem
             // 清空托盘信息ToolStripMenuItem
             // 
             // 
             this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
             this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
-            this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
+            this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
             this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
             this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
             this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
             // 
             // 
@@ -985,8 +985,8 @@
             this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.操作ToolStripMenuItem,
             this.操作ToolStripMenuItem,
-            this.设置TToolStripMenuItem,
             this.运行参数ToolStripMenuItem,
             this.运行参数ToolStripMenuItem,
+            this.设置TToolStripMenuItem,
             this.帮助ToolStripMenuItem});
             this.帮助ToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
             this.menuStrip1.Name = "menuStrip1";

source/AssemblyLineClient/FrmLineStore.cs

@@ -36,7 +36,6 @@ namespace OnlineStore.AssemblyLine
 
 
         private void LoadStoreData()
         private void LoadStoreData()
         { 
         { 
-
             formLineStatus(false);
             formLineStatus(false);
             string title = ConfigAppSettings.GetValue(Setting_Init.App_Title);
             string title = ConfigAppSettings.GetValue(Setting_Init.App_Title);
             this.Text = title;
             this.Text = title;
@@ -54,13 +53,8 @@ namespace OnlineStore.AssemblyLine
             AddForm("  IO列表查看  ", ioStatus);
             AddForm("  IO列表查看  ", ioStatus);
             FrmLineIO frmIOStatus = new FrmLineIO();
             FrmLineIO frmIOStatus = new FrmLineIO();
             AddForm("  流水线IO  ", frmIOStatus); 
             AddForm("  流水线IO  ", frmIOStatus); 
-
-
             LoadMoveList(); 
             LoadMoveList(); 
-
-            //lblCID.Text = ConfigAppSettings.GetValue(Setting_Init.Line_CID);
             LoadListView(); 
             LoadListView(); 
-
             托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1);
             托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1);
             cmbTray.Items.Clear();
             cmbTray.Items.Clear();
             for (int i = 1; i <= 30; i++)
             for (int i = 1; i <= 30; i++)
@@ -119,11 +113,8 @@ namespace OnlineStore.AssemblyLine
                 Application.Exit();
                 Application.Exit();
                 return;
                 return;
             }
             }
-            //Task.Factory.StartNew(delegate { 
+            TrayManager.InitFileData();
             LoadStoreData(); 
             LoadStoreData(); 
-
-            //} );
-
             this.Opacity = 100;
             this.Opacity = 100;
             this.Visible = true;
             this.Visible = true;
             this.WindowState = FormWindowState.Maximized;
             this.WindowState = FormWindowState.Maximized;
@@ -135,96 +126,6 @@ namespace OnlineStore.AssemblyLine
             timer1.Start();
             timer1.Start();
         }
         }
 
 
-
-        private void LoadListView()
-        {
-            this.listView1.Columns.Clear();
-            AddHealder("设备名称", 110);
-            AddHealder("启用", 40);
-            AddHealder("报警", 110);
-            AddHealder("状态", 110);
-            AddHealder("BOX_CID", 80);
-            AddHealder("在线", 40);
-            AddHealder("BOX_报警", 110);
-            AddHealder("BOX状态", 110);
-            //AddHealder("BOX状态", listView1.Size.Width - 100 - 80 - 80 - 100 - 100 - 100 -40- 8);
-            foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
-            {
-                ListViewItem lvi = new ListViewItem();
-                lvi.Text = move.Name;
-                lvi.SubItems.Add(move.Config.IsDebug.Equals(1) ? "✘" : "✔");
-                lvi.SubItems.Add(move.alarmType.ToString());
-                //   lvi.SubItems.Add(move.lineStatus.ToString());
-                lvi.SubItems.Add(move.GetRunStr());
-
-                BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
-                if (box != null)
-                {
-                    string online = "✘";
-                    lvi.SubItems.Add(box.CId.ToString());
-
-                    if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
-                    {
-                        online = "✔";
-                    }
-                    lvi.SubItems.Add(online);
-                    lvi.SubItems.Add(box.SAlarmType.ToString());
-                    lvi.SubItems.Add(box.ToShowStr());
-                }
-                else
-                {
-                    lvi.SubItems.Add("");
-                    lvi.SubItems.Add("");
-                    lvi.SubItems.Add("");
-                    lvi.SubItems.Add("");
-                }
-                this.listView1.Items.Add(lvi);
-            }
-            ListViewItem emptyView = new ListViewItem();
-            this.listView1.Items.Add(emptyView);
-            foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
-            {
-                ListViewItem lvi = new ListViewItem();
-                lvi.Text = equip.Name;
-                lvi.SubItems.Add(equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
-                lvi.SubItems.Add(equip.alarmType.ToString());
-                lvi.SubItems.Add(equip.GetRunStr());
-                this.listView1.Items.Add(lvi);
-            }
-
-            this.listView1.Items.Add((ListViewItem)emptyView.Clone());
-            foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
-            {
-                ListViewItem lvi = new ListViewItem();
-                lvi.Text = equip.Name;
-                lvi.SubItems.Add(equip.IsDebug.Equals(1) ? "✘" : "✔");
-                lvi.SubItems.Add(equip.alarmType.ToString());
-                lvi.SubItems.Add(equip.GetRunStr());
-                this.listView1.Items.Add(lvi);
-            }
-            this.listView1.Items.Add((ListViewItem)emptyView.Clone()); 
-            cmbBoxIndex.Items.Clear();
-            foreach (int key in lineBean.MoveEquipMap.Keys)
-            {
-                cmbBoxIndex.Items.Add("BOX-" + key);
-
-            }
-            if (cmbBoxIndex.Items.Count > 0)
-            {
-                cmbBoxIndex.SelectedIndex = 0;
-            }
-        }
-        private void AddHealder(string name, int widht)
-        {
-            ColumnHeader preSendwire = new ColumnHeader();
-            preSendwire.Text = name;   //设置列标题
-            preSendwire.Width = widht;    //设置列宽度
-            preSendwire.TextAlign = HorizontalAlignment.Left;   //设置列的对齐方式
-            this.listView1.Columns.Add(preSendwire);    //将列头添加到ListView控件。
-        }
-        /// <summary>
-        /// 隐藏窗口
-        /// </summary>
         private void HideForm()
         private void HideForm()
         {
         {
             this.Opacity = 0;
             this.Opacity = 0;
@@ -278,16 +179,12 @@ namespace OnlineStore.AssemblyLine
                             equip.StopRun();
                             equip.StopRun();
                         }
                         }
                     } 
                     } 
-                    //  IOManager.instance.CloseAllDO();
                     IOManager.instance.CloseAllConnection(); 
                     IOManager.instance.CloseAllConnection(); 
-                    //AIManager.CloseConnect();
                     AxisManager.instance.CloseAllPort();
                     AxisManager.instance.CloseAllPort();
                     if (Camera._cam != null)
                     if (Camera._cam != null)
                     {
                     {
                         Camera._cam.CloseAll();
                         Camera._cam.CloseAll();
                     } 
                     } 
-                    // CodeManager.CloseAllCamera();
-                    //   RFIDManager.Close();
                     System.Environment.Exit(System.Environment.ExitCode);
                     System.Environment.Exit(System.Environment.ExitCode);
                 }
                 }
                 catch (Exception ex)
                 catch (Exception ex)
@@ -355,34 +252,8 @@ namespace OnlineStore.AssemblyLine
 
 
         private void formLineStatus(bool isStart)
         private void formLineStatus(bool isStart)
         { 
         { 
-            foreach (TabPage tab in tabPageList)
-            {
-                bool find = false;
-                foreach (Control control in tab.Controls)
-                {
-                    if (control is Panel)
-                    {
-                        foreach (Control con in control.Controls)
-                        {
-                            if (con is FrmMoveEquip)
-                            {
-                                FrmMoveEquip frm = (FrmMoveEquip)con;
-                                frm.FormStatus(isStart);
-                                find = true;
-                                break;
-                            }
-
-                        }
-                    }
-                    if (find)
-                    {
-                        break;
-                    }
-                }
-            }
             启动AToolStripMenuItem.Enabled = !isStart;
             启动AToolStripMenuItem.Enabled = !isStart;
             停止TToolStripMenuItem.Enabled = isStart; 
             停止TToolStripMenuItem.Enabled = isStart; 
-
         }
         }
         private void 停止所有料仓TToolStripMenuItem_Click(object sender, EventArgs e)
         private void 停止所有料仓TToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
@@ -536,9 +407,129 @@ namespace OnlineStore.AssemblyLine
                     }
                     }
                 }
                 }
             }
             }
+            lblWarnMsg.Text = warnMsg;
+            UpdateListView();
+      
+            if (lineBean.runStatus > LineRunStatus.Wait)
+            {
+                if (启动AToolStripMenuItem.Enabled.Equals(true))
+                {
+                    formLineStatus(true);
+                }
+                if ((lineBean.runStatus.Equals(LineRunStatus.HomeMoving) || lineBean.runStatus.Equals(LineRunStatus.Reset))
+                    && lineBean.alarmType.Equals(LineAlarmType.None))
+                {
+                    SetMenuS(复位RToolStripMenuItem, false);
+                    SetMenuS(启动AToolStripMenuItem, false);
+                }
+                else
+                {
+                    SetMenuS(复位RToolStripMenuItem, true);
+                }
+            }
+            else
+            {
+                SetMenuS(启动AToolStripMenuItem, true);
+                SetMenuS(复位RToolStripMenuItem, false);
+                SetMenuS(停止TToolStripMenuItem, false);
+            }
+
+        }
+
+        #region ListView显示
+
+
+        private void LoadListView()
+        {
+            this.listView1.Columns.Clear();
+            AddHealder("设备名称", 110);
+            AddHealder("启用", 40);
+            AddHealder("报警", 110);
+            AddHealder("状态", 110);
+            AddHealder("BOX_CID", 80);
+            AddHealder("在线", 40);
+            AddHealder("BOX_报警", 110);
+            AddHealder("BOX状态", 110);
+            //AddHealder("BOX状态", listView1.Size.Width - 100 - 80 - 80 - 100 - 100 - 100 -40- 8);
+            foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
+            {
+                ListViewItem lvi = new ListViewItem();
+                lvi.Text = move.Name;
+                lvi.SubItems.Add(move.Config.IsDebug.Equals(1) ? "✘" : "✔");
+                lvi.SubItems.Add(move.alarmType.ToString());
+                //   lvi.SubItems.Add(move.lineStatus.ToString());
+                lvi.SubItems.Add(move.GetRunStr());
+
+                BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
+                if (box != null)
+                {
+                    string online = "✘";
+                    lvi.SubItems.Add(box.CId.ToString());
+
+                    if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
+                    {
+                        online = "✔";
+                    }
+                    lvi.SubItems.Add(online);
+                    lvi.SubItems.Add(box.SAlarmType.ToString());
+                    lvi.SubItems.Add(box.ToShowStr());
+                }
+                else
+                {
+                    lvi.SubItems.Add("");
+                    lvi.SubItems.Add("");
+                    lvi.SubItems.Add("");
+                    lvi.SubItems.Add("");
+                }
+                this.listView1.Items.Add(lvi);
+            }
+            ListViewItem emptyView = new ListViewItem();
+            this.listView1.Items.Add(emptyView);
+            foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
+            {
+                ListViewItem lvi = new ListViewItem();
+                lvi.Text = equip.Name;
+                lvi.SubItems.Add(equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
+                lvi.SubItems.Add(equip.alarmType.ToString());
+                lvi.SubItems.Add(equip.GetRunStr());
+                this.listView1.Items.Add(lvi);
+            }
+
+            this.listView1.Items.Add((ListViewItem)emptyView.Clone());
+            foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
+            {
+                ListViewItem lvi = new ListViewItem();
+                lvi.Text = equip.Name;
+                lvi.SubItems.Add(equip.IsDebug.Equals(1) ? "✘" : "✔");
+                lvi.SubItems.Add(equip.alarmType.ToString());
+                lvi.SubItems.Add(equip.GetRunStr());
+                this.listView1.Items.Add(lvi);
+            }
+            this.listView1.Items.Add((ListViewItem)emptyView.Clone());
+            cmbBoxIndex.Items.Clear();
+            foreach (int key in lineBean.MoveEquipMap.Keys)
+            {
+                cmbBoxIndex.Items.Add("BOX-" + key);
+
+            }
+            if (cmbBoxIndex.Items.Count > 0)
+            {
+                cmbBoxIndex.SelectedIndex = 0;
+            }
+        }
+        private void AddHealder(string name, int widht)
+        {
+            ColumnHeader preSendwire = new ColumnHeader();
+            preSendwire.Text = name;   //设置列标题
+            preSendwire.Width = widht;    //设置列宽度
+            preSendwire.TextAlign = HorizontalAlignment.Left;   //设置列的对齐方式
+            this.listView1.Columns.Add(preSendwire);    //将列头添加到ListView控件。
+        }
+
+        private void UpdateListView()
+        {
             if (listView1.Visible)
             if (listView1.Visible)
             {
             {
-                lblWarnMsg.Text = warnMsg;
                 int i = 0;
                 int i = 0;
 
 
                 int item_debug_index = 1;
                 int item_debug_index = 1;
@@ -598,33 +589,7 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
                 i++;
                 i++;
             }
             }
-      
-            if (lineBean.runStatus > LineRunStatus.Wait)
-            {
-                if (启动AToolStripMenuItem.Enabled.Equals(true))
-                {
-                    formLineStatus(true);
-                }
-                if ((lineBean.runStatus.Equals(LineRunStatus.HomeMoving) || lineBean.runStatus.Equals(LineRunStatus.Reset))
-                    && lineBean.alarmType.Equals(LineAlarmType.None))
-                {
-                    SetMenuS(复位RToolStripMenuItem, false);
-                    SetMenuS(启动AToolStripMenuItem, false);
-                }
-                else
-                {
-                    SetMenuS(复位RToolStripMenuItem, true);
         }
         }
-            }
-            else
-            {
-                SetMenuS(启动AToolStripMenuItem, true);
-                SetMenuS(复位RToolStripMenuItem, false);
-                SetMenuS(停止TToolStripMenuItem, false);
-            }
-
-        }
-         
         private void SetMenuS(ToolStripMenuItem toolMenu, bool isEn)
         private void SetMenuS(ToolStripMenuItem toolMenu, bool isEn)
         {
         {
             if (!toolMenu.Enabled.Equals(isEn))
             if (!toolMenu.Enabled.Equals(isEn))
@@ -650,6 +615,7 @@ namespace OnlineStore.AssemblyLine
             }
             }
         }
         }
 
 
+        #endregion
 
 
         private void tabControl1_DrawItem(object sender, DrawItemEventArgs e)
         private void tabControl1_DrawItem(object sender, DrawItemEventArgs e)
         {
         {
@@ -850,14 +816,7 @@ namespace OnlineStore.AssemblyLine
             DialogResult resut = MessageBox.Show("确定手动清空所有托盘信息？", "提示", MessageBoxButtons.YesNo);
             DialogResult resut = MessageBox.Show("确定手动清空所有托盘信息？", "提示", MessageBoxButtons.YesNo);
             if (resut.Equals(DialogResult.Yes))
             if (resut.Equals(DialogResult.Yes))
             { 
             { 
-                List<TrayInfo> tray = TrayManager.getTrayList();
-                LogUtil.info("-------------------点击：清空托盘。清空前打印托盘信息：");
-                foreach (TrayInfo t in tray)
-                {
-                    LogUtil.info(t.ToStr());
-                }
                 TrayManager.ClearTrayInfo();
                 TrayManager.ClearTrayInfo();
-                LogUtil.info("-------------------点击：清空托盘。托盘内容已清空");
             }
             }
         }
         }
 
 
@@ -907,13 +866,10 @@ namespace OnlineStore.AssemblyLine
 
 
         private void 清空日志ToolStripMenuItem_Click(object sender, EventArgs e)
         private void 清空日志ToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
-
             LogUtil.ClearLog();
             LogUtil.ClearLog();
         }
         }
-
         private void 复制日志ToolStripMenuItem_Click(object sender, EventArgs e)
         private void 复制日志ToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
-
             Clipboard.SetDataObject(logBox.Text);
             Clipboard.SetDataObject(logBox.Text);
             MessageBox.Show("已复制日志到粘贴板！");
             MessageBox.Show("已复制日志到粘贴板！");
         }
         }
@@ -986,9 +942,6 @@ namespace OnlineStore.AssemblyLine
             }
             }
             LogUtil.info(Name + " 点击：" + 启用蜂鸣器ToolStripMenuItem.Text);
             LogUtil.info(Name + " 点击：" + 启用蜂鸣器ToolStripMenuItem.Text);
         }
         }
-
-        
-
         private void aGVCancelStateToolStripMenuItem_Click(object sender, EventArgs e)
         private void aGVCancelStateToolStripMenuItem_Click(object sender, EventArgs e)
         {
         {
             if (!LoadOk)
             if (!LoadOk)
@@ -1285,9 +1238,6 @@ namespace OnlineStore.AssemblyLine
                         control_Stop.Text = "✘  未启用";
                         control_Stop.Text = "✘  未启用";
                     }
                     }
                 }
                 }
-
-
-
             }
             }
         }
         }
         #endregion
         #endregion

source/AssemblyLineClient/FrmMoveEquip.Designer.cs

@@ -45,13 +45,7 @@
             this.BeforeAfterCylinder_Before = new System.Windows.Forms.Button();
             this.BeforeAfterCylinder_Before = new System.Windows.Forms.Button();
             this.TopCylinder_Up = new System.Windows.Forms.Button();
             this.TopCylinder_Up = new System.Windows.Forms.Button();
             this.UpDownCylinder_Up = new System.Windows.Forms.Button();
             this.UpDownCylinder_Up = new System.Windows.Forms.Button();
-            this.chbDebug = new System.Windows.Forms.CheckBox();
             this.lblThisSta = new System.Windows.Forms.Label();
             this.lblThisSta = new System.Windows.Forms.Label();
-            this.lblStoreStatus = new System.Windows.Forms.Label();
-            this.btnStart = new System.Windows.Forms.Button();
-            this.btnStop = new System.Windows.Forms.Button();
-            this.btnInStore = new System.Windows.Forms.Button();
-            this.btnOutStore = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
@@ -79,10 +73,7 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.btnP2 = new System.Windows.Forms.Button();
             this.btnP2 = new System.Windows.Forms.Button();
             this.txtP2 = new System.Windows.Forms.TextBox();
             this.txtP2 = new System.Windows.Forms.TextBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.button1 = new System.Windows.Forms.Button();
-            this.btnClose = new System.Windows.Forms.Button();
-            this.lblName = new System.Windows.Forms.Label();
+            this.panBase.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -93,9 +84,37 @@
             this.tabPage2.SuspendLayout();
             this.tabPage2.SuspendLayout();
             this.groupDetial.SuspendLayout();
             this.groupDetial.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox2.SuspendLayout();
-            this.panel1.SuspendLayout();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
+            // panBase
+            // 
+            this.panBase.Size = new System.Drawing.Size(1176, 50);
+            // 
+            // btnExit
+            // 
+            this.btnExit.Location = new System.Drawing.Point(1061, 4);
+            this.btnExit.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // chbDebug
+            // 
+            this.chbDebug.Click += new System.EventHandler(this.chbDebug_CheckedChanged);
+            // 
+            // btnOutStore
+            // 
+            this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
+            // 
+            // btnStart
+            // 
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // btnInStore
+            // 
+            this.btnInStore.Click += new System.EventHandler(this.btnInStore_Click);
+            // 
+            // btnStop
+            // 
+            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
+            // 
             // timer1
             // timer1
             // 
             // 
             this.timer1.Interval = 1000;
             this.timer1.Interval = 1000;
@@ -326,7 +345,7 @@
             this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before);
             this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before);
             this.groupDO.Controls.Add(this.TopCylinder_Up);
             this.groupDO.Controls.Add(this.TopCylinder_Up);
             this.groupDO.Controls.Add(this.UpDownCylinder_Up);
             this.groupDO.Controls.Add(this.UpDownCylinder_Up);
-            this.groupDO.Location = new System.Drawing.Point(496, 280);
+            this.groupDO.Location = new System.Drawing.Point(496, 281);
             this.groupDO.Name = "groupDO";
             this.groupDO.Name = "groupDO";
             this.groupDO.Size = new System.Drawing.Size(661, 125);
             this.groupDO.Size = new System.Drawing.Size(661, 125);
             this.groupDO.TabIndex = 255;
             this.groupDO.TabIndex = 255;
@@ -463,18 +482,6 @@
             this.UpDownCylinder_Up.UseVisualStyleBackColor = false;
             this.UpDownCylinder_Up.UseVisualStyleBackColor = false;
             this.UpDownCylinder_Up.Click += new System.EventHandler(this.btnUpDownUp_Click);
             this.UpDownCylinder_Up.Click += new System.EventHandler(this.btnUpDownUp_Click);
             // 
             // 
-            // chbDebug
-            // 
-            this.chbDebug.AutoSize = true;
-            this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chbDebug.Location = new System.Drawing.Point(682, 13);
-            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(84, 24);
-            this.chbDebug.TabIndex = 247;
-            this.chbDebug.Text = "调试状态";
-            this.chbDebug.UseVisualStyleBackColor = true;
-            this.chbDebug.CheckedChanged += new System.EventHandler(this.chbDebug_CheckedChanged);
-            // 
             // lblThisSta
             // lblThisSta
             // 
             // 
             this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             this.lblThisSta.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -489,71 +496,6 @@
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.Text = "等待启动";
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
-            // lblStoreStatus
-            // 
-            this.lblStoreStatus.AutoSize = true;
-            this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
-            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblStoreStatus.Location = new System.Drawing.Point(804, 15);
-            this.lblStoreStatus.Name = "lblStoreStatus";
-            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
-            this.lblStoreStatus.TabIndex = 245;
-            this.lblStoreStatus.Text = "等待启动";
-            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // btnStart
-            // 
-            this.btnStart.BackColor = System.Drawing.Color.White;
-            this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStart.Location = new System.Drawing.Point(188, 5);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(110, 40);
-            this.btnStart.TabIndex = 86;
-            this.btnStart.Text = "启动调试";
-            this.btnStart.UseVisualStyleBackColor = false;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
-            // btnStop
-            // 
-            this.btnStop.BackColor = System.Drawing.Color.White;
-            this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStop.Location = new System.Drawing.Point(301, 5);
-            this.btnStop.Name = "btnStop";
-            this.btnStop.Size = new System.Drawing.Size(110, 40);
-            this.btnStop.TabIndex = 87;
-            this.btnStop.Text = "停止";
-            this.btnStop.UseVisualStyleBackColor = false;
-            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
-            // 
-            // btnInStore
-            // 
-            this.btnInStore.BackColor = System.Drawing.Color.White;
-            this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnInStore.Location = new System.Drawing.Point(527, 5);
-            this.btnInStore.Name = "btnInStore";
-            this.btnInStore.Size = new System.Drawing.Size(110, 40);
-            this.btnInStore.TabIndex = 102;
-            this.btnInStore.Text = "入库测试";
-            this.btnInStore.UseVisualStyleBackColor = false;
-            this.btnInStore.Click += new System.EventHandler(this.btnInStore_Click);
-            // 
-            // btnOutStore
-            // 
-            this.btnOutStore.BackColor = System.Drawing.Color.White;
-            this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOutStore.Location = new System.Drawing.Point(414, 5);
-            this.btnOutStore.Name = "btnOutStore";
-            this.btnOutStore.Size = new System.Drawing.Size(110, 40);
-            this.btnOutStore.TabIndex = 101;
-            this.btnOutStore.Text = "出库测试";
-            this.btnOutStore.UseVisualStyleBackColor = false;
-            this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
-            // 
             // tabControl1
             // tabControl1
             // 
             // 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -908,68 +850,11 @@
             this.txtP2.TabIndex = 305;
             this.txtP2.TabIndex = 305;
             this.txtP2.Text = "-1";
             this.txtP2.Text = "-1";
             // 
             // 
-            // panel1
-            // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.button1);
-            this.panel1.Controls.Add(this.btnClose);
-            this.panel1.Controls.Add(this.lblName);
-            this.panel1.Controls.Add(this.chbDebug);
-            this.panel1.Controls.Add(this.lblStoreStatus);
-            this.panel1.Controls.Add(this.btnOutStore);
-            this.panel1.Controls.Add(this.btnStart);
-            this.panel1.Controls.Add(this.btnInStore);
-            this.panel1.Controls.Add(this.btnStop);
-            this.panel1.Location = new System.Drawing.Point(2, 1);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1176, 50);
-            this.panel1.TabIndex = 258;
-            // 
-            // button1
-            // 
-            this.button1.BackColor = System.Drawing.Color.White;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(1060, 5);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(110, 40);
-            this.button1.TabIndex = 260;
-            this.button1.Text = "退出";
-            this.button1.UseVisualStyleBackColor = false;
-            // 
-            // btnClose
-            // 
-            this.btnClose.BackColor = System.Drawing.Color.White;
-            this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClose.Location = new System.Drawing.Point(1203, 13);
-            this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(110, 40);
-            this.btnClose.TabIndex = 251;
-            this.btnClose.Text = "返回";
-            this.btnClose.UseVisualStyleBackColor = false;
-            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
-            // 
-            // lblName
-            // 
-            this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
-            this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblName.ForeColor = System.Drawing.Color.Black;
-            this.lblName.Location = new System.Drawing.Point(5, 5);
-            this.lblName.Name = "lblName";
-            this.lblName.Size = new System.Drawing.Size(180, 40);
-            this.lblName.TabIndex = 250;
-            this.lblName.Text = "进仓移栽";
-            this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // FrmMoveEquip
             // FrmMoveEquip
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1184, 611);
             this.ClientSize = new System.Drawing.Size(1184, 611);
-            this.Controls.Add(this.panel1);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.MaximizeBox = false;
@@ -979,6 +864,10 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
             this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
             this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
             this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
             this.Shown += new System.EventHandler(this.FrmIOStatus_Shown);
+            this.Controls.SetChildIndex(this.tabControl1, 0);
+            this.Controls.SetChildIndex(this.panBase, 0);
+            this.panBase.ResumeLayout(false);
+            this.panBase.PerformLayout();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.groupBox1.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.ResumeLayout(false);
@@ -993,8 +882,6 @@
             this.groupDetial.PerformLayout();
             this.groupDetial.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox2.PerformLayout();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.ResumeLayout(false);
             this.ResumeLayout(false);
 
 
         }
         }
@@ -1015,12 +902,6 @@
         private System.Windows.Forms.Button BeforeAfterCylinder_Before;
         private System.Windows.Forms.Button BeforeAfterCylinder_Before;
         private System.Windows.Forms.Button TopCylinder_Up;
         private System.Windows.Forms.Button TopCylinder_Up;
         private System.Windows.Forms.Label lblThisSta;
         private System.Windows.Forms.Label lblThisSta;
-        private System.Windows.Forms.Label lblStoreStatus;
-        private System.Windows.Forms.Button btnStart;
-        private System.Windows.Forms.Button btnStop;
-        private System.Windows.Forms.Button btnInStore;
-        private System.Windows.Forms.Button btnOutStore;
-        private System.Windows.Forms.CheckBox chbDebug;
         private System.Windows.Forms.Button StopDown2;
         private System.Windows.Forms.Button StopDown2;
         private System.Windows.Forms.Button StopDown1;
         private System.Windows.Forms.Button StopDown1;
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabControl tabControl1;
@@ -1030,7 +911,6 @@
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label4;
         internal System.Windows.Forms.Button btnP2;
         internal System.Windows.Forms.Button btnP2;
         internal System.Windows.Forms.TextBox txtP2;
         internal System.Windows.Forms.TextBox txtP2;
-        private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.Button btnCloseAll;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.GroupBox groupBox2;
         internal System.Windows.Forms.TextBox txtP1;
         internal System.Windows.Forms.TextBox txtP1;
@@ -1049,7 +929,6 @@
         private System.Windows.Forms.TextBox txtWriteTime;
         private System.Windows.Forms.TextBox txtWriteTime;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label5;
         private AxisMoveControl axisMoveControl1;
         private AxisMoveControl axisMoveControl1;
-        private System.Windows.Forms.Label lblName;
         private System.Windows.Forms.Label lblMoveInfo;
         private System.Windows.Forms.Label lblMoveInfo;
         private System.Windows.Forms.ComboBox cmbDSize;
         private System.Windows.Forms.ComboBox cmbDSize;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label1;
@@ -1061,12 +940,10 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Button btnDSave;
         private System.Windows.Forms.Button btnDSave;
         private System.Windows.Forms.Label lblInoutInfo;
         private System.Windows.Forms.Label lblInoutInfo;
-        private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button ClampCylinder_Work;
         private System.Windows.Forms.Button ClampCylinder_Work;
         private System.Windows.Forms.Button BeforeAfterCylinder_After;
         private System.Windows.Forms.Button BeforeAfterCylinder_After;
         private System.Windows.Forms.Button UpDownCylinder_Down;
         private System.Windows.Forms.Button UpDownCylinder_Down;
         private System.Windows.Forms.Button TopCylinder_Down;
         private System.Windows.Forms.Button TopCylinder_Down;
-        private System.Windows.Forms.Button button1;
     }
     }
 }
 }
 
 

source/AssemblyLineClient/FrmRFIPEdit.Designer.cs

@@ -72,6 +72,7 @@
             // 
             // 
             // txtIP
             // txtIP
             // 
             // 
+            this.txtIP.Enabled = false;
             this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtIP.Location = new System.Drawing.Point(144, 72);
             this.txtIP.Location = new System.Drawing.Point(144, 72);
             this.txtIP.Name = "txtIP";
             this.txtIP.Name = "txtIP";

source/AssemblyLineClient/FrmRFIPEdit.cs

@@ -41,6 +41,16 @@ namespace OnlineStore.AssemblyLine
                 rfMap.Add(key, value);
                 rfMap.Add(key, value);
                 comboxType.Items.Add(key);
                 comboxType.Items.Add(key);
             }
             }
+            foreach (HYEquipBase b in LineManager.Line.HYEquipMap.Values)
+            {
+                string key = b.Name + "-托盘RF";
+                string value = RFIDManager.GetRFIP(b.DeviceID, 1);
+                if (!String.IsNullOrEmpty(value))
+                {
+                    rfMap.Add(key, value);
+                    comboxType.Items.Add(key);
+                }
+            }
             comboxType.SelectedIndex = 0;
             comboxType.SelectedIndex = 0;
             comType.SelectedIndex = 0;
             comType.SelectedIndex = 0;
 
 

source/AssemblyLineClient/useControl/AxisMoveControl.cs

@@ -266,7 +266,11 @@ namespace OnlineStore.AssemblyLine
         }
         }
         private void ReadAxisStatus()
         private void ReadAxisStatus()
         {
         {
-            groupBox2.Text = cmbAxis.Text + "-状态监控";
+            string groupText = cmbAxis.Text + "-状态监控";
+            if (!groupBox2.Equals(groupText))
+            {
+                groupBox2.Text = groupText;
+            }
             //【1】更新轴号
             //【1】更新轴号
             short axisNo = SlvAddr;
             short axisNo = SlvAddr;
             if (axisNo < 0)
             if (axisNo < 0)

source/AssemblyLineClient/useControl/EquipControl.cs

@@ -147,7 +147,6 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
             }
             }
             this.BackColor = equip.GetShowColor(); 
             this.BackColor = equip.GetShowColor(); 
-            //SetItemColor(equip.runStatus, equip.alarmType); 
         }
         }
         public EquipControl()
         public EquipControl()
         {
         {
@@ -155,10 +154,6 @@ namespace OnlineStore.AssemblyLine
         } 
         } 
         private void EquipControl_Load(object sender, EventArgs e)
         private void EquipControl_Load(object sender, EventArgs e)
         { 
         { 
-            //lblName.Text = "";
-            //lblTrayNum.Text = "";
-            //lblStatus.Text =  "";
-            //lblMoveInfo.Text = "";
         }
         }
 
 
         public static EquipControl NewControl(EquipBase equip)
         public static EquipControl NewControl(EquipBase equip)

source/Common/Setting_Init.cs

@@ -99,5 +99,7 @@ namespace OnlineStore.Common
         public static string SaveErrorImageToFile = "SaveErrorImageToFile";
         public static string SaveErrorImageToFile = "SaveErrorImageToFile";
 
 
         public static string UseHCBoard = "UseHCBoard";
         public static string UseHCBoard = "UseHCBoard";
+
+        public static string ConfigPath_TrayList = "ConfigPath_TrayList";
     }
     }
 }
 }

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary
 {
 {
     public abstract class EquipBase : KTK_Store
     public abstract class EquipBase : KTK_Store
     {
     {
+        public bool MoveStop = false;
 
 
 
 
         public LineMoveInfo SecondMoveInfo = null;
         public LineMoveInfo SecondMoveInfo = null;
@@ -64,7 +65,6 @@ namespace OnlineStore.DeviceLibrary
         {
         {
 
 
         }
         }
-        public bool MoveStop = false;
      
      
 
 
         private DateTime lastProTimer = DateTime.Now;
         private DateTime lastProTimer = DateTime.Now;
@@ -162,6 +162,12 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error(Name + " BusyMoveProcess 出错：" + ex.ToString());
                 LogUtil.error(Name + " BusyMoveProcess 出错：" + ex.ToString());
             }
             }
         }
         }
+        protected void MoveTimeOut(string msg)
+        {
+            WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待移栽机构开始抓料超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+            LogUtil.error(WarnMsg, DeviceID * 1000 + 30);
+            Alarm(LineAlarmType.IoSingleTimeOut);
+        }
         protected void ClearTimeoutAlarm(string msg)
         protected void ClearTimeoutAlarm(string msg)
         {
         {
             if (isInSuddenDown || isNoAirCheck)
             if (isInSuddenDown || isNoAirCheck)

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -292,24 +292,18 @@ namespace OnlineStore.DeviceLibrary
 
 
         internal override void StopMove()
         internal override void StopMove()
         {
         {
+            MoveInfo.EndMove();
+            SecondMoveInfo.EndMove();
             //StopMove时设置状态为none
             //StopMove时设置状态为none
             AgvClient.SetStatus(Config.AgvInName,"",ClientAction.None,ClientLevel.Low,true);
             AgvClient.SetStatus(Config.AgvInName,"",ClientAction.None,ClientLevel.Low,true);
             AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.Low, true);
             AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.Low, true);
-            //MoveInfo.EndMove();
-            //SecondMoveInfo.EndMove();
+
             BatchAxisStopCheck();
             BatchAxisStopCheck();
             BatchAxis.SuddenStop();
             BatchAxis.SuddenStop();
             UpdownAxis.SuddenStop();
             UpdownAxis.SuddenStop();
 
 
             CloseAxis(BatchAxis);
             CloseAxis(BatchAxis);
             CloseAxis(UpdownAxis); 
             CloseAxis(UpdownAxis); 
-            //if (Config.SidesWayNum <= 0)
-            //{
-            //    CheckAndMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
-            //    CheckAndMove(IO_Type.FL_StopCylinder_Down2, IO_VALUE.LOW);
-            //    CheckAndMove(IO_Type.FL_TopCylinder_Down, IO_VALUE.LOW);
-            //    CheckAndMove(IO_Type.FL_TopCylinder_Up, IO_VALUE.LOW);
-            //}
             CheckAndMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
@@ -330,8 +324,7 @@ namespace OnlineStore.DeviceLibrary
                 mainTimer.Enabled = false;
                 mainTimer.Enabled = false;
             }
             }
             StopMove();
             StopMove();
-            MoveInfo.EndMove();
-            SecondMoveInfo.EndMove(); 
+           
             AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.Low, true);
             AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.Low, true);
             AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.Low, true);
             AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.Low, true);
         }
         }
@@ -384,7 +377,7 @@ namespace OnlineStore.DeviceLibrary
             BusyMoveProcess();
             BusyMoveProcess();
             IOTimeOutProcess();
             IOTimeOutProcess();
             //判断流水线打开了才可以运行 
             //判断流水线打开了才可以运行 
-            if (MoveInfo.MoveType.Equals(LineMoveType.None) && NoErrorAlarm())
+            if (MoveInfo.MoveType.Equals(LineMoveType.None) && NoErrorAlarm() && (!MoveStop))
             {
             {
                 if (Config.IsCanOut.Equals(0))
                 if (Config.IsCanOut.Equals(0))
                 {
                 {
@@ -395,17 +388,7 @@ namespace OnlineStore.DeviceLibrary
                     StartOutStoreP();
                     StartOutStoreP();
                 }
                 }
             }
             }
-            //if (SecondMoveInfo.MoveType.Equals(LineMoveType.None) && NoErrorAlarm())
-            //{
-            //    if (Config.IsCanOut.Equals(0))
-            //    {
-            //        CheckFixture();
-            //    }
-            //    else if (LineManager.Line.runStatus <= LineRunStatus.Wait)
-            //    {
-            //        CheckFixture();
-            //    }
-            //}
+          
             if (NoErrorAlarm())
             if (NoErrorAlarm())
             {
             {
                 if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.HIGH))
                 if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.HIGH))

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -319,6 +319,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (ScanCodeTask == null || ScanCodeTask.IsCompleted)
                 if (ScanCodeTask == null || ScanCodeTask.IsCompleted)
                 {
                 {
+                    ClearTimeoutAlarm("扫码执行结束超时");
                     MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
                     MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
                     InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
                     InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
                     CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
                     CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
@@ -509,6 +510,7 @@ namespace OnlineStore.DeviceLibrary
                         InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点，不等待结果");
                         InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点，不等待结果");
                         BatchAxisToP3(false, false);
                         BatchAxisToP3(false, false);
                     }
                     }
+                    ClearTimeoutAlarm("等待空托盘到达超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut(180))
                 else if (MoveInfo.IsTimeOut(180))
                 {
                 {

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -711,6 +711,7 @@ namespace OnlineStore.DeviceLibrary
                             MoveEndS();
                             MoveEndS();
                         }
                         }
                     }
                     }
+                    ClearTimeoutAlarm("等待给服务器发送afterPut完成超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 else if (MoveInfo.IsTimeOut(60))
                 {
                 {

source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs

@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// <summary>
         /// 当前设备对应的横移出口的设备ID
         /// 当前设备对应的横移出口的设备ID
         /// </summary>
         /// </summary>
-        private int HyOutDeviceId = 0;
+        protected int HyOutDeviceId = 0;
         /// <summary>
         /// <summary>
         /// 当前设备对应的横移入口的设备ID
         /// 当前设备对应的横移入口的设备ID
         /// </summary>
         /// </summary>

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -372,16 +372,17 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY11_TopUpToHY))
             else if (MoveInfo.IsStep(LineMoveStep.HY11_TopUpToHY))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.HY12_WaitHY2Free);
                 MoveInfo.NextMoveStep(LineMoveStep.HY12_WaitHY2Free);
-                CheckLog("托盘横移" + MoveInfo.SLog + "  ，等待HY2空闲，可以开始横移 ");
+                CheckLog("托盘横移" + MoveInfo.SLog + "  ，等待HY" + HyOutDeviceId + " 空闲，可以开始横移 ");
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
             else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
             {
             {
                 if (GetHyOutEquip().MoveInfo.MoveType.Equals(LineMoveType.None))
                 if (GetHyOutEquip().MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
                     MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
-                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待HY2准备完成(顶升上升，定位下降) ");
+                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待HY" + HyOutDeviceId + " 准备完成(顶升上升，定位下降) ");
                     GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
                     GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
                     GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
                     GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
+                    ClearTimeoutAlarm("等待横移出口可以横移超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -400,6 +401,7 @@ namespace OnlineStore.DeviceLibrary
                     LineRun(MoveInfo);
                     LineRun(MoveInfo);
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
 
 
+                    ClearTimeoutAlarm("等待横移出口顶升上升完成超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -412,7 +414,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY14_HYLineRun))
             else if (MoveInfo.IsStep(LineMoveStep.HY14_HYLineRun))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.HY15_WaitOutCheck);
                 MoveInfo.NextMoveStep(LineMoveStep.HY15_WaitOutCheck);
-                CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY2 ");
+                CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY" + HyOutDeviceId + " ");
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
             else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
             {
             {
@@ -420,7 +422,8 @@ namespace OnlineStore.DeviceLibrary
                 if (result)
                 if (result)
                 {
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
                     MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
-                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY2持续一段时间 ");
+                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY" + HyOutDeviceId + "持续一段时间 ");
+                    ClearTimeoutAlarm("等待托盘到达横移出口超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -440,6 +443,7 @@ namespace OnlineStore.DeviceLibrary
                     CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                     CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                     HY_StopCylinderUp(MoveInfo);
                     HY_StopCylinderUp(MoveInfo);
                     OL_StopCylinderUp(MoveInfo);
                     OL_StopCylinderUp(MoveInfo);
+                    ClearTimeoutAlarm("等待托盘到达横移出口");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -702,21 +706,113 @@ namespace OnlineStore.DeviceLibrary
                             MoveInfo.MoveParam = inoup;
                             MoveInfo.MoveParam = inoup;
                             return true ;
                             return true ;
                         }
                         }
+                        else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel && this.DeviceID.Equals(216))
+                        {
+                            //紧急料到NG箱
+                            LogInfo(" 托盘需要横移到出料线：紧急出料" + "" + inoup.ToStr());
+                            MoveInfo.MoveParam = inoup;
+                            return true;
+                        }
                         else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
                         else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
                         { 
                         { 
+
                             LogInfo(" 托盘需要横移到出料线：工单出库料" + "" + inoup.ToStr());
                             LogInfo(" 托盘需要横移到出料线：工单出库料" + "" + inoup.ToStr());
+                            List<int> mustLine = new List<int>();
+                            List<int> firstLine = new List<int>();
+                            //urgentReel: true 表示紧急料,需要出到料串上
+                            //cutReel: true 表示分盘料,需要出到料串上
+                            //smallReel: true  小料(7x8),放置到小料架上
+                            //rfid: 分配的料架RFID
+                            //rfidLoc:
+                            //是否是小盘
+                            if (inoup.rfidLoc <= 0)
+                            {
+                                //-1时随意放
+                            }
+                            else if (inoup.smallReel)
+                            {
+                                if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72)
+                                {
+                                    // 70,71,72时只能分配到3 / 4号皮带线; 
+                                    mustLine = new List<int> { 213, 216 };
+                                }
+                                else if (inoup.rfidLoc <= 46)
+                                {
+                                    // 小料时,架位为1 - 46优先走1 / 2号皮带线
+                                    firstLine = new List<int> { 204, 206 };
+                                }
+                                else if (inoup.rfidLoc >= 47)
+                                {
+                                    // ,47 - 92优先走3 / 4号皮带线,
+                                    firstLine = new List<int> { 213, 216 };
+                                }
+                            }
+                            else
+                            {
+                                //大料12号只能走1号2后皮带线
+                                // 料架的架位大料时,架位1 - 6，12号优先走1 / 2号皮带线, 
+                                //7 - 11优先走3 / 4号皮带线
+                                if (inoup.rfidLoc.Equals(12))
+                                {
+                                    // 大料12号只能走1号2后皮带线
+                                    mustLine = new List<int> { 204, 206 };
+                                }
+                                else if (inoup.rfidLoc <= 6)
+                                {
+                                    firstLine = new List<int> { 204, 206 };
+                                }
+                                else if (inoup.rfidLoc >= 7)
+                                {
+                                    firstLine = new List<int> { 213, 216 };
+                                }
+                            }
+                            
+                            if (mustLine.Count > 0)
+                            {
+                                if (mustLine.Contains(DeviceID))
+                                {
+                                    LogInfo(" 托盘需要横移到出料线：工单出料，必须线" + "" + inoup.ToStr());
+                                    MoveInfo.MoveParam = inoup;
+                                    return true;
+                                }
+                            }
+                            else if (firstLine.Count > 0)
+                            {
+                                if (firstLine.Contains(DeviceID)  )
+                                {
+                                    LogInfo(" 托盘需要横移到出料线：工单出料，优先线" + "" + inoup.ToStr());
+                                    MoveInfo.MoveParam = inoup;
+                                    return true;
+                                }
+                                else
+                                {
+                                    TimeSpan span = DateTime.Now - trayInfo.LastUpdateTime;
+                                    if (span.TotalSeconds > 300)
+                                    {
+                                        LogInfo(" 托盘需要横移到出料线：工单出料，超时五分钟" + "" + inoup.ToStr());
+                                        MoveInfo.MoveParam = inoup;
+                                        return true;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                LogInfo(" 托盘需要横移到出料线：工单出料，随意放" + "" + inoup.ToStr());
                                 MoveInfo.MoveParam = inoup;
                                 MoveInfo.MoveParam = inoup;
                                 return true;
                                 return true;
                             }
                             }
                         }
                         }
                     }
                     }
                 }
                 }
+            }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 LogUtil.error(Name+"TrayNeedToOutLine 出错：" + ex.ToString());
                 LogUtil.error(Name+"TrayNeedToOutLine 出错：" + ex.ToString());
             }
             }
             return false;
             return false;
         }
         }
+
+         
         #region 阻挡气缸处理
         #region 阻挡气缸处理
 
 
         private void HY_StopCylinderUp(LineMoveInfo moveinfo = null)
         private void HY_StopCylinderUp(LineMoveInfo moveinfo = null)

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -198,7 +198,7 @@ namespace OnlineStore.DeviceLibrary
                                     LogInfo("检测托盘，" + MoveInfo.SLog + "  ，阻挡上升");
                                     LogInfo("检测托盘，" + MoveInfo.SLog + "  ，阻挡上升");
                                     UpdateTrayNum();
                                     UpdateTrayNum();
                                     IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
                                     IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
-                                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW));
+                                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopDown, IO_VALUE.LOW));
                                     IOMove(IO_Type.HY_StopDown, IO_VALUE.LOW);
                                     IOMove(IO_Type.HY_StopDown, IO_VALUE.LOW);
                                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
                                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
                                 }
                                 }
@@ -228,9 +228,9 @@ namespace OnlineStore.DeviceLibrary
                                     MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
                                     MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
                                     LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID");
                                     LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘检测，前阻挡下降，清理托盘RFID");
                                     ClearTrayRFID();
                                     ClearTrayRFID();
-                                    IOMove(IO_Type.HY_FrontStopCheck, IO_VALUE.HIGH, 1200);
+                                    IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
                                     MoveInfo.OneWaitCanEndStep = true;
                                     MoveInfo.OneWaitCanEndStep = true;
-                                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopCheck, IO_VALUE.LOW));
+                                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_FrontStopDown, IO_VALUE.LOW));
                                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
                                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
                                 }
                                 }
                             }
                             }
@@ -327,16 +327,17 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY11_TopUpToHY))
             else if (MoveInfo.IsStep(LineMoveStep.HY11_TopUpToHY))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.HY12_WaitHY2Free);
                 MoveInfo.NextMoveStep(LineMoveStep.HY12_WaitHY2Free);
-                CheckLog("托盘横移" + MoveInfo.SLog + "  ，等待HY2空闲，可以开始横移 ");
+                CheckLog("托盘横移" + MoveInfo.SLog + "  ，等待HY"+ HyOutDeviceId + "空闲，可以开始横移 ");
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
             else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
             {
             {
                 if (GetHyOutEquip().MoveInfo.MoveType.Equals(LineMoveType.None))
                 if (GetHyOutEquip().MoveInfo.MoveType.Equals(LineMoveType.None))
                 { 
                 { 
                     MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
                     MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
-                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待HY2准备完成(顶升上升，定位下降) ");
+                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待HY"+ HyOutDeviceId + "准备完成(顶升上升，定位下降) ");
                     GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
                     GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
                     GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
                     GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
+                    ClearTimeoutAlarm("等待横移出口可以横移超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -354,7 +355,7 @@ namespace OnlineStore.DeviceLibrary
                     CheckLog("托盘横移" + MoveInfo.SLog + "   ，横移电机转动 ");
                     CheckLog("托盘横移" + MoveInfo.SLog + "   ，横移电机转动 ");
                     LineRun(MoveInfo); 
                     LineRun(MoveInfo); 
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
-
+                    ClearTimeoutAlarm("等待横移出口顶升上升完成超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -367,7 +368,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.HY14_HYLineRun))
             else if (MoveInfo.IsStep(LineMoveStep.HY14_HYLineRun))
             { 
             { 
                 MoveInfo.NextMoveStep(LineMoveStep.HY15_WaitOutCheck);
                 MoveInfo.NextMoveStep(LineMoveStep.HY15_WaitOutCheck);
-                CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY2 "); 
+                CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY"+HyOutDeviceId+" "); 
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
             else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
             {
             {
@@ -375,7 +376,8 @@ namespace OnlineStore.DeviceLibrary
                 if (result)
                 if (result)
                 {
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
                     MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
-                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY2持续一段时间 ");
+                    CheckLog("托盘横移" + MoveInfo.SLog + "   ，等待托盘到达HY" + HyOutDeviceId + " 持续一段时间 ");
+                    ClearTimeoutAlarm("等待托盘到达横移出口超时");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {
@@ -394,6 +396,7 @@ namespace OnlineStore.DeviceLibrary
                     LineStop(MoveInfo);
                     LineStop(MoveInfo);
                     CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                     CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                     LocationCylinderDown(MoveInfo);
                     LocationCylinderDown(MoveInfo);
+                    ClearTimeoutAlarm("等待托盘到达横移出口");
                 }
                 }
                 else if (MoveInfo.IsTimeOut())
                 else if (MoveInfo.IsTimeOut())
                 {
                 {

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -156,15 +156,19 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 //读取托盘号
                 //读取托盘号
                 UpdateTrayNum();
                 UpdateTrayNum();
-                if (ReedNeedMove())
+                if (ReelNeedMove())
                 {
                 {
                     JHY_06_GetTraySize();
                     JHY_06_GetTraySize();
-
+                }
+                else if (ReelNeedToNG())
+                {
+                    SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_07_TopUp);
+                    CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：需要移到NG箱，顶升气缸上升");
+                    CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
                 }
                 }
                 else
                 else
                 {
                 {
                     JHY_11_TopDown();
                     JHY_11_TopDown();
-
                 }
                 }
             }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_07_TopUp))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_07_TopUp))
@@ -181,9 +185,9 @@ namespace OnlineStore.DeviceLibrary
                     bool result = StartOutStoreMove(SecondMoveInfo.MoveParam);
                     bool result = StartOutStoreMove(SecondMoveInfo.MoveParam);
                     if (result)
                     if (result)
                     {
                     {
-                        ClearTimeoutAlarm("等待移栽机构空闲超时");
                         SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_09_WaitProcessReel);
                         SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_09_WaitProcessReel);
                         CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：等待拿走料盘" + MoveInfo.MoveParam.ToShortStr());
                         CheckLog(" 接驳台托盘" + SecondMoveInfo.SLog + "：等待拿走料盘" + MoveInfo.MoveParam.ToShortStr());
+                        ClearTimeoutAlarm("等待移栽机构开始抓料超时");
 
 
                     }
                     }
                     else if (SecondMoveInfo.IsTimeOut())
                     else if (SecondMoveInfo.IsTimeOut())
@@ -203,7 +207,7 @@ namespace OnlineStore.DeviceLibrary
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_10_ReelProEnd))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_10_ReelProEnd))
             {
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
-                CheckLog(" 接驳台托盘放行" + SecondMoveInfo.SLog + "：阻挡上升，顶升气缸下降，定位气缸下降");
+                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：阻挡上升，顶升气缸下降，定位气缸下降");
                 IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
                 IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
                 LocationCylinderDown(SecondMoveInfo);
                 LocationCylinderDown(SecondMoveInfo);
                 if (IsNgPro())
                 if (IsNgPro())
@@ -218,25 +222,25 @@ namespace OnlineStore.DeviceLibrary
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_11_TopDown))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_11_TopDown))
             {
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
-                CheckLog(" 接驳台托盘放行" + SecondMoveInfo.SLog + "：等待托盘检测无信号");
+                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待托盘检测无信号");
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
             }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave))
             {
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_13_TrayLeave);
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_13_TrayLeave);
-                CheckLog(" 接驳台托盘放行" + SecondMoveInfo.SLog + "：等待500ms,托盘检测无信号");
+                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：等待500ms,托盘检测无信号");
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
             }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
             {
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
-                CheckLog(" 接驳台托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降");
+                CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升气缸下降");
                 CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
                 CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
             }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_14_TopDown))
             {
             {
-                CheckLog(" 接驳台托盘放行结束");
+                CheckLog(" 托盘放行结束");
                 SecondMoveInfo.EndMove();
                 SecondMoveInfo.EndMove();
             }
             }
             else
             else
@@ -249,7 +253,7 @@ namespace OnlineStore.DeviceLibrary
         private void JHY_11_TopDown()
         private void JHY_11_TopDown()
         {
         {
             SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
             SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_11_TopDown);
-            CheckLog(" 接驳台托盘放行" + SecondMoveInfo.SLog + "：阻挡上升，顶升气缸下降");
+            CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：阻挡上升，顶升气缸下降");
             IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
             IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
             if (IsNgPro())
             if (IsNgPro())
             {
             {
@@ -265,7 +269,7 @@ namespace OnlineStore.DeviceLibrary
         private void JHY_06_GetTraySize()
         private void JHY_06_GetTraySize()
         {
         {
             SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_06_GetTraySize);
             SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_06_GetTraySize);
-            SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
+            SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(8000));
             LastWidth = 0;
             LastWidth = 0;
             int robotIndex = GetRobotIndex();
             int robotIndex = GetRobotIndex();
             string code = SecondMoveInfo.MoveParam.WareCode;
             string code = SecondMoveInfo.MoveParam.WareCode;
@@ -286,11 +290,50 @@ namespace OnlineStore.DeviceLibrary
         private void JHY_10_ReelProEnd()
         private void JHY_10_ReelProEnd()
         {
         {
             SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_10_ReelProEnd);
             SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_10_ReelProEnd);
-            LogUtil.info(Name + " 接驳台托盘" + SecondMoveInfo.SLog + "：托盘已离开，更新托盘[" + currTrayNum + "]为空");
+            LogUtil.info(Name + " 接驳台托盘" + SecondMoveInfo.SLog + "：料盘已移走，更新托盘[" + currTrayNum + "]为空");
             TrayManager.UpdateTrayInfo(currTrayNum);
             TrayManager.UpdateTrayInfo(currTrayNum);
         }
         }
 
 
-        private bool ReedNeedMove()
+        /// <summary>
+        /// 判断料盘是否需要移到接驳台
+        /// </summary>
+        /// <returns></returns>
+        private bool ReelNeedMove()
+        {
+            try
+            {
+                if (currTrayNum > 0)
+                {
+                    //TODO   
+                    TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum);
+                    if (!trayInfo.IsFull)
+                    {
+                        return false;
+                    }
+                    InOutParam inoup = trayInfo.InoutPar;
+                    if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
+                    {
+                        LogInfo(" 料盘需要横移到出料线：工单出库料" + "" + inoup.ToStr());
+                        SecondMoveInfo.MoveParam = inoup;
+                        MoveInfo.MoveParam = inoup;
+                        return true;
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error(Name + "ReedNeedMove 出错：" + ex.ToString());
+            }
+            return false;
+        }
+
+
+        /// <summary>
+        /// 判断料盘是否需要移到NG箱
+        /// </summary>
+        /// <returns></returns>
+        private bool ReelNeedToNG()
         {
         {
             try
             try
             {
             {
@@ -305,7 +348,7 @@ namespace OnlineStore.DeviceLibrary
                     InOutParam inoup = trayInfo.InoutPar;
                     InOutParam inoup = trayInfo.InoutPar;
                     if (trayInfo.IsFull && trayInfo.InoutPar.InStoreNg && this.DeviceID.Equals(217))
                     if (trayInfo.IsFull && trayInfo.InoutPar.InStoreNg && this.DeviceID.Equals(217))
                     {
                     {
-                        LogInfo(" 托盘需要移栽到NG箱：入料NG料" + "" + inoup.ToStr());
+                        LogInfo(" 料盘需要移栽到NG箱：入料NG料" + "" + inoup.ToStr());
                         //如果分配了库位，需要调用取消
                         //如果分配了库位，需要调用取消
                         if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
                         if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
                         {
                         {
@@ -315,9 +358,9 @@ namespace OnlineStore.DeviceLibrary
                         MoveInfo.MoveParam = inoup;
                         MoveInfo.MoveParam = inoup;
                         return true;
                         return true;
                     }
                     }
-                    else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
+                    else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && this.DeviceID.Equals(217))
                     {
                     {
-                        LogInfo(" 托盘需要横移到出料线：工单出库料" + "" + inoup.ToStr());
+                        LogInfo(" 料盘需要移栽到NG箱：紧急料" + "" + inoup.ToStr());
                         SecondMoveInfo.MoveParam = inoup;
                         SecondMoveInfo.MoveParam = inoup;
                         MoveInfo.MoveParam = inoup;
                         MoveInfo.MoveParam = inoup;
                         return true;
                         return true;
@@ -331,8 +374,6 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
-
-
         #endregion
         #endregion
 
 
 
 
@@ -370,6 +411,10 @@ namespace OnlineStore.DeviceLibrary
             }
             }
         }
         }
         string logName = "";
         string logName = "";
+        /// <summary>
+        /// 紧急料，afterPut是否发送完成
+        /// </summary>
+        private bool afterPutCutOK = false;
         protected override void OutStoreProcess()
         protected override void OutStoreProcess()
         {
         {
 
 
@@ -448,6 +493,27 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.JM_13_ClampRelax);
                 MoveInfo.NextMoveStep(LineMoveStep.JM_13_ClampRelax);
                 OutLog(logName + MoveInfo.SLog + "：夹料气缸放松 ");
                 OutLog(logName + MoveInfo.SLog + "：夹料气缸放松 ");
                 CylinderMove(MoveInfo, IO_Type.HY_ClampCylinder_Work, IO_Type.HY_ClampCylinder_Relax);
                 CylinderMove(MoveInfo, IO_Type.HY_ClampCylinder_Work, IO_Type.HY_ClampCylinder_Relax);
+
+                if (MoveInfo.MoveParam.urgentReel)
+                {
+                    afterPutCutOK = false;
+
+                    OutLog("紧急出料：" + MoveInfo.SLog + "，料盘已放入NG箱，发送 afterPutCut");
+                    TaskData taskData;
+                    string shefId = "BN";
+                    int ShelfLoc = 1;
+                    string msg = SServerManager.afterPutCut(Name, shefId, MoveInfo.MoveParam.WareCode, "", ShelfLoc, out taskData);
+                    if (String.IsNullOrEmpty(msg).Equals(false))
+                    {
+                        LogUtil.error(Name + "【" + MoveInfo.MoveParam.WareCode + "】【" + shefId + "】【" + ShelfLoc.ToString() + "】afterPutCut 结果：" + msg);
+                        taskData = null;
+                    }
+                    afterPutCutOK = true;
+                }
+                else
+                {
+                    afterPutCutOK = true;
+                }
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_13_ClampRelax))
             else if (MoveInfo.IsStep(LineMoveStep.JM_13_ClampRelax))
             {
             {
@@ -470,7 +536,7 @@ namespace OnlineStore.DeviceLibrary
                 CylinderMove(null, IO_Type.HY_MoveCylinder_Give, IO_Type.HY_MoveCylinder_Take);
                 CylinderMove(null, IO_Type.HY_MoveCylinder_Give, IO_Type.HY_MoveCylinder_Take);
                 string code = MoveInfo.MoveParam.WareCode;
                 string code = MoveInfo.MoveParam.WareCode;
                 int robotIndex = GetRobotIndex();
                 int robotIndex = GetRobotIndex();
-                LogUtil.info(Name + MoveInfo.SLog + logName+ "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + code + "]");
+                LogUtil.info(Name + MoveInfo.SLog + logName + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + code + "]");
                 string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
                 string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
                 MoveInfo.EndMove();
                 MoveInfo.EndMove();
             }
             }
@@ -482,9 +548,20 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_17_CylinderTake))
             else if (MoveInfo.IsStep(LineMoveStep.JM_17_CylinderTake))
             {
             {
+                if (afterPutCutOK)
+                {
+                    ClearTimeoutAlarm("给服务器发送afterPutCutTask完成");
                     MoveInfo.EndMove();
                     MoveInfo.EndMove();
                     OutLog(logName + MoveInfo.SLog + "：结束 ");
                     OutLog(logName + MoveInfo.SLog + "：结束 ");
                 }
                 }
+                else if (MoveInfo.IsTimeOut(60))
+                {
+                    WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]等待 给服务器发送afterPutCutTask完成 " + "超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+                    LogUtil.error(WarnMsg, DeviceID * 1000 + 20);
+                    Alarm(LineAlarmType.IoSingleTimeOut);
+                }
+            }
+
 
 
 
 
         }
         }

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -190,21 +190,6 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 LogUtil.error(checkWaitInfo.Name + " [" + checkWaitInfo.MoveStep + "] CheckWait 出错：", ex);
                 LogUtil.error(checkWaitInfo.Name + " [" + checkWaitInfo.MoveStep + "] CheckWait 出错：", ex);
 
 
-                //如果是空指针异常，并且MoveStep=SW06_TopCylinderUp，单独处理
-                //                [2020-08-10 13:32:45,352] [132] ERROR 横移轨道-41 [SW06_TopCylinderUp]
-                //        CheckWait 出错：
-                //System.IndexOutOfRangeException: 索引超出了数组界限。
-                //   在 System.Collections.Generic.List`1.Enumerator.MoveNext()
-                //   在 OnlineStore.DeviceLibrary.LineBean.CheckWait(LineMoveInfo checkWaitInfo) 位置 E:\VSSource\RC1250_佳士达\RC1250-AssemblyLine\source\DeviceLibrary\assemblyLine\LineBean_Partial.cs:行号 89
-                //if (ex is System.IndexOutOfRangeException)
-                //{
-                //    if (checkWaitInfo.IsStep(LineMoveStep.SW06_TopCylinderUp))
-                //    {
-                //        LogUtil.error(checkWaitInfo.Name + " 当前步骤：SW06_TopCylinderUp，IndexOutOfRangeException异常，自动回到上一个步骤 SW05_LocationDown,等待500 重新开始 ");
-                //        checkWaitInfo.NextMoveStep(LineMoveStep.SW05_LocationDown);
-                //        checkWaitInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
-                //    }
-                //}
             }
             }
         }
         }
         #endregion
         #endregion

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -215,6 +215,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             if (SecondMoveInfo.IsStep(LineMoveStep.MO_11_CodeRember) && !SecondMoveInfo.IsInWait)
             if (SecondMoveInfo.IsStep(LineMoveStep.MO_11_CodeRember) && !SecondMoveInfo.IsInWait)
             {
             {
+                ClearTimeoutAlarm("等待空托盘到达超时");
                 return true;
                 return true;
             }
             }
             else if (MoveInfo.IsTimeOut(180))
             else if (MoveInfo.IsTimeOut(180))
@@ -911,20 +912,20 @@ namespace OnlineStore.DeviceLibrary
         private void MO_16_Stop2Down()
         private void MO_16_Stop2Down()
         {
         {
             //if (LineManager.Line.Move9CanStop2Down(DeviceID,currTrayNum))
             //if (LineManager.Line.Move9CanStop2Down(DeviceID,currTrayNum))
-            if (true)
-            {
+            //if (true)
+            //{
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
                 CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
                 CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
                 IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
                 IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
 
 
-            }
-            else if (SecondMoveInfo.IsTimeOut(120))
-            {
-                WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待分流横移1空闲[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
-                LogUtil.error(WarnMsg, DeviceID * 1000 + 12);
-                Alarm(LineAlarmType.IoSingleTimeOut);
-            }
+            //}
+            //else if (SecondMoveInfo.IsTimeOut(120))
+            //{
+            //    WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待分流横移1空闲[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+            //    LogUtil.error(WarnMsg, DeviceID * 1000 + 12);
+            //    Alarm(LineAlarmType.IoSingleTimeOut);
+            //}
         }
         }
 
 
         #endregion
         #endregion

source/DeviceLibrary/assemblymanager/TrayManager.cs

@@ -5,9 +5,11 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading;
 using System.Threading;
+using System.Windows.Forms;
 
 
 namespace OnlineStore.DeviceLibrary
 namespace OnlineStore.DeviceLibrary
 {
 {
@@ -39,11 +41,6 @@ namespace OnlineStore.DeviceLibrary
             return new List<TrayInfo>(TrayInfoMap.Values);
             return new List<TrayInfo>(TrayInfoMap.Values);
         }
         }
          
          
-        /// <summary>
-        /// 对应的盘号（1-6）是否有料盘
-        /// </summary>
-        /// <param name="trayNum">盘号1-6</param>
-        /// <returns>盘上是否有料盘</returns>
         internal static bool TrayIsFull(int trayNum)
         internal static bool TrayIsFull(int trayNum)
         {
         {
             if (TrayInfoMap.ContainsKey(trayNum))
             if (TrayInfoMap.ContainsKey(trayNum))
@@ -91,9 +88,10 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else
             else
             {
             {
-                TrayInfo fixture = new TrayInfo(trayNum, isFull, inOrOut, param,ngMsg); 
+                TrayInfo fixture = new TrayInfo(trayNum, isFull, inOrOut, param, ngMsg);
                 TrayInfoMap.TryAdd(trayNum, fixture);
                 TrayInfoMap.TryAdd(trayNum, fixture);
             }
             }
+            SaveMapToFile();
         }
         }
 
 
         public static void UpdateInStoreNG(int trayNum, bool isNg, string msg)
         public static void UpdateInStoreNG(int trayNum, bool isNg, string msg)
@@ -104,6 +102,8 @@ namespace OnlineStore.DeviceLibrary
                 TrayInfoMap[trayNum].InoutPar.InStoreNg = isNg;
                 TrayInfoMap[trayNum].InoutPar.InStoreNg = isNg;
                 TrayInfoMap[trayNum].ShowMsg = msg;
                 TrayInfoMap[trayNum].ShowMsg = msg;
                 TrayInfoMap[trayNum].LastUpdateTime = DateTime.Now;
                 TrayInfoMap[trayNum].LastUpdateTime = DateTime.Now;
+
+                SaveMapToFile();
             }
             }
         }
         }
 
 
@@ -121,20 +121,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
-        /// <summary>
-        /// 是否还有有料仓正在出库的盘
-        /// </summary> 
-        internal static bool IsHasFullOutFixture()
-        {
-            foreach (int key in TrayInfoMap.Keys)
-            {
-                if (TrayInfoMap[key].IsFull && TrayInfoMap[key].InOrOutStore.Equals(2))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
+
         public static bool NeedCheckTray = ConfigAppSettings.GetIntValue(Setting_Init.NeedCheckTray).Equals(1);
         public static bool NeedCheckTray = ConfigAppSettings.GetIntValue(Setting_Init.NeedCheckTray).Equals(1);
         internal static bool CheckIsRightNum(int trayNum, int preTrayNum, bool isCanUpdateMax = true)
         internal static bool CheckIsRightNum(int trayNum, int preTrayNum, bool isCanUpdateMax = true)
         {
         {
@@ -158,10 +145,10 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
-        internal static bool RightTrayCode(int trayNum, int preTrayNum, bool isCanUpdateMax=true)
+        internal static bool RightTrayCode(int trayNum, int preTrayNum, bool isCanUpdateMax = true)
         {
         {
             return true;
             return true;
-            return CheckIsRightNum(trayNum,preTrayNum,isCanUpdateMax);
+            return CheckIsRightNum(trayNum, preTrayNum, isCanUpdateMax);
         }
         }
 
 
         internal static void UpdateTrayNumError(int errorStoreID, string errorMsg)
         internal static void UpdateTrayNumError(int errorStoreID, string errorMsg)
@@ -172,9 +159,60 @@ namespace OnlineStore.DeviceLibrary
 
 
         public static void ClearTrayInfo()
         public static void ClearTrayInfo()
         {
         {
+            LogUtil.info("-------------------点击：清空托盘。清空前打印托盘信息：");
+            List<TrayInfo> tray = TrayManager.getTrayList();
+            foreach (TrayInfo t in tray)
+            {
+                LogUtil.info(t.ToStr());
+            }
+            TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
+            LogUtil.info("-------------------点击：清空托盘。托盘内容已清空");
+        }
+
+
+        private static string FilePath = "";
+        public static void InitFileData()
+        {
             TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
             TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
+            FilePath = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_TrayList);
+            if (File.Exists(FilePath))
+            {
+                LogUtil.info("开始加载文件缓存托盘：" + FilePath);
+                string[] lines = FileEncoding.GetFileLines(FilePath);
+                foreach (string line in lines)
+                {
+                    TrayInfo tray = JsonHelper.DeserializeJsonToObject<TrayInfo>(line);
+                    if (tray != null && tray.TrayNum > 0 && tray.IsFull)
+                    {
+                        LogUtil.info("加载到缓存托盘：" + tray.ToStr());
+                        TrayInfoMap.TryAdd(tray.TrayNum, tray);
+                    }
+                }
+                LogUtil.info("托盘加载完成");
+            }
         }
         }
 
 
+        public static void SaveMapToFile()
+        {
+            try
+            {
+                List<TrayInfo> trayList = new List<TrayInfo>();
+                List<string> lineList = new List<string>();
+                foreach (TrayInfo tray in trayList)
+                {
+                    string line = JsonHelper.SerializeObject(tray);
+                    if (!string.IsNullOrEmpty(line))
+                    {
+                        lineList.Add(line);
+                    }
+                }
+                FileEncoding.WritteFile(FilePath, lineList.ToArray()); 
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error("SaveTrayToFile出错：" + ex.ToString());
+            }
+        }
 
 
     }
     }
 }
 }

source/DeviceLibrary/model/StoreStep.cs

@@ -1327,21 +1327,21 @@ namespace OnlineStore.DeviceLibrary
 
 
 
 
         /// <summary>
         /// <summary>
-        /// 接驳台托盘放行： 阻挡上升，定位气缸下降，顶升气缸下降
+        /// 托盘放行： 阻挡上升，定位气缸下降，顶升气缸下降
         /// </summary>
         /// </summary>
         JHY_11_TopDown =53011, 
         JHY_11_TopDown =53011, 
         /// <summary>
         /// <summary>
-        /// 接驳台托盘放行： 等待托盘检测无信号
+        /// 托盘放行： 等待托盘检测无信号
         /// </summary>
         /// </summary>
         JHY_12_WaitTrayLeave ,
         JHY_12_WaitTrayLeave ,
         /// <summary>
         /// <summary>
-        /// 接驳台托盘放行： 延迟500ms后再次等待托盘无信号
+        /// 托盘放行： 延迟500ms后再次等待托盘无信号
         /// </summary>
         /// </summary>
         JHY_13_TrayLeave,
         JHY_13_TrayLeave,
 
 
 
 
         /// <summary>
         /// <summary>
-        /// 接驳台托盘放行： 阻挡上升，定位气缸下降，顶升气缸下降
+        /// 托盘放行： 阻挡上升，定位气缸下降，顶升气缸下降
         /// </summary>
         /// </summary>
         JHY_14_TopDown  ,
         JHY_14_TopDown  ,
 
 

source/DeviceLibrary/model/TrayInfo.cs

@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary
     { 
     { 
         public TrayInfo(int trayNum, bool isFull, int inOrOut = 0, InOutParam inoutParam = null,string ngMsg = "")
         public TrayInfo(int trayNum, bool isFull, int inOrOut = 0, InOutParam inoutParam = null,string ngMsg = "")
         {
         {
-            this.TrayCode = trayNum;
+            this.TrayNum = trayNum;
             this.IsFull = isFull;
             this.IsFull = isFull;
             this.InOrOutStore = inOrOut; 
             this.InOrOutStore = inOrOut; 
             if (inoutParam == null)
             if (inoutParam == null)
@@ -47,12 +47,12 @@ namespace OnlineStore.DeviceLibrary
 
 
             //return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type + 
             //return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type + 
             //    "]二维码[" + WareCode + "]库位号[" + PosId + "] [" + PlateW + "X" + PlateH+ "]  " + err + "  "+ jinji + "" ;
             //    "]二维码[" + WareCode + "]库位号[" + PosId + "] [" + PlateW + "X" + PlateH+ "]  " + err + "  "+ jinji + "" ;
-            return "托盘 [" + TrayCode + "] [" + LastUpdateTime.ToLongTimeString() + "] [" + (IsFull ? "有料" : "空") + "] [" + type + "]";
+            return "托盘 [" + TrayNum + "] [" + LastUpdateTime.ToLongTimeString() + "] [" + (IsFull ? "有料" : "空") + "] [" + type + "]";
         }
         }
         /// <summary>
         /// <summary>
         /// 夹具编码值（1-32?）
         /// 夹具编码值（1-32?）
         /// </summary>
         /// </summary>
-        public int TrayCode = -1;
+        public int TrayNum = -1;
         /// <summary>
         /// <summary>
         /// 是否有料盘，true=有料盘
         /// 是否有料盘，true=有料盘
         /// </summary>
         /// </summary>
@@ -75,7 +75,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     inoutPar = new InOutParam();
                     inoutPar = new InOutParam();
                 }
                 }
-                inoutPar.TrayNumber = TrayCode; 
+                inoutPar.TrayNumber = TrayNum; 
                 return inoutPar;
                 return inoutPar;
             }
             }
             set
             set

source/LoadCVSLibrary/FileEncoding.cs

-using System;
+using OnlineStore.Common;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.IO;
 using System.IO;
 using System.Linq;
 using System.Linq;
@@ -8,6 +9,51 @@ namespace OnlineStore.LoadCSVLibrary
 {
 {
     public class FileEncoding
     public class FileEncoding
     {
     {
+        public  static bool WritteFile(string filePath, string[] lines)
+        {
+            try
+            {
+                //备份保存
+                try
+                {
+                    if (File.Exists(filePath))
+                    {
+                        FileInfo file = new FileInfo(filePath);
+                        string date = DateTime.Now.ToString("yyyy-MM-dd");
+                        string targetBackPath = @"C:\configBack\" + date + @"\";
+                        if (!Directory.Exists(targetBackPath))
+                        {
+                            Directory.CreateDirectory(targetBackPath);
+                        }
+                        string fileName = file.Name;
+                        string backFile = targetBackPath + fileName;
+                        if (File.Exists(backFile))
+                        {
+                            File.Delete(backFile);
+                        }
+                        File.Copy(filePath, backFile, true);
+                    }
+                }
+                catch (Exception e)
+                {
+                    LogUtil.error(" WritteFile备份文件 filePath 出错：", e);
+                }
+
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
+                File.WriteAllLines(filePath, lines, Encoding.UTF8);
+
+
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error(ex.ToString());
+                return false;
+            }
+            return true;
+        }
         public static string[] GetFileLines(string filePath)
         public static string[] GetFileLines(string filePath)
         {
         {
             if (!File.Exists(filePath))
             if (!File.Exists(filePath))