门禁打开时停止运动，需要手动恢复

张东亮
Commit fbaeecb9 由 张东亮 编写于 2023-01-07 21:14:18 +0800
source/DeviceLibrary/manager/StoreManager.cs
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
source/XLRStoreClient/boxForm/FrmBoxEquip.resx
source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
--- a/source/DeviceLibrary/manager/StoreManager.cs
查看文件 @fbaeecb
+++ b/source/DeviceLibrary/manager/StoreManager.cs
查看文件 @fbaeecb
@@ -19,7 +19,13 @@ namespace OnlineStore.DeviceLibrary
        public static bool TrayToOutLineTest = false;
        //public static bool DisSecurityAccess = ConfigAppSettings.GetIntValue(Setting_Init.DisSecurityAccess).Equals(1);
+        /// <summary>
+        /// 软件屏蔽光栅
+        /// </summary>
        public static bool DisSecurityAccess = false;
+        /// <summary>
+        /// 软件屏蔽门禁
+        /// </summary>
        public static bool DisBoxDoorLimit = false;
        public static bool DisGetWare = false;

--- a/source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
查看文件 @fbaeecb
+++ b/source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
查看文件 @fbaeecb
@@ -1110,9 +1110,10 @@ namespace OnlineStore.DeviceLibrary
                return;
            }
-            LogUtil.info($"{Name} {doorname}被打开，停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop}，报警急停");
+            LogUtil.info($"{Name} {doorname}被打开，停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop}，报警停止运动");
-            SetWarnMsg($"{doorname}被打开，报警急停");
+            MoveStop = true;
-            Alarm(AlarmType.SuddenStop);
+            SetWarnMsg($"{doorname}被打开，报警停止运动");
+            //Alarm(AlarmType.SuddenStop);
        }
@@ -1127,7 +1128,7 @@ namespace OnlineStore.DeviceLibrary
                return;
            }
            CurDoorLimitState = 0;
-            MoveStop = false;
+            //MoveStop = false;
            if (alarmType > (AlarmType.IoSingleTimeOut))
            {

--- a/source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
查看文件 @fbaeecb
+++ b/source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
查看文件 @fbaeecb
@@ -49,6 +49,7 @@
            this.lblMoveInfo = new System.Windows.Forms.Label();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.panBase = new System.Windows.Forms.Panel();
+            this.btnHlhasReel = new System.Windows.Forms.Button();
            this.btnDebugAxis = new System.Windows.Forms.Button();
            this.chbMoveStop = new System.Windows.Forms.CheckBox();
            this.lblName = new System.Windows.Forms.Label();
@@ -56,7 +57,6 @@
            this.lblStoreStatus = new System.Windows.Forms.Label();
            this.btnStart = new System.Windows.Forms.Button();
            this.btnStop = new System.Windows.Forms.Button();
-            this.btnHlhasReel = new System.Windows.Forms.Button();
            this.groupBox1.SuspendLayout();
            this.groupBox4.SuspendLayout();
            this.groupBox3.SuspendLayout();
@@ -117,7 +117,7 @@
            this.txtDOIndex.Location = new System.Drawing.Point(493, 25);
            this.txtDOIndex.MaxLength = 10;
            this.txtDOIndex.Name = "txtDOIndex";
-            this.txtDOIndex.Size = new System.Drawing.Size(40, 23);
+            this.txtDOIndex.Size = new System.Drawing.Size(40, 27);
            this.txtDOIndex.TabIndex = 276;
            this.txtDOIndex.Text = "0";
            this.txtDOIndex.Visible = false;
@@ -129,7 +129,7 @@
            this.txtDoName.Location = new System.Drawing.Point(467, 25);
            this.txtDoName.MaxLength = 10;
            this.txtDoName.Name = "txtDoName";
-            this.txtDoName.Size = new System.Drawing.Size(27, 23);
+            this.txtDoName.Size = new System.Drawing.Size(27, 27);
            this.txtDoName.TabIndex = 275;
            this.txtDoName.Text = "0";
            this.txtDoName.Visible = false;
@@ -141,7 +141,7 @@
            this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.lblAddr.Location = new System.Drawing.Point(286, 28);
            this.lblAddr.Name = "lblAddr";
-            this.lblAddr.Size = new System.Drawing.Size(35, 17);
+            this.lblAddr.Size = new System.Drawing.Size(43, 20);
            this.lblAddr.TabIndex = 274;
            this.lblAddr.Text = "设备:";
            this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -178,7 +178,7 @@
            this.txtWriteTime.Location = new System.Drawing.Point(84, 69);
            this.txtWriteTime.MaxLength = 10;
            this.txtWriteTime.Name = "txtWriteTime";
-            this.txtWriteTime.Size = new System.Drawing.Size(58, 23);
+            this.txtWriteTime.Size = new System.Drawing.Size(58, 27);
            this.txtWriteTime.TabIndex = 271;
            this.txtWriteTime.Text = "0";
            // 
@@ -189,7 +189,7 @@
            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.label5.Location = new System.Drawing.Point(18, 72);
            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(60, 17);
+            this.label5.Size = new System.Drawing.Size(74, 20);
            this.label5.TabIndex = 270;
            this.label5.Text = "定时(ms):";
            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -200,7 +200,7 @@
            this.txtSlaveId.Location = new System.Drawing.Point(544, 29);
            this.txtSlaveId.MaxLength = 10;
            this.txtSlaveId.Name = "txtSlaveId";
-            this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
+            this.txtSlaveId.Size = new System.Drawing.Size(12, 27);
            this.txtSlaveId.TabIndex = 255;
            this.txtSlaveId.Text = "0";
            this.txtSlaveId.Visible = false;
@@ -319,9 +319,9 @@
            this.tabPage3.Controls.Add(this.groupBox5);
            this.tabPage3.Controls.Add(this.groupBox2);
            this.tabPage3.Controls.Add(this.groupBox6);
-            this.tabPage3.Location = new System.Drawing.Point(4, 26);
+            this.tabPage3.Location = new System.Drawing.Point(4, 29);
            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(985, 521);
+            this.tabPage3.Size = new System.Drawing.Size(985, 518);
            this.tabPage3.TabIndex = 2;
            this.tabPage3.Text = "  设备状态  ";
            this.tabPage3.UseVisualStyleBackColor = true;
@@ -332,7 +332,7 @@
            this.groupBox5.Dock = System.Windows.Forms.DockStyle.Right;
            this.groupBox5.Location = new System.Drawing.Point(495, 176);
            this.groupBox5.Name = "groupBox5";
-            this.groupBox5.Size = new System.Drawing.Size(490, 345);
+            this.groupBox5.Size = new System.Drawing.Size(490, 342);
            this.groupBox5.TabIndex = 280;
            this.groupBox5.TabStop = false;
            this.groupBox5.Text = "B面相机";
@@ -341,9 +341,9 @@
            // 
            this.pictureBox2.BackColor = System.Drawing.Color.DarkGray;
            this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox2.Location = new System.Drawing.Point(3, 19);
+            this.pictureBox2.Location = new System.Drawing.Point(3, 23);
            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(484, 323);
+            this.pictureBox2.Size = new System.Drawing.Size(484, 316);
            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.pictureBox2.TabIndex = 1;
            this.pictureBox2.TabStop = false;
@@ -354,7 +354,7 @@
            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
            this.groupBox2.Location = new System.Drawing.Point(0, 176);
            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(490, 345);
+            this.groupBox2.Size = new System.Drawing.Size(490, 342);
            this.groupBox2.TabIndex = 279;
            this.groupBox2.TabStop = false;
            this.groupBox2.Text = "A面相机";
@@ -363,9 +363,9 @@
            // 
            this.pictureBox1.BackColor = System.Drawing.Color.DarkGray;
            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox1.Location = new System.Drawing.Point(3, 19);
+            this.pictureBox1.Location = new System.Drawing.Point(3, 23);
            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(484, 323);
+            this.pictureBox1.Size = new System.Drawing.Size(484, 316);
            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.pictureBox1.TabIndex = 0;
            this.pictureBox1.TabStop = false;
@@ -441,7 +441,7 @@
            this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.lblMoveInfo.Location = new System.Drawing.Point(3, 0);
            this.lblMoveInfo.Name = "lblMoveInfo";
-            this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
+            this.lblMoveInfo.Size = new System.Drawing.Size(84, 20);
            this.lblMoveInfo.TabIndex = 280;
            this.lblMoveInfo.Text = "运动信息：";
            this.lblMoveInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -452,10 +452,10 @@
            this.tabPage1.Controls.Add(this.groupDO);
            this.tabPage1.Controls.Add(this.groupBox3);
            this.tabPage1.Controls.Add(this.groupBox4);
-            this.tabPage1.Location = new System.Drawing.Point(4, 26);
+            this.tabPage1.Location = new System.Drawing.Point(4, 29);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(985, 521);
+            this.tabPage1.Size = new System.Drawing.Size(985, 518);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "    IO列表     ";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -478,6 +478,19 @@
            this.panBase.Size = new System.Drawing.Size(997, 50);
            this.panBase.TabIndex = 260;
            // 
+            // btnHlhasReel
+            // 
+            this.btnHlhasReel.BackColor = System.Drawing.Color.SkyBlue;
+            this.btnHlhasReel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnHlhasReel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnHlhasReel.Location = new System.Drawing.Point(796, 1);
+            this.btnHlhasReel.Name = "btnHlhasReel";
+            this.btnHlhasReel.Size = new System.Drawing.Size(196, 44);
+            this.btnHlhasReel.TabIndex = 289;
+            this.btnHlhasReel.Text = "忽略夹爪有料信号";
+            this.btnHlhasReel.UseVisualStyleBackColor = false;
+            this.btnHlhasReel.Visible = false;
+            // 
            // btnDebugAxis
            // 
            this.btnDebugAxis.BackColor = System.Drawing.Color.White;
@@ -497,7 +510,7 @@
            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(597, 14);
            this.chbMoveStop.Name = "chbMoveStop";
-            this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
+            this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
            this.chbMoveStop.TabIndex = 262;
            this.chbMoveStop.Text = "暂停运动";
            this.chbMoveStop.UseVisualStyleBackColor = true;
@@ -521,7 +534,7 @@
            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(496, 14);
            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(84, 24);
+            this.chbDebug.Size = new System.Drawing.Size(104, 28);
            this.chbDebug.TabIndex = 247;
            this.chbDebug.Text = "调试状态";
            this.chbDebug.UseVisualStyleBackColor = true;
@@ -535,7 +548,7 @@
            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.lblStoreStatus.Location = new System.Drawing.Point(701, 15);
            this.lblStoreStatus.Name = "lblStoreStatus";
-            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
+            this.lblStoreStatus.Size = new System.Drawing.Size(82, 24);
            this.lblStoreStatus.TabIndex = 245;
            this.lblStoreStatus.Text = "等待启动";
            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -566,22 +579,9 @@
            this.btnStop.UseVisualStyleBackColor = false;
            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
            // 
-            // btnHlhasReel
-            // 
-            this.btnHlhasReel.BackColor = System.Drawing.Color.SkyBlue;
-            this.btnHlhasReel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnHlhasReel.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnHlhasReel.Location = new System.Drawing.Point(796, 1);
-            this.btnHlhasReel.Name = "btnHlhasReel";
-            this.btnHlhasReel.Size = new System.Drawing.Size(196, 44);
-            this.btnHlhasReel.TabIndex = 289;
-            this.btnHlhasReel.Text = "忽略夹爪有料信号";
-            this.btnHlhasReel.UseVisualStyleBackColor = false;
-            this.btnHlhasReel.Visible = false;
-            // 
            // FrmBoxEquip
            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1004, 611);
            this.Controls.Add(this.panBase);

--- a/source/XLRStoreClient/boxForm/FrmBoxEquip.cs
查看文件 @fbaeecb
+++ b/source/XLRStoreClient/boxForm/FrmBoxEquip.cs
查看文件 @fbaeecb
@@ -233,6 +233,10 @@ namespace OnlineStore.XLRStore
                    {
                        FormStatus(true);
                    }
+                    if (boxBean.MoveStop != chbMoveStop.Checked)
+                    {
+                        chbMoveStop.Checked= boxBean.MoveStop;
+                    }
                }
                else
                {
@@ -521,7 +525,10 @@ namespace OnlineStore.XLRStore
            {
                return;
            }
+            if(boxBean.MoveStop == chbMoveStop.Checked)
+            {
+                return;
+            }
            boxBean.MoveStop = chbMoveStop.Checked;
            LogUtil.info(boxBean.Name + "用户切换是否暂停： " + boxBean.MoveStop);
        }
@@ -548,7 +555,6 @@ namespace OnlineStore.XLRStore
                }
            }
        }
    }
 }

--- a/source/XLRStoreClient/boxForm/FrmBoxEquip.resx
查看文件 @fbaeecb
+++ b/source/XLRStoreClient/boxForm/FrmBoxEquip.resx
查看文件 @fbaeecb
@@ -121,7 +121,7 @@
    <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>
+    <value>73</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">

--- a/source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
查看文件 @fbaeecb
+++ b/source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
查看文件 @fbaeecb
@@ -68,13 +68,13 @@ namespace OnlineStore.XLRStore
            this.btnStart = new System.Windows.Forms.Button();
            this.btnStop = new System.Windows.Forms.Button();
            this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.button9 = new System.Windows.Forms.Button();
            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
            this.lblwidth = new System.Windows.Forms.Label();
            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
            this.lblMoveInfo = new System.Windows.Forms.Label();
            this.lblThisSta = new System.Windows.Forms.Label();
            this.groupBox12 = new System.Windows.Forms.GroupBox();
-            this.button9 = new System.Windows.Forms.Button();
            this.lblNGState = new System.Windows.Forms.Label();
            this.checkBox1 = new System.Windows.Forms.CheckBox();
            this.cmbOutstorePos = new System.Windows.Forms.ComboBox();
@@ -126,10 +126,10 @@ namespace OnlineStore.XLRStore
            this.tabPage1.Controls.Add(this.groupBox1);
            this.tabPage1.Controls.Add(this.groupBox3);
            this.tabPage1.Controls.Add(this.groupBox4);
-            this.tabPage1.Location = new System.Drawing.Point(4, 26);
+            this.tabPage1.Location = new System.Drawing.Point(4, 29);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(986, 561);
+            this.tabPage1.Size = new System.Drawing.Size(986, 558);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "    IO列表     ";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -421,6 +421,7 @@ namespace OnlineStore.XLRStore
            this.btnCloseAll.TabIndex = 259;
            this.btnCloseAll.Text = "关闭所有DO";
            this.btnCloseAll.UseVisualStyleBackColor = false;
+            this.btnCloseAll.Visible = false;
            this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
            // 
            // clampJawControl1
@@ -456,7 +457,7 @@ namespace OnlineStore.XLRStore
            this.txtDOIndex.Location = new System.Drawing.Point(386, 47);
            this.txtDOIndex.MaxLength = 10;
            this.txtDOIndex.Name = "txtDOIndex";
-            this.txtDOIndex.Size = new System.Drawing.Size(47, 23);
+            this.txtDOIndex.Size = new System.Drawing.Size(47, 27);
            this.txtDOIndex.TabIndex = 260;
            this.txtDOIndex.Text = "0";
            this.txtDOIndex.Visible = false;
@@ -468,7 +469,7 @@ namespace OnlineStore.XLRStore
            this.txtDoName.Location = new System.Drawing.Point(386, 64);
            this.txtDoName.MaxLength = 10;
            this.txtDoName.Name = "txtDoName";
-            this.txtDoName.Size = new System.Drawing.Size(53, 23);
+            this.txtDoName.Size = new System.Drawing.Size(53, 27);
            this.txtDoName.TabIndex = 259;
            this.txtDoName.Text = "0";
            this.txtDoName.Visible = false;
@@ -480,7 +481,7 @@ namespace OnlineStore.XLRStore
            this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.lblAddr.Location = new System.Drawing.Point(364, 27);
            this.lblAddr.Name = "lblAddr";
-            this.lblAddr.Size = new System.Drawing.Size(46, 17);
+            this.lblAddr.Size = new System.Drawing.Size(56, 20);
            this.lblAddr.TabIndex = 258;
            this.lblAddr.Text = "设备IP:";
            this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -504,7 +505,7 @@ namespace OnlineStore.XLRStore
            this.txtSlaveId.Location = new System.Drawing.Point(427, 24);
            this.txtSlaveId.MaxLength = 10;
            this.txtSlaveId.Name = "txtSlaveId";
-            this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
+            this.txtSlaveId.Size = new System.Drawing.Size(12, 27);
            this.txtSlaveId.TabIndex = 255;
            this.txtSlaveId.Text = "0";
            this.txtSlaveId.Visible = false;
@@ -544,7 +545,7 @@ namespace OnlineStore.XLRStore
            this.txtWriteTime.Location = new System.Drawing.Point(82, 61);
            this.txtWriteTime.MaxLength = 10;
            this.txtWriteTime.Name = "txtWriteTime";
-            this.txtWriteTime.Size = new System.Drawing.Size(60, 23);
+            this.txtWriteTime.Size = new System.Drawing.Size(60, 27);
            this.txtWriteTime.TabIndex = 238;
            this.txtWriteTime.Text = "0";
            // 
@@ -555,7 +556,7 @@ namespace OnlineStore.XLRStore
            this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.label5.Location = new System.Drawing.Point(17, 64);
            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(60, 17);
+            this.label5.Size = new System.Drawing.Size(74, 20);
            this.label5.TabIndex = 237;
            this.label5.Text = "定时(ms):";
            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -620,9 +621,9 @@ namespace OnlineStore.XLRStore
            // 
            this.tabPage3.Controls.Add(this.panBase);
            this.tabPage3.Controls.Add(this.groupBox6);
-            this.tabPage3.Location = new System.Drawing.Point(4, 26);
+            this.tabPage3.Location = new System.Drawing.Point(4, 29);
            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(986, 561);
+            this.tabPage3.Size = new System.Drawing.Size(986, 558);
            this.tabPage3.TabIndex = 2;
            this.tabPage3.Text = "状态信息";
            this.tabPage3.UseVisualStyleBackColor = true;
@@ -663,7 +664,7 @@ namespace OnlineStore.XLRStore
            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(454, 11);
            this.chbMoveStop.Name = "chbMoveStop";
-            this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
+            this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
            this.chbMoveStop.TabIndex = 262;
            this.chbMoveStop.Text = "暂停运动";
            this.chbMoveStop.UseVisualStyleBackColor = true;
@@ -687,7 +688,7 @@ namespace OnlineStore.XLRStore
            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(365, 11);
            this.chbDebug.Name = "chbDebug";
-            this.chbDebug.Size = new System.Drawing.Size(84, 24);
+            this.chbDebug.Size = new System.Drawing.Size(104, 28);
            this.chbDebug.TabIndex = 247;
            this.chbDebug.Text = "调试状态";
            this.chbDebug.UseVisualStyleBackColor = true;
@@ -702,7 +703,7 @@ namespace OnlineStore.XLRStore
            this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.lblStoreStatus.Location = new System.Drawing.Point(543, 13);
            this.lblStoreStatus.Name = "lblStoreStatus";
-            this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
+            this.lblStoreStatus.Size = new System.Drawing.Size(82, 24);
            this.lblStoreStatus.TabIndex = 245;
            this.lblStoreStatus.Text = "等待启动";
            this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -748,6 +749,16 @@ namespace OnlineStore.XLRStore
            this.groupBox6.TabStop = false;
            this.groupBox6.Text = "消息";
            // 
+            // button9
+            // 
+            this.button9.Location = new System.Drawing.Point(793, 414);
+            this.button9.Name = "button9";
+            this.button9.Size = new System.Drawing.Size(146, 51);
+            this.button9.TabIndex = 293;
+            this.button9.Text = "重置NG箱计数";
+            this.button9.UseVisualStyleBackColor = true;
+            this.button9.Click += new System.EventHandler(this.button9_Click);
+            // 
            // tableLayoutPanel3
            // 
            this.tableLayoutPanel3.ColumnCount = 1;
@@ -834,22 +845,12 @@ namespace OnlineStore.XLRStore
            this.groupBox12.TabStop = false;
            this.groupBox12.Text = "取料机构测试";
            // 
-            // button9
-            // 
-            this.button9.Location = new System.Drawing.Point(793, 414);
-            this.button9.Name = "button9";
-            this.button9.Size = new System.Drawing.Size(146, 51);
-            this.button9.TabIndex = 293;
-            this.button9.Text = "重置NG箱计数";
-            this.button9.UseVisualStyleBackColor = true;
-            this.button9.Click += new System.EventHandler(this.button9_Click);
-            // 
            // lblNGState
            // 
            this.lblNGState.AutoSize = true;
            this.lblNGState.Location = new System.Drawing.Point(576, 77);
            this.lblNGState.Name = "lblNGState";
-            this.lblNGState.Size = new System.Drawing.Size(63, 17);
+            this.lblNGState.Size = new System.Drawing.Size(77, 20);
            this.lblNGState.TabIndex = 292;
            this.lblNGState.Text = "NG箱状态";
            // 
@@ -862,7 +863,7 @@ namespace OnlineStore.XLRStore
            this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.checkBox1.Location = new System.Drawing.Point(566, 30);
            this.checkBox1.Name = "checkBox1";
-            this.checkBox1.Size = new System.Drawing.Size(154, 24);
+            this.checkBox1.Size = new System.Drawing.Size(194, 28);
            this.checkBox1.TabIndex = 291;
            this.checkBox1.Text = "检测到料串自动入库";
            this.checkBox1.UseVisualStyleBackColor = true;
@@ -875,7 +876,7 @@ namespace OnlineStore.XLRStore
            this.cmbOutstorePos.FormattingEnabled = true;
            this.cmbOutstorePos.Location = new System.Drawing.Point(104, 70);
            this.cmbOutstorePos.Name = "cmbOutstorePos";
-            this.cmbOutstorePos.Size = new System.Drawing.Size(142, 28);
+            this.cmbOutstorePos.Size = new System.Drawing.Size(142, 31);
            this.cmbOutstorePos.TabIndex = 290;
            // 
            // cmbInstorePos
@@ -885,7 +886,7 @@ namespace OnlineStore.XLRStore
            this.cmbInstorePos.FormattingEnabled = true;
            this.cmbInstorePos.Location = new System.Drawing.Point(266, 28);
            this.cmbInstorePos.Name = "cmbInstorePos";
-            this.cmbInstorePos.Size = new System.Drawing.Size(142, 28);
+            this.cmbInstorePos.Size = new System.Drawing.Size(142, 31);
            this.cmbInstorePos.TabIndex = 289;
            // 
            // btnOutStoreTest
@@ -911,7 +912,7 @@ namespace OnlineStore.XLRStore
            "B下暂存区"});
            this.cmbOutStartP.Location = new System.Drawing.Point(9, 70);
            this.cmbOutStartP.Name = "cmbOutStartP";
-            this.cmbOutStartP.Size = new System.Drawing.Size(90, 28);
+            this.cmbOutStartP.Size = new System.Drawing.Size(90, 31);
            this.cmbOutStartP.TabIndex = 287;
            this.cmbOutStartP.SelectedIndexChanged += new System.EventHandler(this.cmbOutShelf_SelectedIndexChanged);
            // 
@@ -921,7 +922,7 @@ namespace OnlineStore.XLRStore
            this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label2.Location = new System.Drawing.Point(251, 74);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(31, 20);
+            this.label2.Size = new System.Drawing.Size(39, 24);
            this.label2.TabIndex = 286;
            this.label2.Text = "-->";
            // 
@@ -937,7 +938,7 @@ namespace OnlineStore.XLRStore
            "B周转箱外侧"});
            this.cmbOutShelf.Location = new System.Drawing.Point(287, 70);
            this.cmbOutShelf.Name = "cmbOutShelf";
-            this.cmbOutShelf.Size = new System.Drawing.Size(121, 28);
+            this.cmbOutShelf.Size = new System.Drawing.Size(121, 31);
            this.cmbOutShelf.TabIndex = 285;
            // 
            // BtnInStoreTest
@@ -963,7 +964,7 @@ namespace OnlineStore.XLRStore
            "B上暂存区"});
            this.cmbInstoreTargetP.Location = new System.Drawing.Point(171, 28);
            this.cmbInstoreTargetP.Name = "cmbInstoreTargetP";
-            this.cmbInstoreTargetP.Size = new System.Drawing.Size(90, 28);
+            this.cmbInstoreTargetP.Size = new System.Drawing.Size(90, 31);
            this.cmbInstoreTargetP.TabIndex = 2;
            this.cmbInstoreTargetP.SelectedIndexChanged += new System.EventHandler(this.cmbInstoreTargetP_SelectedIndexChanged);
            // 
@@ -973,7 +974,7 @@ namespace OnlineStore.XLRStore
            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label1.Location = new System.Drawing.Point(135, 32);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(31, 20);
+            this.label1.Size = new System.Drawing.Size(39, 24);
            this.label1.TabIndex = 1;
            this.label1.Text = "-->";
            // 
@@ -986,7 +987,7 @@ namespace OnlineStore.XLRStore
            "上料口"});
            this.cmbInstoreShelf.Location = new System.Drawing.Point(9, 28);
            this.cmbInstoreShelf.Name = "cmbInstoreShelf";
-            this.cmbInstoreShelf.Size = new System.Drawing.Size(121, 28);
+            this.cmbInstoreShelf.Size = new System.Drawing.Size(121, 31);
            this.cmbInstoreShelf.TabIndex = 0;
            // 
            // tabControl1
@@ -1005,7 +1006,7 @@ namespace OnlineStore.XLRStore
            // 
            // FrmInputEquip
            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1000, 596);
            this.Controls.Add(this.tabControl1);