存储机构-0822

source/Common/Setting_Init.cs

@@ -33,6 +33,7 @@ namespace OnlineStore.Common
         public static string ConfigPath_Box = "ConfigPath_Box";
         public static string ConfigPath_BoxPosition = "ConfigPath_BoxPosition";
         public static string ConfigPath_DrawerPosition = "ConfigPath_DrawerPosition";
+        public static string CloseCamDetect = "CloseCamDetect";
         /// <summary>
         /// 需要识别的二维码类型，多个中间使用#分割
         /// </summary>

source/DeviceLibrary/baan/AxisBean.cs

@@ -130,7 +130,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitAxis(Config, targetPosition, targetSpeed));
                 Config.TargetPosition = targetPosition;
                 AxisManager.instance.AbsMove(Config.DeviceName, Config.GetAxisValue(), targetPosition, targetSpeed,Config.AddSpeed,Config.DelSpeed);
-                LogUtil.info($"{this.AxisName} AbsMove To [{targetPosition}] [speed={targetSpeed}]");
+                //LogUtil.info($"{this.AxisName} AbsMove To [{targetPosition}] [speed={targetSpeed}]");
             }
         }
 

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -105,7 +105,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 关闭相机检测抽屉
         /// </summary>
-        public bool CloseCamDetect = false;
+        public bool CloseCamDetect;
         public BoxEquip(string cid, BoxEquip_Config config)
         {
             baseConfig = config;
@@ -688,9 +688,7 @@ namespace OnlineStore.DeviceLibrary
                 //    }
                 //    return;
                 //}
-                if (!runStatus.Equals(RunStatus.Runing))
-                    return;
-                if (waitAOutStoreList.Count > 0)
+                if (waitAOutStoreList.Count > 0 && CheckAOutDoor())
                 {
                     InOutParam param = null;
                     bool result = waitAOutStoreList.TryDequeue(out param);
@@ -701,7 +699,7 @@ namespace OnlineStore.DeviceLibrary
                         return;
                     }
                 }
-                if (waitBOutStoreList.Count > 0)
+                if (waitBOutStoreList.Count > 0 && CheckBOutDoor())
                 {
                     InOutParam param = null;
                     bool result = waitBOutStoreList.TryDequeue(out param);

source/XLRStoreClient/App.config

@@ -39,7 +39,8 @@
     <add key="TCPServerPort" value="5246" />
     <!--AGV调度服务器地址-->
     <add key="AgvServerIp" value="10.85.162.40" />
- 
+    <!--关闭相机的抽屉检测功能-->
+    <add key="CloseCamDetect" value="True" />
     <!--ABB机器人服务器-->
     <add key="ABBServerPort" value="21" />
     <!--是否打开托盘编码界面-->

source/XLRStoreClient/boxForm/FrmAutoFindPos.cs

@@ -20,6 +20,8 @@ namespace OnlineStore.XLRStore
         {
             CheckForIllegalCrossThreadCalls = false;
             InitializeComponent();
+            boxEquip = StoreManager.XLRStore.boxEquip;
+            chkBoxCloseCam.Checked =bool.Parse(Common.ConfigAppSettings.GetValue(Setting_Init.CloseCamDetect));
             SetState(false);
         }
         BoxEquip boxEquip;
@@ -75,7 +77,6 @@ namespace OnlineStore.XLRStore
 
         private void FrmAutoFindPos_Load(object sender, EventArgs e)
         {
-            boxEquip = StoreManager.XLRStore.boxEquip;
             txtColumnSpacing.Text = boxEquip.Config.Column_Spacing.ToString();
             txtRowSpacing.Text = boxEquip.Config.Row_Spacing.ToString();
             txtDrawerRows.Text = boxEquip.Config.Drawer_Rows.ToString();
@@ -220,7 +221,7 @@ namespace OnlineStore.XLRStore
                 }
                 info = $"更新完成！";
                 label8.Text = info;
-                label8.BackColor =Color.Green;
+                label8.BackColor = Color.Green;
             }));
 
         }
@@ -354,6 +355,7 @@ namespace OnlineStore.XLRStore
         private void chkBoxCloseCam_CheckedChanged(object sender, EventArgs e)
         {
             boxEquip.CloseCamDetect = chkBoxCloseCam.Checked;
+            Common.ConfigAppSettings.SaveValue(Setting_Init.CloseCamDetect, boxEquip.CloseCamDetect.ToString());
         }
     }
 }