上料模块优化。io使用最新dll

source/AssemblyLineClient/FrmEquipBase.cs

@@ -125,6 +125,7 @@ namespace OnlineStore.AssemblyLine
         {
         {
             if (equipBase.runStatus >= (LineRunStatus.HomeMoving))
             if (equipBase.runStatus >= (LineRunStatus.HomeMoving))
             {
             {
+                LogUtil.info(equipBase.Name + "点击 ：复位");
                 equipBase.Reset();
                 equipBase.Reset();
             }
             }
             else
             else

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -939,10 +939,18 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_28_CylinderUp))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_28_CylinderUp))
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.FI_29_UpDownAxisToP1);
                 MoveInfo.NextMoveStep(LineMoveStep.FI_29_UpDownAxisToP1);
-                InLog("料盘移栽" + MoveInfo.SLog + "：升降伺服到P1点");
+                //   InLog("料盘移栽" + MoveInfo.SLog + "：升降伺服到P1点");
                 TrayMoveOk(true);
                 TrayMoveOk(true);
+                if (!UpdownAxis.IsInPosition(Config.UpDownAxisP1))
+                {
+                    InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P1点，托盘放行");
                     UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
                     UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
                 }
                 }
+                else
+                {
+                    InLog("料盘移栽" + MoveInfo.SLog + "：升降轴已在P1点，托盘放行");
+                }
+            }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_29_UpDownAxisToP1))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_29_UpDownAxisToP1))
             {
             {
                 if (getPosTask == null || getPosTask.IsCompleted)
                 if (getPosTask == null || getPosTask.IsCompleted)
@@ -1064,8 +1072,8 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
                         else if (result.Result.Equals(99) || result.Result.Equals(100))
                         else if (result.Result.Equals(99) || result.Result.Equals(100))
                         {
                         {
-                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 结果【" + result.Result + "】，等待1s后重新获取");
-                            Thread.Sleep(1000);
+                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 结果【" + result.Result + "】，等待3s后重新获取");
+                            Thread.Sleep(3000);
                         }
                         }
                         else if (!result.Msg.Equals("") )
                         else if (!result.Msg.Equals("") )
                         {
                         {
@@ -1094,14 +1102,21 @@ namespace OnlineStore.DeviceLibrary
             MoveInfo.NextMoveStep(LineMoveStep.FI_28_CylinderUp);
             MoveInfo.NextMoveStep(LineMoveStep.FI_28_CylinderUp);
             MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
             MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
             CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
             CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
+            //如果是小料盘，且升降轴需要上升，
+            string upLog = "";
+            if (LastWidth.Equals(7) && LastHeight.Equals(8))
+            {
+                upLog = " ，7X8盘，升降轴到待机位P1  ";
+                UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
+            }
             if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
             if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
             {
             {
-                InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升，上料轴开始慢速上升到P3点，等待检测到料盘");
+                InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升，上料轴开始慢速上升到P3点" + upLog);
                 BatchAxisToP3(false);
                 BatchAxisToP3(false);
             }
             }
             else
             else
             {
             {
-                InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升 ");
+                InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升 " + upLog);
             }
             }
         }
         }
         private void TrayPreMove()
         private void TrayPreMove()

source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs

@@ -103,7 +103,7 @@ namespace OnlineStore.DeviceLibrary
                 aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ;
                 aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ;
                 aioBox.DO_Changed_Event += AioBox_DO_Changed_Event;
                 aioBox.DO_Changed_Event += AioBox_DO_Changed_Event;
 
 
-                LogUtil.info("开始连接：" + logName + "："  );
+                LogUtil.info("开始连接：" + logName + "：");
                 aioBox.Connect();
                 aioBox.Connect();
 
 
                 AIOMap.Add(ioIp, aioBox);
                 AIOMap.Add(ioIp, aioBox);