1

source/ACPackingStore/FrmBox.Designer.cs

@@ -448,7 +448,7 @@
             this.btnSotreReset.TabIndex = 2;
             this.btnSotreReset.TabIndex = 2;
             this.btnSotreReset.Text = "复位";
             this.btnSotreReset.Text = "复位";
             this.btnSotreReset.UseVisualStyleBackColor = true;
             this.btnSotreReset.UseVisualStyleBackColor = true;
-            this.btnSotreReset.Click += new System.EventHandler(this.btnStoreStart_Click);
+            this.btnSotreReset.Click += new System.EventHandler(this.btnSotreReset_Click);
             // 
             // 
             // tabControl1
             // tabControl1
             // 
             // 
@@ -487,9 +487,9 @@
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Enabled = false;
             this.groupBox1.Enabled = false;
             this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             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(17, 529);
+            this.groupBox1.Location = new System.Drawing.Point(14, 529);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(544, 131);
+            this.groupBox1.Size = new System.Drawing.Size(559, 131);
             this.groupBox1.TabIndex = 1;
             this.groupBox1.TabIndex = 1;
             this.groupBox1.TabStop = false;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "压紧轴位置配置";
             this.groupBox1.Text = "压紧轴位置配置";

source/ACPackingStore/FrmBox.cs

@@ -644,9 +644,11 @@ namespace OnlineStore.ACPackingStore
 
 
         private void btnSotreReset_Click(object sender, EventArgs e)
         private void btnSotreReset_Click(object sender, EventArgs e)
         {
         {
+            if (BoxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
+            {
                 this.BoxBean.Reset();
                 this.BoxBean.Reset();
                 btnSotreReset.Enabled = false;
                 btnSotreReset.Enabled = false;
-            btnSotreReset.Enabled = false;
+            }
         }
         }
 
 
         private void 查看IOToolStripMenuItem_Click(object sender, EventArgs e)
         private void 查看IOToolStripMenuItem_Click(object sender, EventArgs e)