入料T1增加夹爪忽略信号。入料抓料增加等待。

source/AssemblyLineClient/FrmFeedingEquip.Designer.cs

@@ -98,6 +98,7 @@
             this.btnMoveto = new System.Windows.Forms.Button();
             this.txtSizePosition = new System.Windows.Forms.TextBox();
             this.btnScan = new System.Windows.Forms.Button();
+            this.btnHlhasReel = new System.Windows.Forms.Button();
             this.panBase.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
@@ -649,6 +650,7 @@
             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.btnHlhasReel);
             this.groupBox6.Controls.Add(this.btnUpdateShelf);
             this.groupBox6.Controls.Add(this.txtShelfID);
             this.groupBox6.Controls.Add(this.lblwidth);
@@ -1245,6 +1247,19 @@
             this.btnScan.UseVisualStyleBackColor = false;
             this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
             // 
+            // btnHlhasReel
+            // 
+            this.btnHlhasReel.BackColor = System.Drawing.Color.White;
+            this.btnHlhasReel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnHlhasReel.Location = new System.Drawing.Point(780, 529);
+            this.btnHlhasReel.Name = "btnHlhasReel";
+            this.btnHlhasReel.Size = new System.Drawing.Size(121, 35);
+            this.btnHlhasReel.TabIndex = 288;
+            this.btnHlhasReel.Text = "忽略夹爪有料信号";
+            this.btnHlhasReel.UseVisualStyleBackColor = false;
+            this.btnHlhasReel.Visible = false;
+            this.btnHlhasReel.Click += new System.EventHandler(this.btnHlhasReel_Click);
+            // 
             // FrmFeedingEquip
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -1369,6 +1384,7 @@
         private System.Windows.Forms.Label lblTestMsg;
         private System.Windows.Forms.Label lblP2List;
         private useControl.ClampJawControl clampJawControl1;
+        private System.Windows.Forms.Button btnHlhasReel;
     }
 }
 

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -145,6 +145,14 @@ namespace OnlineStore.AssemblyLine
                 }
                 lblMoveInfo.Text = equipBean.GetMoveStr();
                 lblwidth.Text = equipBean.GetLastTrayInfo();
+                if (equipBean.IsNoReelAlarm() && (!equipBean.ClampEmptyMove))
+                {
+                    btnHlhasReel.Visible = true;
+                }
+                else
+                {
+                    btnHlhasReel.Visible = false;
+                }
             }
             catch (Exception ex)
             {
@@ -870,6 +878,14 @@ namespace OnlineStore.AssemblyLine
             }
         }
 
+        private void btnHlhasReel_Click(object sender, EventArgs e)
+        {
+            if (equipBean.IsNoReelAlarm())
+            {
+                equipBean.ClampEmptyMove = true;
+                LogUtil.info(equipBean.Name + "界面点击：" + btnHlhasReel.Text + ",设置ClampEmptyMove=true ");
+            }
+        }
     }
 
 }

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -795,15 +795,28 @@ namespace OnlineStore.DeviceLibrary
         public bool ClampEmptyMove = false;
         public bool IsNoReelAlarm()
         {
-            if (runStatus.Equals(LineRunStatus.Busy))
+            if (runStatus.Equals(LineRunStatus.Busy)&&alarmType.Equals(LineAlarmType.IoSingleTimeOut))
             {
-                if (MoveInfo.MoveType.Equals(LineMoveType.InStore) && MoveInfo.MoveStep.Equals(LineMoveStep.MI_07_WaitHasReel))
+                if (baseConfig.DType.Equals(DeviceType.MoveEquip))
                 {
-                    return true;
+                    if (MoveInfo.MoveType.Equals(LineMoveType.InStore) && MoveInfo.MoveStep.Equals(LineMoveStep.MI_07_WaitHasReel))
+                    { 
+                        return true;
+                    }
+                    else if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && MoveInfo.MoveStep.Equals(LineMoveStep.MO_57_WaitHasReel))
+                    {
+                        return true;
+                    }
                 }
-                else if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && MoveInfo.MoveStep.Equals(LineMoveStep.MO_57_WaitHasReel))
+                else
                 {
-                    return true;
+                    if (MoveInfo.MoveType.Equals(LineMoveType.InStore) && MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_CheckTray))
+                    {
+                        if (!ClampJwa.HasReel())
+                        {
+                            return true;
+                        }
+                    }
                 }
             }
             return false;