Skip to content

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

Merge remote-tracking branch 'remotes/origin/dev-7.0-1' into feature-feng-feeder-20220518

parents 51dc32ec 1d8b7397
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 49 deletions
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/WinderPanel/CenterPanelV4.xaml
View file @ 611f4460
......@@ -45,9 +45,9 @@
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle}"
Width="180" IsChecked="{Binding IsSurfaceCenterWindOn}" OffBrush="{StaticResource Color_off}" OnBrush="{StaticResource Color_on}">
Width="180" IsChecked="{Binding IsSurfaceWindOn}" OffBrush="{StaticResource Color_off}" OnBrush="{StaticResource Color_on}">
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsSurfaceCenterWindOnSet}"/>
<flyctrl:ResetBehavior Binding="{Binding IsSurfaceWindOnSet}"/>
</i:Interaction.Behaviors>
表面收卷
</flyctrl:NoToggleButton>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ 611f4460
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.0")]
[assembly: AssemblyFileVersion("7.4.0")]
[assembly: AssemblyVersion("7.4.2")]
[assembly: AssemblyFileVersion("7.4.2")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @ 611f4460
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.1.0")]
[assembly: AssemblyFileVersion("7.1.0")]
[assembly: AssemblyVersion("7.4.2")]
[assembly: AssemblyFileVersion("7.4.2")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/GM_BlowingFix.cs
View file @ 611f4460
......@@ -1361,6 +1361,7 @@ namespace FLY.Thick.Blowing.Server
}
//检测数据更新情况，放入数据库, 数据不能被修改
RenZiJiaDataEventArgs renZiJiaDataEventArgs = null;//当数据被修改，推送事件！！！，当只有最后一幅图被推送
......@@ -1380,9 +1381,12 @@ namespace FLY.Thick.Blowing.Server
//添加数据
var lc_scandata = Lc_AutoMapperProfile.Mapper.Map<Lc_ScanData>(frameinfo.renZiJiaDataEventArgs);
historyDb.AddScanData(lc_scandata);
frameinfo.scandata_id = lc_scandata.ID;
renZiJiaDataEventArgs = frameinfo.renZiJiaDataEventArgs;
if (!mDynArea.SecuteLock)//授权过期, 没有数据
{
historyDb.AddScanData(lc_scandata);
frameinfo.scandata_id = lc_scandata.ID;
renZiJiaDataEventArgs = frameinfo.renZiJiaDataEventArgs;
}
}
}
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/TDGage.cs
View file @ 611f4460
......@@ -335,7 +335,7 @@ namespace FLY.Thick.Blowing.Server
cnt = 20,
conditional = delegate ()
{
return DynArea.AD < (DynArea.ADMax * 0.01);
return DynArea.AD < 2000;
}
});
......@@ -346,7 +346,7 @@ namespace FLY.Thick.Blowing.Server
cnt = 20,
conditional = delegate ()
{
return (DynArea.AD > (DynArea.ADMax * 0.98));
return (DynArea.AD > 63000);
}
});
......@@ -366,13 +366,11 @@ namespace FLY.Thick.Blowing.Server
{
if (DynArea.Hrs < 48 && DynArea.Hrs > 0)//授权限制提醒
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP.Code,
ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP.Descrption);
warning.Add(ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP);
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP.Code);
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP);
}
});
......@@ -380,13 +378,11 @@ namespace FLY.Thick.Blowing.Server
{
if (DynArea.SecuteLock)
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_LICENSE.Code,
ERRNOs.Instance.BASE_ERRNO_LICENSE.Descrption);
warning.Add(ERRNOs.Instance.BASE_ERRNO_LICENSE, canReset:false);
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE.Code);
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE);
}
});
......@@ -397,16 +393,14 @@ namespace FLY.Thick.Blowing.Server
{
if (!dynArea.FLYADIsConnect)
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code,
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Descrption);
warning.Add(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED, canReset:false);
foreach (ErrNoForCheckItem item in ErrNoForCheckItems)
item.Clear();
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code);
warning.Remove(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED);
foreach (ErrNoForCheckItem item in ErrNoForCheckItems)
item.OnPoll();
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ 611f4460
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.0.0")]
[assembly: AssemblyFileVersion("7.4.0.0")]
[assembly: AssemblyVersion("7.4.2.0")]
[assembly: AssemblyFileVersion("7.4.2.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ 611f4460
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.1.1.0")]
[assembly: AssemblyFileVersion("7.1.1.0")]
[assembly: AssemblyVersion("7.4.2.0")]
[assembly: AssemblyFileVersion("7.4.2.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/GM_BlowingScan.cs
View file @ 611f4460
......@@ -1700,13 +1700,19 @@ namespace FLY.Thick.BlowingScan.Server
//TODO 只有最后一幅图推送
//if(scaninfo_idx == mScanInfoList.Count() - 1) //居然还有一幅更新的，但里面数据是空
{
DataEvent?.Invoke(this, renZiJiaDataEventArgs);
bulkDb.SetTempFrame(scaninfo.StartTime, scaninfo.EndTime, 0, Round(scaninfo.thks, 2));
//TODO 需要检查是否重复写入了！！！！！
#region sqlite3 历史数据保存
var lc_scandata = Lc_AutoMapperProfile.Mapper.Map<Lc_ScanData>(renZiJiaDataEventArgs);
mHistoryDb.AddScanData(lc_scandata);
if (!mDynArea.SecuteLock) //授权过期, 没有数据
{
DataEvent?.Invoke(this, renZiJiaDataEventArgs);
//TODO 需要检查是否重复写入了！！！！！
#region sqlite3 历史数据保存
var lc_scandata = Lc_AutoMapperProfile.Mapper.Map<Lc_ScanData>(renZiJiaDataEventArgs);
mHistoryDb.AddScanData(lc_scandata);
}
#endregion
}
}
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/TDGage.cs
View file @ 611f4460
......@@ -543,7 +543,7 @@ namespace FLY.Thick.BlowingScan.Server
cnt = 20,
conditional = delegate ()
{
return DynArea.AD < (DynArea.ADMax * 0.01);
return DynArea.AD < 2000;
}
});
......@@ -554,7 +554,7 @@ namespace FLY.Thick.BlowingScan.Server
cnt = 20,
conditional = delegate ()
{
return (DynArea.AD > (DynArea.ADMax * 0.98));
return (DynArea.AD > 63000);
}
});
......@@ -602,13 +602,11 @@ namespace FLY.Thick.BlowingScan.Server
{
if (DynArea.Hrs < 48 && DynArea.Hrs > 0)//授权限制提醒
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP.Code,
ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP.Descrption);
warning.Add(ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP);
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP.Code);
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE_TIP);
}
});
......@@ -616,13 +614,11 @@ namespace FLY.Thick.BlowingScan.Server
{
if (DynArea.SecuteLock)
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_LICENSE.Code,
ERRNOs.Instance.BASE_ERRNO_LICENSE.Descrption);
warning.Add(ERRNOs.Instance.BASE_ERRNO_LICENSE, canReset: false);
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE.Code);
warning.Remove(ERRNOs.Instance.BASE_ERRNO_LICENSE);
}
});
......@@ -631,13 +627,11 @@ namespace FLY.Thick.BlowingScan.Server
{
if (!DynArea.FLYADIsConnect)
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code,
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Descrption);
warning.Add(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED, canReset: false);
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code);
warning.Remove(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED);
}
});
......
thick_public @ 1c0363ca
Subproject commit 0e716f3e80d3b5f25e521e2a3faf9562cf3fd200
Subproject commit 1c0363cae8f1083425220aaadda9f07ab243d5b5
脚本/hemeiInstallZipVersionInfo.json
View file @ 611f4460
{
"InstallZipVersion":"7.4.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.4.0_20220628.7z"
"InstallZipVersion":"7.4.2",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.4.2_20220902.7z"
}
\ No newline at end of file
脚本/版本描述.md
View file @ 611f4460
# 和美安装包_v7.4.2-20220902
## 测厚仪服务器 v7.4.2
1. 修复 使用码到期，没不会限制程序使用。 限制添加在 数据保存到数据库时。
## 测厚仪客户端 v7.4.2
1. 修复 全部字体改为 Global Sans Serif 解决 一些中文不像中文
## 扫描测厚仪服务器 v7.4.2
1. 修复 使用码到期，没不会限制程序使用。 限制添加在 数据保存到数据库时。
## 扫描测厚仪客户端 v7.4.2
1. 修复 下吹表面收卷与 表面中心收卷 按钮被设为一样
2. 修复 全部字体改为 Global Sans Serif 解决 一些中文不像中文
## 自动风环 v7.4.0
## 称重 v7.0.2
## 称重单组 v7.0.0
## 收卷 v7.0.9
## IBC v7.0.0
## 下吹 v7.0.9
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.4.0-20220628
## 测厚仪服务器 v7.1.0
......
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