AIO的dll更新,托盘处理修改

dll/Asa.IOModule.AIOBOX.xml

@@ -114,7 +114,6 @@
             <summary>
             连接
             </summary>
-            <returns></returns>
         </member>
         <member name="M:Asa.IOModule.AIOBOX.Close">
             <summary>

source/AssemblyLineClient/记录.txt

@@ -156,6 +156,12 @@ agv客户端启动时需要设置状态为none
 横移机构优化，上一个托盘准备离开时，下一个托盘就可以进入。
 
 
+20200227
+AIO的dll更新，增加重连功能。
+托盘横移过程中，提前下降第一个横移顶升。
+上料模块，只有料盘到达流水线上方后才拦截托盘。
+
+
 
 
 

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -716,7 +716,7 @@ namespace OnlineStore.DeviceLibrary
                             TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, param, "扫码失败");
                         }
                         //从服务器获取库位号
-                        string result = SServerManager.CodeReceived(Name, currTrayNum, LastCodeList, LastHeight, LastWidth,CurrShelfId);
+                        string result = SServerManager.CodeReceived(Name, currTrayNum, LastCodeList, LastHeight, LastWidth,CurrShelfId,DeviceID);
                         if (!result.Equals(""))
                         {
                             InOutParam param = new InOutParam(currTrayNum, code, "", LastHeight, LastWidth, true);
@@ -1086,7 +1086,8 @@ namespace OnlineStore.DeviceLibrary
                     if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore))
                     {
                         //入料执行中， 且需要空托盘
-                        if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
+                        if (MoveInfo.MoveStep >= LineMoveStep.FI_20_WaitTray && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
+                        //if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
                             {
                             if (NeedSaveParam)
                             {

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -284,9 +284,10 @@ namespace OnlineStore.DeviceLibrary
                 }
                 if (sidesWayNum.Equals(2))
                 {
+                    LineMoveInfo moveInfo = FeedingEquipMap[104].SecondMoveInfo;
                     if (SW23_MoveInfo.MoveType.Equals(LineMoveType.None))
                     {
-                        LineMoveInfo moveInfo = FeedingEquipMap[104].SecondMoveInfo;
+
                         if (moveInfo.MoveType.Equals(LineMoveType.None))
                         {
                             return true;
@@ -297,6 +298,10 @@ namespace OnlineStore.DeviceLibrary
                         {
                             return true;
                         }
+                    } else if (SW23_MoveInfo.MoveStep .Equals( LineMoveStep.SW12_WaitTrayGo)
+                         && moveInfo.MoveType.Equals(LineMoveType.None))
+                     {
+                        return true;
                     }
                 }
                 else if (sidesWayNum.Equals(3) && runStatus <= LineRunStatus.Wait)
@@ -307,9 +312,10 @@ namespace OnlineStore.DeviceLibrary
 
                 if (sidesWayNum.Equals(4))
                 {
+                    LineMoveInfo moveInfo = FeedingEquipMap[101].SecondMoveInfo;
                     if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None))
                     {
-                        LineMoveInfo moveInfo = FeedingEquipMap[101].SecondMoveInfo;
+                   
                         if (moveInfo.MoveType.Equals(LineMoveType.None))
                         {
                             return true;
@@ -321,6 +327,11 @@ namespace OnlineStore.DeviceLibrary
                             return true;
                         }
                     }
+                    else if (SW41_MoveInfo.Equals( LineMoveStep.SW12_WaitTrayGo)
+                        && moveInfo.MoveType.Equals(LineMoveType.None))
+                    {
+                        return true;
+                    }
                 }
                 else if (sidesWayNum.Equals(3) && runStatus <= LineRunStatus.Wait)
                 {
@@ -591,7 +602,8 @@ namespace OnlineStore.DeviceLibrary
             else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_DriveMotorMove))
             {
                 SW41_MoveInfo.NextMoveStep(LineMoveStep.SW08_WaitOutCheck);
-                SWLog("横移轨道41：等待托盘到达出口     ");
+                SWLog("横移轨道41：收到SW1_TrayCheck，先顶升4下降，等待托盘到达出口     ");
+                CylinderMove(null, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down);
                 SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
                 SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW1_TrayCheck, IO_VALUE.HIGH));
             }
@@ -748,7 +760,8 @@ namespace OnlineStore.DeviceLibrary
             else if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW07_DriveMotorMove))
             {
                 SW23_MoveInfo.NextMoveStep(LineMoveStep.SW08_WaitOutCheck);
-                SWLog("横移轨道23：等待托盘到达出口     ");
+                SWLog("横移轨道23：收到 SW3_TrayCheck，先顶升2下降，,等待托盘到达出口     ");
+                CylinderMove(null, IO_Type.SW2_TopCylinder_Up, IO_Type.SW2_TopCylinder_Down);
                 SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
                 SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW3_TrayCheck, IO_VALUE.HIGH));
             }

source/DeviceLibrary/server/LineServer.cs

@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     IdList.Add(i);
                 }
-                for (int i = 1; i <= 11; i++)
+                for (int i = 1; i <= 10; i++)
                 {
                     IdList.Add(i);
                 }