1

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -777,10 +777,7 @@ namespace OnlineStore.DeviceLibrary
                         default: break;
                     }
 
-                    SideWayTimerProcess();
-
-                    CodeProcess();
-
+                    SideWayTimerProcess(); 
                 }
             }
             catch (Exception ex)

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -266,13 +266,7 @@ namespace OnlineStore.DeviceLibrary
         }
 
         #endregion
-        #region 扫码处理
-
-        private void CodeProcess()
-        {
-
-        }
-        #endregion
+     
 
         #region 出库
 
@@ -407,8 +401,7 @@ namespace OnlineStore.DeviceLibrary
         private bool SideWay41IsWait = false;
         private DateTime SideWay23Ntime = DateTime.Now;
         private bool SideWay23IsWait = false;
-
-
+         
         private bool sdIsInprocess = false;
         private DateTime sdlastProTime = DateTime.Now;
         private void SideWayTimerProcess()
@@ -430,9 +423,7 @@ namespace OnlineStore.DeviceLibrary
                     return;
                 }
                 if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None))
-                {
-
-
+                { 
                     if (IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW) &&
                         TrayManager.CanMoveSidesWay(4) && TrayManager.CanMoveSidesWay(1))
                     {
@@ -448,29 +439,24 @@ namespace OnlineStore.DeviceLibrary
                             CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
                             CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
                         }
-                        else if (IOValue(IO_Type.SW4_StopCheck).Equals(IO_VALUE.HIGH) &&
-                     IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.LOW) &&
-                     IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW) &&
-                  TrayManager.CanMoveSidesWay(4) && TrayManager.CanMoveSidesWay(1))
+                    }
+                    else if (IOValue(IO_Type.SW4_StopCheck).Equals(IO_VALUE.HIGH) &&
+                 IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.LOW) &&
+                 IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW) &&
+              TrayManager.CanMoveSidesWay(4) && TrayManager.CanMoveSidesWay(1))
+                    {
+                        TimeSpan span14 = DateTime.Now - SideWay41Ntime;
+                        if (SideWay41IsWait && span14.TotalSeconds > 1)
                         {
-                            TimeSpan span14 = DateTime.Now - SideWay41Ntime;
-                            if (SideWay41IsWait && span14.TotalSeconds > 1)
-                            {
-                                // TrayManager.UpdateSWState(4, 4);
-                                //TrayManager.UpdateSWState(1, 4);
-                                SW41_MoveInfo.NewMove(LineMoveType.InStore);
-                                SW41_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopDown);
-                                SWLog("横移轨道41：检测到SW4_StopCheck， 等待1000，定位气缸下降     ");
-                                IOMove(IO_Type.SW4_StopDown, IO_VALUE.HIGH);
-                                //  SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
-                                CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
-                                CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
-                            }
-                            else if (!SideWay41IsWait)
-                            {
-                                SideWay41IsWait = true;
-                                SideWay41Ntime = DateTime.Now;
-                            }
+                            // TrayManager.UpdateSWState(4, 4);
+                            //TrayManager.UpdateSWState(1, 4);
+                            SW41_MoveInfo.NewMove(LineMoveType.InStore);
+                            SW41_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopDown);
+                            SWLog("横移轨道41：检测到SW4_StopCheck， 等待1000，定位气缸下降     ");
+                            IOMove(IO_Type.SW4_StopDown, IO_VALUE.HIGH);
+                            //  SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
+                            CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
+                            CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
                         }
                         else if (!SideWay41IsWait)
                         {
@@ -478,6 +464,11 @@ namespace OnlineStore.DeviceLibrary
                             SideWay41Ntime = DateTime.Now;
                         }
                     }
+                    else if (!SideWay41IsWait)
+                    {
+                        SideWay41IsWait = true;
+                        SideWay41Ntime = DateTime.Now; 
+                    }
                     else
                     {
                         SideWay41IsWait = false;
@@ -487,11 +478,9 @@ namespace OnlineStore.DeviceLibrary
                 {
                     SideWay41IsWait = false;
                     SideWay41BusyProcess();
-                }
-
+                } 
                 if (SW23_MoveInfo.MoveType.Equals(LineMoveType.None))
-                {
-
+                { 
                     //检测到阻挡夹具信号后，阻挡气缸下降，等待有夹具信号，阻挡气缸上升，
                     //顶升气缸上升到位，开始流水线转动，检测到出口信号后，停止转动，顶升气缸下降，阻挡4下降，盘通过
                     if (IOValue(IO_Type.SW2_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SW3_TrayCheck).Equals(IO_VALUE.LOW) &&
@@ -656,8 +645,7 @@ namespace OnlineStore.DeviceLibrary
         }
         private bool CheckTrayIsNeed(int deviceId)
         {
-            //横移1对应入料1
-
+            //横移1对应入料1 
             if (FeedingEquipMap.ContainsKey(deviceId))
             {
                 FeedingEquip equip = FeedingEquipMap[deviceId];
@@ -696,7 +684,6 @@ namespace OnlineStore.DeviceLibrary
                 SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 CylinderMove(SW23_MoveInfo, IO_Type.SW2_TopCylinder_Down, IO_Type.SW2_TopCylinder_Up);
                 CylinderMove(SW23_MoveInfo, IO_Type.SW3_TopCylinder_Down, IO_Type.SW3_TopCylinder_Up);
-
             }
             else if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_TopCylinderUp))
             {
@@ -773,11 +760,9 @@ namespace OnlineStore.DeviceLibrary
             LogUtil.debug(Name + msg);
         }
         #endregion
-
-
+         
         #region 料仓出入库逻辑处理
-
-
+         
         /// <summary>--
         /// BOX出入库完成事件
         /// </summary>