# 和美安装包_v7.8.5.2-20240120

Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs

@@ -799,7 +799,7 @@ namespace FLY.Thick.Blowing.Server
                     return;
             }
 
-            DateTime now = DateTime.Now;
+            DateTime time = DateTime.Now;
             DateTime sysTime = flyad.Now;
             int globalRPos = GlobalRPos;
             double speed = RSpeed_real;
@@ -807,13 +807,13 @@ namespace FLY.Thick.Blowing.Server
             if (mRPosList.Count() > 0)//1秒记录一次
             {
                 var lastPosData = mRPosList.Last();
-                if (now - lastPosData.Time < TimeSpan.FromSeconds(1))
+                if (time - lastPosData.Time < TimeSpan.FromSeconds(1))
                 {
                     return;
                 }
             }
 
-            mRPosList.RAdd(new RPosData() { Time = now, SysTime = sysTime, Speed = speed, GlobalRPos = globalRPos });
+            mRPosList.RAdd(new RPosData() { Time = time, SysTime = sysTime, Speed = speed, GlobalRPos = globalRPos });
 
 
             //必须在 0~RPosOfR 范围内

Project.FLY.Weight/FLY.Weight.UI.Server/PgMain.xaml.cs

@@ -32,7 +32,7 @@ namespace FLY.Weight.UI.Server
             this.gage = gage;
 
             grid_WeightSystem.DataContext = gage.mData;
-            //sp_sysParam.DataContext = gage.mSysParam;
+            sp_sysParam.DataContext = gage.mSysParam;
             itemcontrol_weighter.ItemsSource = gage.mData.plcos.PLCs;
 
             if (gage.mFeederSystem != null)

Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
 [assembly: AssemblyProduct("称重服务器")]
-[assembly: AssemblyCopyright("Copyright © 2023 FlyAutomation")]
+[assembly: AssemblyCopyright("Copyright © 2024 FlyAutomation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.7.2.0")]
-[assembly: AssemblyFileVersion("7.7.2.0")]
+[assembly: AssemblyVersion("7.7.3.0")]
+[assembly: AssemblyFileVersion("7.7.3.0")]
 [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]

脚本/2.get_release.sh

@@ -119,15 +119,15 @@ files=(\
 	)
 copy_to2 $src_dir $dest_dir $files
 
-#Project.FLY.Weight2
-src_dir="../Project.FLY.Weight2/FLY.Weight2.UI.Server"
-dest_dir="FLY.Weight2.UI.Server"
-files=(\
-	"x64" "x86" \
-	"FLY.Weight2.UI.Server.exe" \
-	"nlog.config" \
-	)
-copy_to2 $src_dir $dest_dir $files
+# #Project.FLY.Weight2
+# src_dir="../Project.FLY.Weight2/FLY.Weight2.UI.Server"
+# dest_dir="FLY.Weight2.UI.Server"
+# files=(\
+# 	"x64" "x86" \
+# 	"FLY.Weight2.UI.Server.exe" \
+# 	"nlog.config" \
+# 	)
+# copy_to2 $src_dir $dest_dir $files
 
 
 #Project.FLY.Winder

脚本/hemeiInstallZipVersionInfo.json

 {
-  "InstallZipVersion":"7.8.5.0",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.8.5.0_20231223.7z"
+  "InstallZipVersion":"7.8.5.2",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.8.5.2_20240120.7z"
 }
\ No newline at end of file

脚本/install/install.json

@@ -58,15 +58,6 @@
         "Gage1\\feeder_plcgroups"
       ]
     },
-    {
-      "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight2.UI.Server",
-      "Exe":"FLY.Weight2.UI.Server.exe",
-      "Name":"称重单组",
-      "IsAutoRun":true,
-      "Others":[
-        "Gage1\\plcgroups"
-      ]
-    },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Winder.UI.Server",
       "Exe":"FLY.Winder.UI.Server.exe",

脚本/版本描述.md

-# 和美安装包_v7.8.5-20231223
+# 和美安装包_v7.8.5.2-20240120
 
 ## 测厚仪服务器 v7.8.1
 1. 修复 当使用X8,X9 作为换转信号时，旋转时间滞后一圈
@@ -8,13 +8,15 @@
 ## 扫描测厚仪服务器 v7.6.2
 1. 修复 当使用X8,X9 作为换转信号时，旋转时间滞后一圈
 
-## 扫描测厚仪客户端 v7.8.3
+## 扫描测厚仪客户端 v7.8.5
    
 ## 自动风环 v7.6.2
 1. 修复 临时删除 厚度%的混合功能，它永远是1
 
-## 称重 v7.7.2
+## 称重 v7.7.3
 1. 添加 资料包 设备连接变量表_44446_v3.1_汕头天虹(FLY-11247)
+2. 修复 资料包 设备连接变量表_11111_v5 没有厚度比
+3. 修复 宽度绑定功能无法保存
 
 ## 称重单组 v7.6.0