fix

WCS.Entity.Protocol/BCR/IBCR80.cs → WCS.Entity.Protocol/BCR/BCR80.cs

@@ -5,12 +5,12 @@ namespace WCS.Entity.Protocol.BCR
     /// <summary>
     /// 扫码头协议80
     /// </summary>
-    public interface IBCR80 : IProtocol
+    public interface BCR80 : IProtocol
     {
         /// <summary>
         /// 内容
         /// </summary>
-        [StringLength(20)]
+        [StringLength(130)]
         string Content { get; set; }
     }
 }

WCS.Entity.Protocol/BCR/IBCR81.cs → WCS.Entity.Protocol/BCR/BCR81.cs

@@ -5,12 +5,12 @@ namespace WCS.Entity.Protocol.BCR
     /// <summary>
     /// 扫码头协议81
     /// </summary>
-    public interface IBCR81 : IProtocol
+    public interface BCR81 : IProtocol
     {
         /// <summary>
         /// 内容
         /// </summary>
-        [StringLength(20)]
+        [StringLength(130)]
         string Content { get; set; }
     }
 }

WCS.Entity.Protocol/Truss/Truss520.cs

@@ -184,3 +184,4 @@ namespace WCS.Entity.Protocol.Truss
         public short VoucherNo { get; set; }
     }
 }
+ 

WCS.WorkEngineering/Extensions/BCRExtension.cs

@@ -1,7 +1,7 @@
 using PlcSiemens.Core.Extension;
 using ServiceCenter.Logs;
 using WCS.Core;
-using WCS.Entity.Protocol.BCR;
+using WCS.WorkEngineering.Protocol.BCR;
 
 namespace WCS.WorkEngineering.Extensions
 {

WCS.WorkEngineering/Protocol/BCR/IBCR80.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using WCS.Entity.Protocol.BCR;
+
+namespace WCS.WorkEngineering.Protocol.BCR
+{
+    /// <summary>
+    /// 扫码头协议80
+    /// </summary>
+    public interface IBCR80 : BCR80
+    {
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [StringLength(20)]
+        new string Content { get; set; }
+    }
+}

WCS.WorkEngineering/Protocol/BCR/IBCR81.cs

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using WCS.Entity.Protocol.BCR;
+
+namespace WCS.WorkEngineering.Protocol.BCR
+{
+    /// <summary>
+    /// 扫码头协议81
+    /// </summary>
+    public interface IBCR81 : BCR81
+    {
+        /// <summary>
+        /// 内容
+        /// </summary>
+        [StringLength(20)]
+        new string Content { get; set; }
+    }
+}

WCS.Entity.Protocol/BCR/WCS_BCR80.cs → WCS.WorkEngineering/Protocol/BCR/WCS_BCR80.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace WCS.Entity.Protocol.BCR
+namespace WCS.WorkEngineering.Protocol.BCR
 {
     /// <summary>
     /// 读码器读取协议

WCS.Entity.Protocol/BCR/WCS_BCR81.cs → WCS.WorkEngineering/Protocol/BCR/WCS_BCR81.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace WCS.Entity.Protocol.BCR
+namespace WCS.WorkEngineering.Protocol.BCR
 {
     /// <summary>
     /// 读码器写入协议81

WCS.Entity.Protocol/DataStructure/BCRData.cs → WCS.WorkEngineering/Protocol/DataStructure/BCRData.cs

@@ -1,5 +1,5 @@
 using System.Runtime.Serialization;
-using WCS.Entity.Protocol.BCR;
+using WCS.WorkEngineering.Protocol.BCR;
 
 namespace WCS.Entity.Protocol.DataStructure
 {

WCS.Entity.Protocol/DataStructure/StationData.cs → WCS.WorkEngineering/Protocol/DataStructure/StationData.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
-using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.Station;
+using WCS.WorkEngineering.Protocol.BCR;
 
 namespace WCS.Entity.Protocol.DataStructure
 {

WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

@@ -3,12 +3,12 @@ using ServiceCenter.Extensions;
 using ServiceCenter.Redis;
 using System.ComponentModel;
 using WCS.Core;
-using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.DataStructure;
 using WCS.Entity.Protocol.SRM;
 using WCS.Entity.Protocol.Station;
 using WCS.Service.Worlds;
 using WCS.WorkEngineering.Extensions;
+using WCS.WorkEngineering.Protocol.BCR;
 
 namespace WCS.Service.Systems
 {

WCS.WorkEngineering/Systems/GetDeviceSystem.cs

@@ -1,8 +1,8 @@
 using WCS.Core;
-using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.SRM;
 using WCS.Entity.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
+using WCS.WorkEngineering.Protocol.BCR;
 using WCS.WorkEngineering.Worlds;
 
 namespace WCS.WorkEngineering.Systems

WCS.WorkEngineering/Systems/一楼入库工位处理系统.cs

@@ -3,9 +3,9 @@ using ServiceCenter.SqlSugars;
 using System.ComponentModel;
 using WCS.Core;
 using WCS.Entity;
-using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
+using WCS.WorkEngineering.Protocol.BCR;
 using WCS.WorkEngineering.WebApi.Controllers;
 using WCS.WorkEngineering.Worlds;
 using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;

WCS.WorkEngineering/Systems/二楼入库工位处理系统.cs

@@ -4,9 +4,9 @@ using ServiceCenter.SqlSugars;
 using System.ComponentModel;
 using WCS.Core;
 using WCS.Entity;
-using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
+using WCS.WorkEngineering.Protocol.BCR;
 using WCS.WorkEngineering.WebApi.Controllers;
 using WCS.WorkEngineering.Worlds;
 using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;

WCS.WorkEngineering/WorkStart.cs

@@ -1,10 +1,10 @@
 using PlcSiemens.Core.Extension;
 using ServiceCenter;
 using WCS.Core;
-using WCS.Entity.Protocol.BCR;
 using WCS.Entity.Protocol.SRM;
 using WCS.Entity.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
+using WCS.WorkEngineering.Protocol.BCR;
 using WCS.WorkEngineering.Protocol.RGV;
 using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;