中心收卷v0.8

Project.FLY.Winder_20190413/FLY.Winder.UI.Client/Properties/AssemblyInfo.cs

@@ -51,5 +51,6 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.2.0.1")]
+[assembly: AssemblyFileVersion("1.2.0.1")]
+[assembly: Guid("42C0587A-7258-4AA0-B23E-F76CCC3547E6")]

Project.FLY.Winder_20190413/FLY.Winder.UI.Server/Properties/AssemblyInfo.cs

@@ -51,5 +51,6 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.1")]
+[assembly: AssemblyFileVersion("1.2.0.1")]
+[assembly: Guid("0CE35EA7-927A-41C0-9DC6-80511329760B")]

Project.FLY.Winder_20190413/FLY.Winder/Common/WinderInsideOutside.cs

@@ -323,7 +323,7 @@ namespace FLY.Winder.Common
         public float EPAirPressure { get; set; }
 
         /// <summary>
-        /// 收卷压辊分写(┷）
+        /// 收卷压辊分离写(┷）
         /// </summary>
         public bool EPRollerSeparateSet { get; set; }
 

Project.FLY.Winder_20190413/FLY.Winder/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.1")]
+[assembly: AssemblyFileVersion("1.2.0.1")]

Resource/收卷/中央收卷_设备连接变量表_20191206/Generated/WS.xml

@@ -97,8 +97,8 @@
     <PLCVariable DeviceIndex="0" Mode="0" Addr="153" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="PressureArmOffset" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="125" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="PushRod" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="121" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="PushRod" />
-    <PLCVariable DeviceIndex="0" Mode="0" Addr="2500" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsTongManual" />
-    <PLCVariable DeviceIndex="0" Mode="0" Addr="2501" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsTongManual" />
+    <PLCVariable DeviceIndex="0" Mode="0" Addr="2500" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsTongAuto" />
+    <PLCVariable DeviceIndex="0" Mode="0" Addr="2501" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsTongAuto" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="160" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="TongClamp" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="240" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="TongClamp" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="161" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="TongLoosen" />
@@ -205,8 +205,8 @@
     <PLCVariable DeviceIndex="0" Mode="4" Addr="288" Type="float" Scale="1" OwnerName="Items[1]" PropertyName="EPAirPressure" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="166" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="EPRollerSeparateSet" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="167" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="EPRollerSeparateSet" />
-    <PLCVariable DeviceIndex="0" Mode="0" Addr="64570" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsEPRollerSeparated" />
-    <PLCVariable DeviceIndex="0" Mode="0" Addr="64571" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsEPRollerSeparated" />
+    <PLCVariable DeviceIndex="0" Mode="0" Addr="64570" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsEPRollerClosed" />
+    <PLCVariable DeviceIndex="0" Mode="0" Addr="64571" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsEPRollerClosed" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3402" Type="float" Scale="1" OwnerName="Items[0]" PropertyName="CenterFrictionalComp" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3412" Type="float" Scale="1" OwnerName="Items[1]" PropertyName="CenterFrictionalComp" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3400" Type="float" Scale="1" OwnerName="Items[0]" PropertyName="CenterTensionFactor" />

Resource/收卷/中央收卷_设备连接变量表_20191206/Generated/WinderInsideOutside.cs

@@ -58,9 +58,9 @@ namespace FLY.Winder.Common
         public bool PushRod { get; set; }
 
         /// <summary>
-        /// 抓手手动
+        /// 抓手自动
         /// </summary>
-        public bool IsTongManual { get; set; }
+        public bool IsTongAuto { get; set; }
 
         /// <summary>
         /// 抓手夹紧(┷）
@@ -323,14 +323,14 @@ namespace FLY.Winder.Common
         public float EPAirPressure { get; set; }
 
         /// <summary>
-        /// 收卷压辊分写(┷）
+        /// 收卷压辊分离写(┷）
         /// </summary>
         public bool EPRollerSeparateSet { get; set; }
 
         /// <summary>
-        /// 收卷压辊分读
+        /// 收卷压辊闭合读
         /// </summary>
-        public bool IsEPRollerSeparated { get; set; }
+        public bool IsEPRollerClosed { get; set; }
 
         /// <summary>
         /// 中心摩擦补偿 0~9999 {0:F0}