Skip to content

H
hemei
Commit d32b5268 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

# 和美安装包_v7.5.1-20220911 

## 称重 v7.5.1
1. 修复 从测厚仪服务器获取的线速度精度改为 0.1m/min
2. 添加 吸料

## 扫描测厚仪客户端 v7.5.0
1. 添加 支持称重服务器的吸料
parent 8fb735ed
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 30 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ d32b5268
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.2")]
[assembly: AssemblyFileVersion("7.4.2")]
[assembly: AssemblyVersion("7.5.0")]
[assembly: AssemblyFileVersion("7.5.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @ d32b5268
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.2")]
[assembly: AssemblyFileVersion("7.4.2")]
[assembly: AssemblyVersion("7.5.0")]
[assembly: AssemblyFileVersion("7.5.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ d32b5268
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.2.0")]
[assembly: AssemblyFileVersion("7.4.2.0")]
[assembly: AssemblyVersion("7.5.0.0")]
[assembly: AssemblyFileVersion("7.5.0.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ d32b5268
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.2.0")]
[assembly: AssemblyFileVersion("7.4.2.0")]
[assembly: AssemblyVersion("7.5.0.0")]
[assembly: AssemblyFileVersion("7.5.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs
View file @ d32b5268
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.5.0.0")]
[assembly: AssemblyFileVersion("7.5.0.0")]
[assembly: AssemblyVersion("7.5.1.0")]
[assembly: AssemblyFileVersion("7.5.1.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
Project.FLY.Weight/FLY.Weight/Server/TDGage.cs
View file @ d32b5268
......@@ -139,7 +139,7 @@ namespace FLY.Weight.Server
}
}
int lastWidth = 0;
private void DynArea_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(Thick.Base.Common.DynArea.Width))
......@@ -149,16 +149,29 @@ namespace FLY.Weight.Server
if (tDGageServiceClient.DynArea.Width <= 100)
return;//小于100，肯定异常
int width = (int)tDGageServiceClient.DynArea.Width;
if (lastWidth < 100)
{
lastWidth = width;
}
else
{
if (Math.Abs(lastWidth - width) > 10) //偏差大于10mm
{
//更新数据
lastWidth = width;
}
}
double v = Math.Round(tDGageServiceClient.DynArea.Width / 10.0);
v = Math.Round(v * 10);
int v = (int)Math.Round(lastWidth / 10.0);
v *= 10;// 以10mm 4舍5入 取整
mData.Accessory.TotalFilmWidth = (float)v;
mData.Accessory.TotalFilmWidth = v;
}
else if (e.PropertyName == nameof(Thick.Base.Common.DynArea.FilmVelocity))
{
double v = Math.Round(tDGageServiceClient.DynArea.FilmVelocity);
double v = Math.Round(tDGageServiceClient.DynArea.FilmVelocity,1);//精度只有0.1m/min
mData.Accessory.CurrentVelocitySet = (float)v;
}
}
......
脚本/hemeiInstallZipVersionInfo.json
View file @ d32b5268
{
"InstallZipVersion":"7.4.2",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.4.2_20220902.7z"
"InstallZipVersion":"7.5.1",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.5.1_20220911.7z"
}
\ No newline at end of file
脚本/install/backupConfig.json deleted 100644 → 0
View file @ 8fb735ed
{
"ServerAddr": "private.flyautomation.net:2155",
"LocalFilePath": "D:\\佛山市枫莱尔自动化技术有限公司\\windows",
"FtpPwd": "fly:flymeasure",
"LpName": "fly-1234",
"LpPaths": [
"D:\\佛山市枫莱尔自动化技术有限公司\\windows\\LP3\\lp.json",
"D:\\佛山市枫莱尔自动化技术有限公司\\windows\\FLY.LinkProxy.UI\\lp.json"
]
}
\ No newline at end of file
脚本/版本描述.md
View file @ d32b5268
# 和美安装包_v7.5.1-20220911
## 测厚仪服务器 v7.4.2
## 测厚仪客户端 v7.5.0
## 扫描测厚仪服务器 v7.4.2
## 扫描测厚仪客户端 v7.5.0
## 自动风环 v7.4.0
## 称重 v7.5.1
1. 修复 从测厚仪服务器获取的线速度精度改为 0.1m/min
## 称重单组 v7.0.0
## 收卷 v7.0.9
## IBC v7.0.0
## 下吹 v7.0.9
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.5.0-20220902
## 测厚仪服务器 v7.4.2
## 测厚仪客户端 v7.5.0
## 扫描测厚仪服务器 v7.4.2
## 扫描测厚仪客户端 v7.5.0
1. 添加 支持称重服务器的吸料
## 自动风环 v7.4.0
## 称重 v7.5.0
1. 添加 吸料
## 称重单组 v7.0.0
## 收卷 v7.0.9
## IBC v7.0.0
## 下吹 v7.0.9
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.4.2-20220902
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment