增加单个料仓暂停入库功能

source/AssemblyLineClient/FrmMoveEquip.Designer.cs

@@ -87,6 +87,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.chbStopInstore = new System.Windows.Forms.CheckBox();
             this.panBase.SuspendLayout();
             this.panBase.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox4.SuspendLayout();
@@ -537,6 +538,7 @@
             // 
             // 
             this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox5.Controls.Add(this.chbStopInstore);
             this.groupBox5.Controls.Add(this.label7);
             this.groupBox5.Controls.Add(this.label7);
             this.groupBox5.Controls.Add(this.txtPosId);
             this.groupBox5.Controls.Add(this.txtPosId);
             this.groupBox5.Controls.Add(this.btnClear);
             this.groupBox5.Controls.Add(this.btnClear);
@@ -1036,6 +1038,18 @@
             this.txtP2.TabIndex = 305;
             this.txtP2.TabIndex = 305;
             this.txtP2.Text = "-1";
             this.txtP2.Text = "-1";
             // 
             // 
+            // chbStopInstore
+            // 
+            this.chbStopInstore.AutoSize = true;
+            this.chbStopInstore.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chbStopInstore.Location = new System.Drawing.Point(431, 28);
+            this.chbStopInstore.Name = "chbStopInstore";
+            this.chbStopInstore.Size = new System.Drawing.Size(84, 24);
+            this.chbStopInstore.TabIndex = 287;
+            this.chbStopInstore.Text = "暂停入库";
+            this.chbStopInstore.UseVisualStyleBackColor = true;
+            this.chbStopInstore.CheckedChanged += new System.EventHandler(this.chbStopInstore_CheckedChanged);
+            // 
             // FrmMoveEquip
             // FrmMoveEquip
             // 
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -1148,6 +1162,7 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.ComboBox cmbP3Width;
         private System.Windows.Forms.ComboBox cmbP3Width;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.CheckBox chbStopInstore;
     }
     }
 }
 }
 
 

source/AssemblyLineClient/FrmMoveEquip.cs

@@ -36,6 +36,7 @@ namespace OnlineStore.AssemblyLine
         private void FrmStoreIOStatus_Load(object sender, EventArgs e)
         private void FrmStoreIOStatus_Load(object sender, EventArgs e)
         {
         {
             chbDebug.Checked = equipBean.IsDebug;
             chbDebug.Checked = equipBean.IsDebug;
+            chbStopInstore.Checked = equipBean.StopInstore; 
             if (equipBean.UseAxis)
             if (equipBean.UseAxis)
             {
             {
                 axisMoveControl1.LoadData(equipBean, new AxisBean[] { equipBean.UpdownAxis });
                 axisMoveControl1.LoadData(equipBean, new AxisBean[] { equipBean.UpdownAxis });
@@ -682,7 +683,7 @@ namespace OnlineStore.AssemblyLine
             }
             }
 
 
             equipBean.MoveStop = chbMoveStop.Checked;
             equipBean.MoveStop = chbMoveStop.Checked;
-            LogUtil.info(equipBean.Name + "用户切换是否暂停： " + equipBean.MoveStop);
+            LogUtil.info(equipBean.Name + "用户切换是否暂停运动： " + equipBean.MoveStop);
         }
         }
 
 
         private void btnClear_Click(object sender, EventArgs e)
         private void btnClear_Click(object sender, EventArgs e)
@@ -757,6 +758,18 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
             }
             }
         }
         }
+
+        private void chbStopInstore_CheckedChanged(object sender, EventArgs e)
+        {
+
+            if (!IsLoad)
+            {
+                return;
+            }
+
+            equipBean.StopInstore = chbStopInstore.Checked;
+            LogUtil.info(equipBean.Name + "用户切换暂停入库： " + equipBean.StopInstore);
+        }
     }
     }
 
 
 }
 }

source/AssemblyLineClient/useControl/EquipControl.cs

@@ -79,7 +79,14 @@ namespace OnlineStore.AssemblyLine
         public void ShowData(EquipBase equip)
         public void ShowData(EquipBase equip)
         {          
         {          
             lblTrayNum.Text ="托盘："+equip.currTrayNum;
             lblTrayNum.Text ="托盘："+equip.currTrayNum;
-            lblStatus.Text = equip.GetRunStr(); 
+            lblStatus.Text = equip.GetRunStr();
+            if (equip.MoveStop)
+            {
+                lblStatus.Text += "/暂停运动";
+            } if (equip.StopInstore)
+            {
+                lblStatus.Text += "/暂停入库";
+            }
             toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; 
             toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; 
             lblDebug.Text = "启用" + (equip.IsDebug ? "✘" : "✔");
             lblDebug.Text = "启用" + (equip.IsDebug ? "✘" : "✔");
             lblWarn.Text = equip.WarnMsg;
             lblWarn.Text = equip.WarnMsg;

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 StopInstore = false;
         public bool MoveStop = false;
         public bool MoveStop = false;
 
 
         public string CurrShelfId = "";//当前的料架ID
         public string CurrShelfId = "";//当前的料架ID

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -346,6 +346,10 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return false;
                 return false;
             }
             }
+            if (move.StopInstore)
+            {
+                return false;
+            }
             if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait)
             if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait)
             {
             {
                 return true;
                 return true;