存储机构添加开关-是否开关出库前的暂存区检查

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -742,44 +742,58 @@ namespace OnlineStore.DeviceLibrary
         {
             try
             {
-                //bool noInStore = true;
-                //if (AutoInout.CurrInOutACount >= this.Config.Box_ResetACount && noInStore)
-                //{
-                //    if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
-                //    {
-                //        //    LogInfo("已经累计出入库" + AutoInout.CurrInOutACount + "次，当时当前正在忙碌中暂不复位");
-                //    }
-                //    else
-                //    {
-                //        LogInfo("已经累计出入库" + AutoInout.CurrInOutACount + "次，需要复位一下");
-                //        Reset();
-                //    }
-                //    return;
-                //}
                 if (InDoorSigCheck())
                 {
                     return;
                 }
-                if (waitAOutStoreList.Count > 0 && CheckAOutDoor())//
+                if (waitAOutStoreList.Count > 0)//
                 {
-                    InOutParam param = null;
-                    bool result = waitAOutStoreList.TryDequeue(out param);
-                    if (result && param != null)
+                    if (CloseOutStoreCheck)
                     {
-                        LogInfo("执行A面排队的出库【" + param.PosInfo.ToStr() + "】");
-                        StartExecuctOut(param);
-                        return;
+                        InOutParam param = null;
+                        bool result = waitAOutStoreList.TryDequeue(out param);
+                        if (result && param != null)
+                        {
+                            LogInfo("执行A面排队的出库【" + param.PosInfo.ToStr() + "】");
+                            StartExecuctOut(param);
+                            return;
+                        }
+                    }
+                    else if(CheckAOutDoor())
+                    {
+                        InOutParam param = null;
+                        bool result = waitAOutStoreList.TryDequeue(out param);
+                        if (result && param != null)
+                        {
+                            LogInfo("执行A面排队的出库【" + param.PosInfo.ToStr() + "】");
+                            StartExecuctOut(param);
+                            return;
+                        }
                     }
                 }
-                if (waitBOutStoreList.Count > 0 && CheckBOutDoor())//
+                if (waitBOutStoreList.Count > 0)//
                 {
-                    InOutParam param = null;
-                    bool result = waitBOutStoreList.TryDequeue(out param);
-                    if (result && param != null)
+                    if(CloseOutStoreCheck)
                     {
-                        LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
-                        StartExecuctOut(param);
-                        return;
+                        InOutParam param = null;
+                        bool result = waitBOutStoreList.TryDequeue(out param);
+                        if (result && param != null)
+                        {
+                            LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
+                            StartExecuctOut(param);
+                            return;
+                        }
+                    }
+                    else if(CheckBOutDoor())
+                    {
+                        InOutParam param = null;
+                        bool result = waitBOutStoreList.TryDequeue(out param);
+                        if (result && param != null)
+                        {
+                            LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
+                            StartExecuctOut(param);
+                            return;
+                        }
                     }
                 }
             }

source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs

@@ -1024,15 +1024,22 @@ namespace OnlineStore.DeviceLibrary
             }
         }
         private DateTime startOutStoreTime = DateTime.Now;
+        /// <summary>
+        /// 关闭出库前的碗里检查
+        /// </summary>
+        public bool CloseOutStoreCheck = false;
         public override bool StartOutstore(InOutParam param)
         {
             if (InDoorSigCheck())
             {
                 return false;
             }
-            if (!OutDoorCheck(param))
+            if(!CloseOutStoreCheck)
             {
-                return false;
+                if (!OutDoorCheck(param))
+                {
+                    return false;
+                }
             }
             if (isInSuddenDown || isNoAirpressure_Check
                 || !runStatus.Equals(RunStatus.Runing)

source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs

@@ -111,6 +111,7 @@
             this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.radioButton1 = new System.Windows.Forms.RadioButton();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.chkCloseOutStoreCheck = new System.Windows.Forms.CheckBox();
             this.tableLayoutPanel1.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
@@ -875,6 +876,7 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.chkCloseOutStoreCheck);
             this.groupBox1.Controls.Add(this.lblResult);
             this.groupBox1.Controls.Add(this.chkBoxCloseCam);
             this.groupBox1.Controls.Add(this.checkBoxOpenAuto);
@@ -972,6 +974,17 @@
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // chkCloseOutStoreCheck
+            // 
+            this.chkCloseOutStoreCheck.AutoSize = true;
+            this.chkCloseOutStoreCheck.Location = new System.Drawing.Point(569, 45);
+            this.chkCloseOutStoreCheck.Name = "chkCloseOutStoreCheck";
+            this.chkCloseOutStoreCheck.Size = new System.Drawing.Size(147, 21);
+            this.chkCloseOutStoreCheck.TabIndex = 9;
+            this.chkCloseOutStoreCheck.Text = "关闭出库前的碗里检查";
+            this.chkCloseOutStoreCheck.UseVisualStyleBackColor = true;
+            this.chkCloseOutStoreCheck.CheckedChanged += new System.EventHandler(this.chkCloseOutStoreCheck_CheckedChanged);
+            // 
             // FrmAutoFindPos
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -1092,5 +1105,6 @@
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.Label lblResult;
         private System.Windows.Forms.ListBox listBox1;
+        private System.Windows.Forms.CheckBox chkCloseOutStoreCheck;
     }
 }
\ No newline at end of file

source/XLRStoreClient/boxForm/FrmAutoFindPos.cs

@@ -440,5 +440,10 @@ namespace OnlineStore.XLRStore
             lineMoveP.UpdatePosById(head2.ToString());
             boxEquip.PullAxis_Updown.AbsMove(null, lineMoveP.PullAxis_Updown_P4, boxEquip.Config.PullAxis_Updown_FindPosSpeed);
         }
+
+        private void chkCloseOutStoreCheck_CheckedChanged(object sender, EventArgs e)
+        {
+            boxEquip.CloseOutStoreCheck = chkCloseOutStoreCheck.Checked;
+        }
     }
 }