Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -102,6 +102,10 @@ namespace OnlineStore.DeviceLibrary
         public List<string> PositionNumList;
         public bool IgnoreCamDect = false;
         public bool CamDetectError = false;
+        /// <summary>
+        /// 关闭相机检测抽屉
+        /// </summary>
+        public bool CloseCamDetect = false;
         public BoxEquip(string cid, BoxEquip_Config config)
         {
             baseConfig = config;

source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs

@@ -640,6 +640,12 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool CamCheckReelPosition()
         {
+            if (CloseCamDetect)
+            {
+                LogInfo($"关闭相机检查库位 {MoveInfo.SLog}：[{MoveInfo.MoveParam.PosInfo.PosId}]");
+                CamDetectError = false;
+                return true;
+            }
             if (IgnoreCamDect)
             {
                 return true;

source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs

@@ -86,6 +86,7 @@
             this.textBox6 = new System.Windows.Forms.TextBox();
             this.button9 = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.chkBoxCloseCam = new System.Windows.Forms.CheckBox();
             this.checkBoxOpenAuto = new System.Windows.Forms.CheckBox();
             this.button4 = new System.Windows.Forms.Button();
             this.button3 = new System.Windows.Forms.Button();
@@ -667,6 +668,7 @@
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.chkBoxCloseCam);
             this.groupBox1.Controls.Add(this.checkBoxOpenAuto);
             this.groupBox1.Controls.Add(this.button4);
             this.groupBox1.Controls.Add(this.button3);
@@ -681,6 +683,17 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "流程";
             // 
+            // chkBoxCloseCam
+            // 
+            this.chkBoxCloseCam.AutoSize = true;
+            this.chkBoxCloseCam.Location = new System.Drawing.Point(596, 62);
+            this.chkBoxCloseCam.Name = "chkBoxCloseCam";
+            this.chkBoxCloseCam.Size = new System.Drawing.Size(154, 21);
+            this.chkBoxCloseCam.TabIndex = 7;
+            this.chkBoxCloseCam.Text = "关闭视觉检查抽屉Mark";
+            this.chkBoxCloseCam.UseVisualStyleBackColor = true;
+            this.chkBoxCloseCam.CheckedChanged += new System.EventHandler(this.chkBoxCloseCam_CheckedChanged);
+            // 
             // checkBoxOpenAuto
             // 
             this.checkBoxOpenAuto.AutoSize = true;
@@ -694,7 +707,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(504, 91);
+            this.button4.Location = new System.Drawing.Point(432, 86);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(146, 41);
             this.button4.TabIndex = 3;
@@ -704,7 +717,7 @@
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(342, 91);
+            this.button3.Location = new System.Drawing.Point(270, 86);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(146, 41);
             this.button3.TabIndex = 2;
@@ -714,7 +727,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(504, 32);
+            this.button2.Location = new System.Drawing.Point(432, 27);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(146, 41);
             this.button2.TabIndex = 1;
@@ -724,7 +737,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(342, 32);
+            this.button1.Location = new System.Drawing.Point(270, 27);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(146, 41);
             this.button1.TabIndex = 0;
@@ -870,5 +883,6 @@
         private System.Windows.Forms.Button button13;
         private System.Windows.Forms.Label label22;
         private System.Windows.Forms.CheckBox checkBoxOpenAuto;
+        private System.Windows.Forms.CheckBox chkBoxCloseCam;
     }
 }
\ No newline at end of file

source/XLRStoreClient/boxForm/FrmAutoFindPos.cs

@@ -31,6 +31,7 @@ namespace OnlineStore.XLRStore
             button3.Enabled = state;
             button4.Enabled = state;
             tabControl1.Enabled = state;
+            chkBoxCloseCam.Enabled = state;
         }
         private void button1_Click(object sender, EventArgs e)
         {
@@ -349,5 +350,10 @@ namespace OnlineStore.XLRStore
         {
             SetState(checkBoxOpenAuto.Checked);
         }
+
+        private void chkBoxCloseCam_CheckedChanged(object sender, EventArgs e)
+        {
+            boxEquip.CloseCamDetect = chkBoxCloseCam.Checked;
+        }
     }
 }