出库失败时先缓存，稍后自动出库

source/ACSingleStore/FrmStoreBox.cs

@@ -133,13 +133,7 @@ namespace OnlineStore.ACSingleStore
 
             btnOutStore.Enabled = isOpen;
             btnInStore.Enabled = isOpen;
-
-            //btnAxisAMove.Enabled = isOpen;
-
-            //btnAxisReturnHome.Enabled = isOpen;
-            //btnAxisRMove.Enabled = isOpen;
-            //btnAxisVMove.Enabled = isOpen;
-
+             
             启动ToolStripMenuItem.Enabled = !isOpen;
             停止ToolStripMenuItem.Enabled = isOpen;
             复位ToolStripMenuItem.Enabled = isOpen;
@@ -156,12 +150,15 @@ namespace OnlineStore.ACSingleStore
             notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
             LoadOk = true;
             cmbHomeType.SelectedIndex = 1;
-            HideForm();
-    //        HumitureController.QueryData();
+            HideForm(); 
         }
         private DateTime preReadModblsTime = DateTime.Now;
         private void timer1_Tick(object sender, EventArgs e)
         {
+            if (!this.Visible)
+            {
+                return;
+            }
             //HumitureServer.RandomData(store.Config.GetTempAddrList());
             lblTemp.Text = store.currTempStr;
             //验证运动是否完成
@@ -1114,48 +1111,6 @@ namespace OnlineStore.ACSingleStore
             } 
             return false;
         }
-        public bool IsInProcess = false;
-        public void CheckWait()
-        {
-            if (IsInProcess)
-            {
-                return;
-            }
-            IsInProcess = true;
-            List<WaitResultInfo> list = waitResultList;
-            if (list.Count > 0)
-            {
-                bool isOk = true;
-                foreach (WaitResultInfo wait in list)
-                {
-                    if (wait.WaitType == 1)
-                    { 
-                        string msg = "";
-                        bool isEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
-                        if (!msg.Equals(""))
-                        {
-                            isOk = false;
-
-                            break;
-                        }
-                        else if (!isEnd)
-                        {
-                            isOk = false;
-                            break;
-                        }
-                    } 
-                }
-                if (list.Count > 0 && isOk.Equals(true))
-                {
-                    waitResultList.Clear();
-                    list.Clear();
-                    MessageBox.Show("运动完成！");
-                }
-            }
-            IsInProcess = false;
-        }
-        public List<WaitResultInfo> waitResultList = new List<WaitResultInfo>();
-         
          
         private int GetSlaveAddr()
         {
@@ -1210,16 +1165,7 @@ namespace OnlineStore.ACSingleStore
             int value = ACServerManager.GetHomeEndStatus(GetPortName(), GetSlaveAddr());
             this.txtHomeStatus.Text = value.ToString();
         }
-
-        private void btnOpenWCF_Click(object sender, EventArgs e)
-        {
-            //WCFControl.OpenWCF();
-        }
-
-        private void btnCloseWCF_Click(object sender, EventArgs e)
-        {
-            //WCFControl.CloseWCF();
-        }
+         
 
         private void chbAuto_CheckedChanged(object sender, EventArgs e)
         {
@@ -1241,17 +1187,24 @@ namespace OnlineStore.ACSingleStore
 
         private void 显示ToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            FrmPwd fw = new FrmPwd(10);
-            DialogResult result = fw.ShowDialog();
-            if (!result.Equals(DialogResult.OK)) 
+            try
             {
-                LogUtil.info("切换界面显示时，没有正确输入密码"); 
-                return;
+                FrmPwd fw = new FrmPwd(10);
+                DialogResult result = fw.ShowDialog();
+                if (!result.Equals(DialogResult.OK))
+                {
+                    LogUtil.info("切换界面显示时，没有正确输入密码");
+                    return;
+                }
+                this.Visible = true;
+                this.WindowState = FormWindowState.Maximized;
+                this.notifyIcon1.Visible = false;
+                this.ShowInTaskbar = true;
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error("显示界面出错：" + ex.ToString());
             }
-            this.Visible = true;
-            this.WindowState = FormWindowState.Maximized;
-            this.notifyIcon1.Visible = false;
-            this.ShowInTaskbar = true;
         }
         private void ExitApp()
         {

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -554,8 +554,8 @@ namespace OnlineStore.DeviceLibrary
                     break;
                 case StoreMoveStep.BOX_H_MiddleAxisToP1:
                     LogUtil.info(LOGGER, StoreName + "回原点完成");
-                    storeRunStatus = StoreRunStatus.Runing;
                     StoreMove.EndMove();
+                    storeRunStatus = StoreRunStatus.Runing;
                     storeStatus = StoreStatus.StoreOnline;
                     WarnMsg = "";
                     break;
@@ -1066,7 +1066,7 @@ namespace OnlineStore.DeviceLibrary
                                     //判断料盘尺寸 
                                     if (GetSize() <= 7)
                                     {
-                                        LogUtil.info(StoreName + "检测到寸料盘，开始扫码");
+                                        LogUtil.info(StoreName + "检测到7寸料盘，开始扫码");
                                         GetCameraCode();
                                     }
                                     else
@@ -1239,7 +1239,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 short axis = axisInfo.GetAxisValue();
                 string deviceName = axisInfo.DeviceName;
-                AxisAlarmInfo info = AxisAlarmCodeMap[deviceName];
+                AxisAlarmInfo info = AxisAlarmCodeMap[axisInfo.GetNameStr()];
 
                 int alarmIo = ACServerManager.GetAlarmStatus(deviceName, axis);
 
@@ -1258,7 +1258,7 @@ namespace OnlineStore.DeviceLibrary
                         info.AlarmIoValue = alarmIo;
                     }
                 }
-                AxisAlarmCodeMap[deviceName] = info;
+                AxisAlarmCodeMap[axisInfo.GetNameStr()] = info;
             }
             //});
             //判断报警状态
@@ -1307,10 +1307,12 @@ namespace OnlineStore.DeviceLibrary
         public bool CanStarInOut()
         {
             if (isInSuddenDown || isNoAirCheck ||
-              (!storeRunStatus.Equals(StoreRunStatus.Runing))
-              || storeStatus.Equals(StoreStatus.InStoreExecute) || storeStatus.Equals(StoreStatus.OutStoreExecute)
-              || storeStatus.Equals(StoreStatus.InStoreEnd) || storeStatus.Equals(StoreStatus.OutStoreBoxEnd))
-            {
+              (!storeRunStatus.Equals(StoreRunStatus.Runing)) ||
+              (!StoreMove.MoveType.Equals(StoreMoveType.None))) 
+            //  || storeStatus.Equals(StoreStatus.InStoreExecute) || storeStatus.Equals(StoreStatus.OutStoreExecute)
+            //  || storeStatus.Equals(StoreStatus.InStoreEnd) || storeStatus.Equals(StoreStatus.OutStoreBoxEnd))
+            //{
+            { 
                 return false;
             }
             return true;
@@ -1426,7 +1428,7 @@ namespace OnlineStore.DeviceLibrary
 
         #region Halcon扫码枪代码
         public bool IsTestCamera = false;
-        private System.Timers.Timer scanTimer = null;
+        //private System.Timers.Timer scanTimer = null;
         public void GetCameraCode()
         {
             if (IsTestCamera && IsInScan())
@@ -1434,30 +1436,33 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info("上次扫码还未执行完毕,请稍后！");
                 return;
             }
-            if (scanTimer == null)
-            {
-                scanTimer = new System.Timers.Timer();
-                scanTimer.Interval = 10;
-                scanTimer.AutoReset = false;
-                scanTimer.Enabled = false;
-                scanTimer.Elapsed += scanTimer_Elapsed;
-            }
-            scanTimer.Enabled = true;
+            //if (scanTimer == null)
+            //{
+            //    scanTimer = new System.Timers.Timer();
+            //    scanTimer.Interval = 10;
+            //    scanTimer.AutoReset = false;
+            //    scanTimer.Enabled = false;
+            //    scanTimer.Elapsed += scanTimer_Elapsed;
+            //}
+            //scanTimer.Enabled = true;
+
+            Task.Factory.StartNew(delegate { scanTimer_Elapsed(null, null); });
         }
 
         private string spiltStr = "##";
         private void scanTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
             int height = GetHeight();
-
+            LogUtil.info("高度【"+height+"】开始扫码");
             DateTime date = DateTime.Now;
-            scanTimer.Enabled = false;
+            //scanTimer.Enabled = false;
             KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
             string outMsg = "";
             string message = "";
             List<string> codeList = CodeManager.CameraScan();
             if (codeList.Count <= 0)
             {
+                LogUtil.info("高度【" + height + "】第一次未扫到码，重新扫码");
                 codeList = CodeManager.CameraScan();
             }