1

source/ACSingleStore/FrmStoreBox.cs

@@ -169,6 +169,10 @@ namespace OnlineStore.ACSingleStore
         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;
             //验证运动是否完成
@@ -1250,17 +1254,23 @@ 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/ACSingleStore/FrmStoreBox.resx

@@ -1263,7 +1263,7 @@
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>169</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

source/DeviceLibrary/PanasonicServo/ACServerManager.cs

@@ -303,7 +303,7 @@ namespace OnlineStore.DeviceLibrary
                     //if (isHomeEnd.Equals(1))
                     //{
                     int value = 2000;
-                    LogUtil.info("轴【" + portName + "】原点返回时发现原点已亮且回过原点，需要先相对走" + value);
+                    LogUtil.info("轴【" + portName + "_" + slvAddr + "】原点返回时发现原点已亮且回过原点，需要先相对走" + value);
                     RelMove(portName, slvAddr, value);
                     bool isStop = false;
                     for (int i = 0; i <= 10; i++)
@@ -312,13 +312,13 @@ namespace OnlineStore.DeviceLibrary
                         if (GetBusyStatus(portName, slvAddr).Equals(0))
                         {
                             isStop = true;
-                            LogUtil.info("轴【" + portName + "】 相对走" + value + "已结束");
+                            LogUtil.info("轴【" + portName + "_" + slvAddr + "】相对走" + value + "已结束");
                             break;
                         }
                     }
                     if (!isStop)
                     {
-                        LogUtil.info("轴【" + portName + "】 相对走" + value + "已等待2分钟，直接停止");
+                        LogUtil.info("轴【" + portName + "_" + slvAddr + "】相对走" + value + "已等待2分钟，直接停止");
                         SuddenStop(portName, slvAddr);
                     }
                     //}
@@ -326,7 +326,7 @@ namespace OnlineStore.DeviceLibrary
             }
             catch (Exception ex)
             {
-                LogUtil.error("轴【" + portName + "】原点返回前验证是否在原点出错：" + ex.StackTrace);
+                LogUtil.error("轴【" + portName + "_" + slvAddr + "】原点返回前验证是否在原点出错：" + ex.StackTrace);
             }
             UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove1);
             LogUtil.debug("回原点：反方向");
@@ -341,7 +341,7 @@ namespace OnlineStore.DeviceLibrary
             if ((preSpeed.Equals(-1)) || (!preSpeed.Equals(Math.Abs(speed))))
             { 
                 string v1 = slvAddr + "064601  " + ACServerManager.SpeedToStr(speed, 4) + "  ffff";
-                LogUtil.debug("轴【" + portName + "】更新速度为【" + speed + "】，发送数据【" + v1 + "】");
+                LogUtil.debug("轴【" + portName + "_" + slvAddr + "】更新速度为【" + speed + "】，发送数据【" + v1 + "】");
                 SendStrAndSleep(portName, v1, SleepMSendons);
                 UpdateAddrValue(portName,slvAddr, ACCMDManager.Speed_Addr, Math.Abs(speed));
                 Thread.Sleep(SleepMSendons);

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1101,19 +1101,9 @@ namespace OnlineStore.DeviceLibrary
                                 {
                                     isWaitScan = false;
                                     IsScanCode = true;
-
-                                    //BeginScannering();
-                                    //判断料盘尺寸 
-                                    if (GetSize() <= 7)
-                                    {
-                                        LogUtil.info(StoreName + "检测到寸料盘，开始扫码");
-                                        GetCameraCode();
-                                    }
-                                    else
-                                    {
-                                        LogUtil.info(StoreName + "检测到大于7寸的料盘，请放入正确的料盘");
-                                        IsScanCode = false;
-                                    }
+                                     
+                                    LogUtil.info(StoreName + "检测到寸料盘，开始扫码");
+                                    GetCameraCode();
                                 }
                             }
                             else