Administrator 2 anni fa
parent
commit
deda0cb1bd

+ 3 - 3
Projects/永冠OPP/WCS.Entity.Protocol/RGV/IRGV521.cs

@@ -159,8 +159,8 @@ namespace WCS.Entity.Protocol
         备用3 = 1 << 10,
         备用4 = 1 << 11,
         备用5 = 1 << 12,
-        备用6 = 1 << 13,
-        备用7 = 1 << 14,
-        备用8 = 1 << 15,
+        载货 = 1 << 13,
+        RGV输送线反转 = 1 << 14,
+        RGV输送线正转 = 1 << 15,
     }
 }

+ 4 - 2
Projects/永冠OPP/WCS.Entity.Protocol/RGV/IRGV523.cs

@@ -1,4 +1,5 @@
-using WCS.Entity.Protocol.RGV;
+using System;
+using WCS.Entity.Protocol.RGV;
 
 namespace WCS.Entity.Protocol
 {
@@ -25,7 +26,7 @@ namespace WCS.Entity.Protocol
         /// <summary>
         /// 环穿状态
         /// </summary>
-         RGVStatus Status { get; set; }
+         RGVStatus3 Status { get; set; }
 
         /// <summary>
         /// 工位1状态
@@ -36,5 +37,6 @@ namespace WCS.Entity.Protocol
         /// 工位2状态
         /// </summary>
          RGVPlatformStatus Status2 { get; set; }
+       
     }
 }

+ 17 - 17
Projects/永冠OPP/WCS.Entity.Protocol/RGV/RGVEnum.cs

@@ -95,24 +95,24 @@ namespace WCS.Entity.Protocol.RGV
     /// RGV状态
     /// </summary>
     [Flags]
-    public enum RGVStatus : ushort
+    public enum RGVStatus3 : ushort
     {
-        RGV与站台交互完成 = 1 << 0,
-        RGV前方有障暂停运行 = 1 << 1,
-        RGV = 1 << 2,
-        RGV2 = 1 << 3,
-        RGV3 = 1 << 4,
-        RGV4 = 1 << 5,
-        RGV5 = 1 << 6,
-        RGV6 = 1 << 7,
-        RGV运行 = 1 << 8,
-        RGV移动中 = 1 << 9,
-        RGV取货中 = 1 << 10,
-        RGV放货中 = 1 << 11,
-        RGV变址运行 = 1 << 12,
-        RGV定位完成 = 1 << 13,
-        RGV有货光电 = 1 << 14,
-        RGV与站台交互中 = 1 << 15,
+        运行 = 1 << 0,
+        移动 = 1 << 1,
+        取货 = 1 << 2,
+        放货 = 1 << 3,
+        变址 = 1 << 4,
+        定位完成 = 1 << 5,
+        有货光电 = 1 << 6,
+        站台交互中 = 1 << 7,
+        站台交互完成 = 1 << 8,
+        小车暂停 = 1 << 9,
+        输送线完成 = 1 << 10,
+        任务完成 = 1 << 11,
+        备用1 = 1 << 12,
+        备用2 = 1 << 13,
+        备用3 = 1 << 14,
+        备用4 = 1 << 15,
     }
 
     /// <summary>

+ 1 - 1
Projects/永冠OPP/WCS.Entity.Protocol/RGV/WCS_RGV523.cs

@@ -19,7 +19,7 @@ namespace WCS.Entity.Protocol
         public RGVPlatformFault Fault2 { get; set; }
 
         [DataMember(Order = 3)]
-        public RGVStatus Status { get; set; }
+        public RGVStatus3 Status { get; set; }
 
         [DataMember(Order = 4)]
         public RGVPlatformStatus Status1 { get; set; }