料架号未读到时不出入库。

source/AssemblyLineClient/记录.txt

 
 20200409
+上料模块，如果么有读到料架号，直接送出料架
+
+20200409
 紧急出料模块，料架离开时，mark=紧急料或者分配料，rfid=料架号
 
 

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -646,14 +646,22 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
                 {
-                    MoveInfo.ShelfNoTray = false;
-                    //定位工位有料架，直接开始入料
-                    MoveInfo.NextMoveStep(LineMoveStep.FI_07_LocationCylinder_Up);
-                    InLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡上升， 定位气缸上升，读取料架号");
-                    IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降 
-                    CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
-
                     UpdateShelfId();
+                    if (CurrShelfId.EndsWith("00"))
+                    { 
+                        MoveInfo.NextMoveStep(LineMoveStep.FI_33_BatchAxisToP1);
+                        InLog("料架号【" + CurrShelfId + "】无效，送出料架，" + MoveInfo.SLog + "：提升伺服到P1点，定位气缸下降");
+                        CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
+                    }
+                    else
+                    {
+                        MoveInfo.ShelfNoTray = false;
+                        //定位工位有料架，直接开始入料
+                        MoveInfo.NextMoveStep(LineMoveStep.FI_07_LocationCylinder_Up);
+                        InLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡上升， 定位气缸上升，读取料架号");
+                        IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降 
+                        CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SL_LocationCylinder_Up);
+                    }
                 }
                 else
                 {
@@ -661,14 +669,14 @@ namespace OnlineStore.DeviceLibrary
                     InLog(" 未检测到料架，入料结束");
                 }
             }
-            else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_05_WaitS))
-            {
-                //定位工位有料架，直接开始入料
-                MoveInfo.NextMoveStep(LineMoveStep.FI_07_LocationCylinder_Up);
-                InLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡上升， 定位气缸上升");
-                IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降 
-                CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
-            }
+            //else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_05_WaitS))
+            //{
+            //    //定位工位有料架，直接开始入料
+            //    MoveInfo.NextMoveStep(LineMoveStep.FI_07_LocationCylinder_Up);
+            //    InLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡上升， 定位气缸上升");
+            //    IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降 
+            //    CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
+            //}
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_07_LocationCylinder_Up))
             {
                 MoveInfo.NextMoveStep(LineMoveStep.FI_08_BatchAxisToP2);

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -226,13 +226,19 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
                 {
-                    //定位工位有料架，直接开始入料
-                    MoveInfo.NextMoveStep(LineMoveStep.FO_05_LocationUp);
-                    OutLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡下降， 定位气缸上升，读取料架号");
-                    IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降  
-                    CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
-
                     UpdateShelfId();
+                    if (CurrShelfId.EndsWith("00"))
+                    {
+                        SendOutShelfOut("料架号【" + CurrShelfId + "】无效");
+                    }
+                    else
+                    {
+                        //定位工位有料架，直接开始入料
+                        MoveInfo.NextMoveStep(LineMoveStep.FO_05_LocationUp);
+                        OutLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡下降， 定位气缸上升，读取料架号");
+                        IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降  
+                        CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
+                    }
                 }
                 else
                 {
@@ -622,19 +628,27 @@ namespace OnlineStore.DeviceLibrary
             // cutReel 为true是分盘料,AGV会拉到到分盘区
             //料串会发到分盘区和紧急料区
             //两个都为false 包装料默认拉到包装线体, 料串默认拉到紧急料区
-            if (MoveInfo.MoveParam.urgentReel)
-            {
-                //紧急料，需要到紧急料区
-                LastOutShelfId = CurrShelfId + ",urgent";
-            }
-            else if (MoveInfo.MoveParam.cutReel)
+            if (CurrShelfId.Equals("00"))
             {
-                //cutReel 为true是分盘料,AGV会拉到到分盘区
-                LastOutShelfId = CurrShelfId + ",cut";
+                //料架号无效送出的，不发mark
+                LastOutShelfId = CurrShelfId + "";
             }
             else
             {
-                LastOutShelfId = CurrShelfId + ",urgent";
+                if (MoveInfo.MoveParam.urgentReel)
+                {
+                    //紧急料，需要到紧急料区
+                    LastOutShelfId = CurrShelfId + ",urgent";
+                }
+                else if (MoveInfo.MoveParam.cutReel)
+                {
+                    //cutReel 为true是分盘料,AGV会拉到到分盘区
+                    LastOutShelfId = CurrShelfId + ",cut";
+                }
+                else
+                {
+                    LastOutShelfId = CurrShelfId + ",urgent";
+                }
             }
             OutLog("紧急出料完成， " + MoveInfo.SLog + "：" + msg + "，送出料串，提升伺服到P2点，重置OutStoreHeight=-1，更新LastOutShelfId=" + LastOutShelfId);
         }

source/DeviceLibrary/model/StoreStep.cs

@@ -580,23 +580,7 @@ namespace OnlineStore.DeviceLibrary
         /// 入口流水线转动，等待定位工位信号稳定1秒
         /// </summary>
         FI_04_WaitTime = 11004,  
-        /// <summary>
-                                  /// 入口流水线转动，等待定位工位信号稳定1秒
-                                  /// </summary>
-        FI_05_WaitS = 11005,
-        ///// <summary>
-        ///// 入口流水线转动，等待阻挡气缸信号到位
-        ///// </summary>
-        //FI_04_LineRunCheck= 11004,
-        ///// <summary>
-        ///// 入口流水线转动，等待入料阻挡信号消失
-        ///// </summary>
-        //FI_05_LineStart = 11005,
-
-        ///// <summary>
-        ///// 入口流水线转动，等待定位工位检测到位
-        ///// </summary>
-        //FI_06_LineRunCheck = 11006,
+       
 
         /// <summary>
         ///入料检测：  工位检测信号，定位气缸上升