批量上料轴匀速上升修改

source/DeviceLibrary/PanasonicServo/BatchAxisController.cs

@@ -23,6 +23,7 @@ namespace OnlineStore.DeviceLibrary
                 checkTimer.AutoReset = true;
                 checkTimer.AutoReset = true;
                 checkTimer.Interval += 50;
                 checkTimer.Interval += 50;
                 checkTimer.Elapsed += CheckTimer_Elapsed;
                 checkTimer.Elapsed += CheckTimer_Elapsed;
+                checkTimer.Enabled = false;
             } 
             } 
             checkTimer.Start(); 
             checkTimer.Start(); 
             return true;
             return true;
@@ -48,11 +49,11 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info("批量上料轴，检测到上料机构料盘信号，可以停止运动");
                 LogUtil.info("批量上料轴，检测到上料机构料盘信号，可以停止运动");
                 result = true;
                 result = true;
             }
             }
-            else if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
-            { 
-                LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动");
-                result = true; 
-            }
+            //else if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
+            //{ 
+            //    LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动");
+            //    result = true; 
+            //}
             if (result)
             if (result)
             {
             {
                 //AutoAxisIsMove = 0;
                 //AutoAxisIsMove = 0;
@@ -60,7 +61,7 @@ namespace OnlineStore.DeviceLibrary
                 ACServerManager.SuddenStop(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue());
                 ACServerManager.SuddenStop(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue());
                 StopCheck();
                 StopCheck();
             }
             }
-            IsInProcess = true; 
+            IsInProcess = false ; 
         }
         }
     }
     }
 }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1608,8 +1608,15 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             if (resultOperation.op.Equals(2))
             if (resultOperation.op.Equals(2))
             {
             {
+                try
+                {
                     doOutStore(resultOperation);
                     doOutStore(resultOperation);
                 }
                 }
+                catch (Exception ex)
+                {
+                    LogUtil.error("处理服务器出库消息出错：" + ex.ToString());
+                }
+            }
             else if (resultOperation.data != null)
             else if (resultOperation.data != null)
             {
             {
                 string result = "";
                 string result = "";

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -240,12 +240,12 @@ namespace OnlineStore.DeviceLibrary
             bool result = false;
             bool result = false;
             if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
             if (KND.IOValue(IO_Type.TrayCheck_LoadMaterial).Equals(IO_VALUE.HIGH))
             {
             {
-                LogUtil.info(wait.ToStr() + "检测到上料机构料盘信号，可以停止运动");
+                LogUtil.info(wait.ToStr() + "  检测到上料机构料盘信号，可以停止运动");
                 result = true;
                 result = true;
             }
             }
             else if (ACServerManager.GetLimitPositiveSingle(wait.AxisInfo).Equals(1))
             else if (ACServerManager.GetLimitPositiveSingle(wait.AxisInfo).Equals(1))
             {
             {
-                LogUtil.info(wait.ToStr() + "检测到正极限信号，可以停止运动");
+                LogUtil.info(wait.ToStr() + "  检测到正极限信号，可以停止运动");
                 result = true;
                 result = true;
             }
             }
             if (result)
             if (result)
@@ -322,9 +322,18 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 if (!code.Equals(""))
                 if (!code.Equals(""))
                 {
                 {
+                    //msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr + spiltStr;
+                    //演示机不需要发尺寸
+                    if (StoreManager.Config.Default_TrayWidth.Equals(0))
+                    {
+                        msg = msg + code + spiltStr + spiltStr;
+                    }
+                    else
+                    {
                         msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr + spiltStr;
                         msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr + spiltStr;
                     }
                     }
                 }
                 }
+            }
             return msg;
             return msg;
         }
         }
         //=1+0x0-13x24=201810220856;025;5N02018101;121;700012865;92498;1800;##
         //=1+0x0-13x24=201810220856;025;5N02018101;121;700012865;92498;1800;##