林豪 左 1 year ago
parent
commit
9786635d38

+ 5 - 2
ServiceCenter/ServiceCenter.csproj

@@ -20,8 +20,11 @@
     <PackageReference Include="PlcSiemens" Version="1.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
-    <PackageReference Include="WCS.Core" Version="1.0.2.7" />
-    <PackageReference Include="WCS.Entity" Version="1.0.4.5" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\WCS.Core\WCS.Core.csproj" />
+    <ProjectReference Include="..\WCS.Entity\WCS.Entity.csproj" />
   </ItemGroup>
 
 </Project>

+ 4 - 1
WCS.Entity/WCS.Entity.csproj

@@ -15,8 +15,11 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.140" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\Code\SqlSugar\Src\Asp.NetCore2\SqlSugar\SqlSugar.csproj" />
+  </ItemGroup>
 
 </Project>

+ 0 - 1
业务工程/分拣库/WCS.Entity.Protocol/Robot/IRobot522.cs

@@ -13,7 +13,6 @@ namespace WCS.Entity.Protocol.Robot
         /// <summary>
         ///  报警
         /// </summary>
-        [SugarColumn(ColumnDataType = "LONG256")]
         public RobotAlarm Alarm { get; set; }
     }
 }

+ 1 - 1
业务工程/分拣库/WCS.Entity.Protocol/Robot/WCS_Robot522.cs

@@ -10,7 +10,7 @@ namespace WCS.Entity.Protocol.Robot
     public class WCS_Robot522 :  IRobot522
     {
         [DataMember(Order = 0)]
-        [SugarColumn(ColumnDataType = "LONG256")]
+        [SugarColumn(ColumnDataType = "double")]
         public RobotAlarm Alarm { get; set; }
 
         [DataMember(Order = 1)]

+ 7 - 1
业务工程/分拣库/WCS.Entity.Protocol/SRM/SrmEnum.cs

@@ -286,7 +286,7 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [Description("堆垛机报警项")]
     [Flags]
-    public enum SrmAlarm : ulong
+    public enum SrmAlarm : long
     {
         /// <summary>
         ///  无
@@ -671,5 +671,11 @@ namespace WCS.Entity.Protocol.SRM
         /// </summary>
         [Description("安全门急停")]
         安全门急停 = 1L << 62,
+
+        /// <summary>
+        ///  安全门急停
+        /// </summary>
+        [Description("安全门急停")]
+        安全门急停1 = 1L << 63,
     }
 }

+ 2 - 2
业务工程/分拣库/WCS.Entity.Protocol/SRM/WCS_SRM537.cs

@@ -9,11 +9,11 @@ namespace WCS.Entity.Protocol.SRM
     /// </summary>
     [DataContract]
     [SugarTable("FJ_SRM537")]
-    public class WCS_SRM537 :  ISRM537
+    public class WCS_SRM537 : ISRM537
     {
         /// <inheritdoc/>
         [DataMember(Order = 0)]
-        [SugarColumn(ColumnDataType = "LONG256")]
+        [SugarColumn(ColumnDataType = "double")]
         public SrmAlarm Alarm { get; set; }
 
         [DataMember(Order = 1)]

+ 0 - 1
业务工程/分拣库/WCS.Entity.Protocol/Truss/ITruss523.cs

@@ -12,7 +12,6 @@ namespace WCS.Entity.Protocol.Truss
         ///  报警内容
         /// </summary>
         [Description("报警内容")]
-        [SugarColumn(ColumnDataType = "LONG256")]
         TrussAlarm Alarm { get; set; }
     }
 }

+ 2 - 2
业务工程/分拣库/WCS.Entity.Protocol/Truss/WCS_Truss523.cs

@@ -6,10 +6,10 @@ namespace WCS.Entity.Protocol.Truss
 {
     [DataContract]
     [SugarTable("FJ_Truss523")]
-    public class WCS_Truss523 :  ITruss523
+    public class WCS_Truss523 : ITruss523
     {
         [DataMember(Order = 0)]
-        [SugarColumn(ColumnDataType = "long256")]
+        [SugarColumn(ColumnDataType = "double")]
         public TrussAlarm Alarm { get; set; }
 
         [DataMember(Order = 1)]

+ 4 - 1
业务工程/分拣库/WCS.Entity.Protocol/WCS.Entity.Protocol.csproj

@@ -15,8 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.140" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\..\Code\SqlSugar\Src\Asp.NetCore2\SqlSugar\SqlSugar.csproj" />
+  </ItemGroup>
+
 </Project>