入料bug修改

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -27,7 +27,14 @@ namespace OnlineStore.DeviceLibrary
             baseConfig = config;
             baseConfig = config;
             this.Config = config;
             this.Config = config;
             IsDebug = config.IsDebug.Equals(1);
             IsDebug = config.IsDebug.Equals(1);
-            Name = (" " + "入料T" + DeviceID % 100 + " ").ToUpper();
+            if (config.IsCanOut.Equals(1))
+            {
+                Name = (" " + "出料T" + DeviceID % 100 + " ").ToUpper();
+            }
+            else
+            {
+                Name = (" " + "入料T" + DeviceID % 100 + " ").ToUpper();
+            }
             Init();
             Init();
             UseAxis = true;
             UseAxis = true;
 
 

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -567,6 +567,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info(Name + MoveInfo.SLog + logName + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + code + "]");
                 LogUtil.info(Name + MoveInfo.SLog + logName + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + code + "]");
                 string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
                 string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
                 MoveInfo.EndMove();
                 MoveInfo.EndMove();
+                runStatus = LineRunStatus.Runing;
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_16_ReelArrive))
             else if (MoveInfo.IsStep(LineMoveStep.JM_16_ReelArrive))
             {
             {
@@ -580,6 +581,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     ClearTimeoutAlarm("给服务器发送afterPutCutTask完成");
                     ClearTimeoutAlarm("给服务器发送afterPutCutTask完成");
                     MoveInfo.EndMove();
                     MoveInfo.EndMove();
+                    runStatus = LineRunStatus.Runing;
                     OutLog(logName + MoveInfo.SLog + "：结束 ");
                     OutLog(logName + MoveInfo.SLog + "：结束 ");
                 }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 else if (MoveInfo.IsTimeOut(60))

source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs

@@ -244,9 +244,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else
                 else
                 {
                 {
-                    T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
-                    T3C1_Log("托盘检测" + T3C1_MoveInfo.SLog + " ，托盘号【" + T3C1_TrayNum + "】,直接放盘通过，顶升气缸下降 ");
-                    CylinderMove(T3C1_MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
+                    MO_14_TopDown();
                 }
                 }
             }
             }
 
 
@@ -288,7 +286,12 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             #endregion
             #endregion
         }
         }
-
+        private void MO_14_TopDown()
+        {
+            T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
+            T3C1_Log("托盘检测" + T3C1_MoveInfo.SLog + " ，托盘号【" + T3C1_TrayNum + "】,直接放盘通过，顶升气缸下降 ");
+            CylinderMove(T3C1_MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
+        }
         private void MO_16_Stop2Down()
         private void MO_16_Stop2Down()
         {
         {
             T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
             T3C1_MoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
@@ -342,7 +345,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             if (T3C1TrayIsReady())
             if (T3C1TrayIsReady())
             {
             {
-                MO_16_Stop2Down();
+                MO_14_TopDown();
             }
             }
         }
         }
     }
     }