启动流水线伺服错误修改

source/DeviceLibrary/baan/AxisBean.cs

@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     LogUtil.error(MoveInfo.Name + axis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + MoveInfo.CanWhileCount + "]次");
                     LogUtil.error(MoveInfo.Name + axis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，重新回原点，剩余[" + MoveInfo.CanWhileCount + "]次");
                     //LogUtil.error( StoreName +  moveAxis.DisplayStr +  "重新回原点"); 
                     //LogUtil.error( StoreName +  moveAxis.DisplayStr +  "重新回原点"); 
-                    ACServerManager.HomeMove(axis.DeviceName, axis.GetAxisValue(), axis.HomeHighSpeed);
+                    ACServerManager.HomeMove(axis.DeviceName, axis.GetAxisValue(), axis.HomeHighSpeed,true);
                     MoveInfo.CanWhileCount--;
                     MoveInfo.CanWhileCount--;
                 }
                 }
                 else
                 else

source/DeviceLibrary/deviceLibrary/PanasonicServo/ACServerManager.cs

@@ -307,19 +307,19 @@ namespace OnlineStore.DeviceLibrary
             OpenAndCloseSTB(portName, slvAddr);
             OpenAndCloseSTB(portName, slvAddr);
         }
         }
 
 
-        public static void HomeMove(string portName, int slvAddr, int speed)
+        public static void HomeMove(string portName, int slvAddr, int speed,bool mustMove=false)
         {
         {
             try
             try
             {
             {
                 //先判断是否在原点，如果已经在原点，先向正方向走2000
                 //先判断是否在原点，如果已经在原点，先向正方向走2000
                 int homeSingle = GetHomeSingle(portName, slvAddr);
                 int homeSingle = GetHomeSingle(portName, slvAddr);
-                if (homeSingle.Equals(1))
+                if (homeSingle.Equals(1)||mustMove)
                 {
                 {
                     int isHomeEnd = GetHomeEndStatus(portName, slvAddr);
                     int isHomeEnd = GetHomeEndStatus(portName, slvAddr);
                     if (isHomeEnd.Equals(1))
                     if (isHomeEnd.Equals(1))
                     {
                     {
                         int value = 2000; 
                         int value = 2000; 
-                        LogUtil.info("轴【" + portName +"_"+slvAddr +"】原点返回时发现原点已亮且回过原点，需要先相对走" + value);
+                        LogUtil.info("轴【" + portName +"_"+slvAddr +"】"+ mustMove + "  HomeMove，需要先相对走" + value);
                         RelMove(portName, slvAddr, value);
                         RelMove(portName, slvAddr, value);
                         bool isStop = false;
                         bool isStop = false;
                         for (int i = 0; i <= 10; i++)
                         for (int i = 0; i <= 10; i++)
@@ -342,7 +342,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         int volSpeed =Math.Abs( speed / 5);
                         int volSpeed =Math.Abs( speed / 5);
                         int time = 1500;
                         int time = 1500;
-                        LogUtil.info("轴【" + portName + "_" + slvAddr + "】原点返回时发现原点已亮但未回过原点，先匀速向上走"+time+"，速度["+ volSpeed + "]" );
+                        LogUtil.info("轴【" + portName + "_" + slvAddr + "】" + mustMove + "  HomeMove，先匀速向上走" + time+"，速度["+ volSpeed + "]" );
                   
                   
                         //需要匀速向上走
                         //需要匀速向上走
                         ACServerManager.SpeedMove(portName, slvAddr, volSpeed);
                         ACServerManager.SpeedMove(portName, slvAddr, volSpeed);