1

source/DeviceLibrary/LineConfig/Config_DischargeLine_2.csv

@@ -7,9 +7,9 @@ DI,0,出料皮带线体2复位,DLine_Reset,1,PRO_AOI_IP_3,0,出料皮带线体2复位,X042,X042
 DI,0,皮带线4入口定位检测,EntryLocation_Check1,2,PRO_AOI_IP_3,0,皮带线4入口定位检测,X043,X043
 DI,0,皮带线4入口定位检测,EntryLocation_Check1,2,PRO_AOI_IP_3,0,皮带线4入口定位检测,X043,X043
 DI,0,皮带线4出口定位检测,ExitLocation_Check1,3,PRO_AOI_IP_3,0,皮带线4出口定位检测,X044,X044
 DI,0,皮带线4出口定位检测,ExitLocation_Check1,3,PRO_AOI_IP_3,0,皮带线4出口定位检测,X044,X044
 DI,0,皮带线4出口料盘检测,ExitTray_Check1,4,PRO_AOI_IP_3,0,皮带线4出口料盘检测,X045,X045
 DI,0,皮带线4出口料盘检测,ExitTray_Check1,4,PRO_AOI_IP_3,0,皮带线4出口料盘检测,X045,X045
-DI,0,皮带线5定位检测,EntryLocation_Check2,5,PRO_AOI_IP_3,0,皮带线5定位检测,X046,X046
-DI,0,皮带线5入口定位检测,ExitLocation_Check2,6,PRO_AOI_IP_3,0,皮带线5入口定位检测,X047,X047
-DI,0,皮带线5出口定位检测,ExitTray_Check2,7,PRO_AOI_IP_3,0,皮带线5出口定位检测,X048,X048
+DI,0,皮带线5入口定位检测,EntryLocation_Check2,5,PRO_AOI_IP_3,0,皮带线5入口定位检测,X046,X046
+DI,0,皮带线5出口定位检测,ExitLocation_Check2,6,PRO_AOI_IP_3,0,皮带线5出口定位检测,X047,X047
+DI,0,皮带线5出口料盘检测,ExitTray_Check2,7,PRO_AOI_IP_3,0,皮带线5出口料盘检测,X048,X048
 DI,0,皮带线6定位检测,Location_Check3,8,PRO_AOI_IP_3,0,皮带线6定位检测,X049,X049
 DI,0,皮带线6定位检测,Location_Check3,8,PRO_AOI_IP_3,0,皮带线6定位检测,X049,X049
 DI,0,皮带线6入口料盘检测,EntryTray_Check3,9,PRO_AOI_IP_3,0,皮带线6入口料盘检测,X050,X050
 DI,0,皮带线6入口料盘检测,EntryTray_Check3,9,PRO_AOI_IP_3,0,皮带线6入口料盘检测,X050,X050
 DI,0,皮带线6中间位置料盘检测,MiddleTray_Check3,10,PRO_AOI_IP_3,0,皮带线6中间位置料盘检测,X051,X051
 DI,0,皮带线6中间位置料盘检测,MiddleTray_Check3,10,PRO_AOI_IP_3,0,皮带线6中间位置料盘检测,X051,X051

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
             CheckAndMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
             if (DeviceID.Equals(302))
             if (DeviceID.Equals(302))
             {
             {
-                CylinderMove(MoveInfo, IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before);
+                CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
             }
             }
             if (IsDebug)
             if (IsDebug)
             {
             {

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -387,7 +387,7 @@ namespace OnlineStore.DeviceLibrary
             { 
             { 
                 LogInfo(" 上升横移机构 ");
                 LogInfo(" 上升横移机构 ");
             }
             }
-            //CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
+            CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
         }
         }
         internal override void CloseCylinderStop()
         internal override void CloseCylinderStop()
         {
         {

source/DeviceLibrary/assemblyLine/OutTrayLineBean.cs

@@ -57,16 +57,20 @@ namespace OnlineStore.DeviceLibrary
             Line3CanRun = true;
             Line3CanRun = true;
         }
         }
         #region 出库处理
         #region 出库处理
-        private string posId = ""; 
-        public bool StartOut(InOutParam moveParam )
-        { 
-            if (MoveInfo.MoveType.Equals(LineMoveType.None)&& equipBean.runStatus>LineRunStatus.HomeMoving)
+        private string posId = "";
+        public bool StartOut(InOutParam moveParam)
+        {
+            if (MoveInfo.MoveType.Equals(LineMoveType.None) && equipBean.runStatus > LineRunStatus.HomeMoving)
             {
             {
                 MoveInfo.MoveParam = moveParam;
                 MoveInfo.MoveParam = moveParam;
                 MoveInfo.NewMove(LineMoveType.OutStore);
                 MoveInfo.NewMove(LineMoveType.OutStore);
                 posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
                 posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
                 MoveInfo.NextMoveStep(LineMoveStep.DLO_01_WaitEntryNoTray);
                 MoveInfo.NextMoveStep(LineMoveStep.DLO_01_WaitEntryNoTray);
-                LogUtil.info(Name + "开始出料【" + moveParam.PosId + "】处理：" + MoveInfo.SLog + "等待入口无料盘");
+                LogUtil.info(Name + "开始出料【" + moveParam.PosId + "】处理：" + MoveInfo.SLog + "等待入口无料盘，NG气缸后退");
+                if (equipBeanId.Equals(302) && EntryLocation_Check.Equals(IO_Type.EntryLocation_Check2))
+                {
+                    equipBean.CylinderMove(MoveInfo, IO_Type.NGCylinder_Before, IO_Type.NGCylinder_After);
+                }
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 return true;
                 return true;
             }
             }