Commit 9613761a authored by 潘栩锋's avatar 潘栩锋 🚴

定边测厚仪,也支持下吹模块

parent 1a19340e
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.5.0")] [assembly: AssemblyVersion("7.6.0")]
[assembly: AssemblyFileVersion("7.5.0")] [assembly: AssemblyFileVersion("7.6.0")]
[assembly: Guid("A4B71A37-7B77-47AA-9F59-ACC3EF84C4E0")] [assembly: Guid("A4B71A37-7B77-47AA-9F59-ACC3EF84C4E0")]
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.4.0.0")] [assembly: AssemblyVersion("7.6.0.0")]
[assembly: AssemblyFileVersion("7.4.0.0")] [assembly: AssemblyFileVersion("7.6.0.0")]
[assembly: Guid("32104657-86E9-4380-9113-606589E6D812")] [assembly: Guid("32104657-86E9-4380-9113-606589E6D812")]
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.0.0")] [assembly: AssemblyVersion("7.6.0.0")]
[assembly: AssemblyFileVersion("7.0.0.0")] [assembly: AssemblyFileVersion("7.6.0.0")]
[assembly: Guid("47D1FF95-69E3-40E5-B094-D7DAEAA87AD9")] [assembly: Guid("47D1FF95-69E3-40E5-B094-D7DAEAA87AD9")]
...@@ -96,6 +96,14 @@ ...@@ -96,6 +96,14 @@
<Resource Include="123.ico" /> <Resource Include="123.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Project.FLY.DownBlowing\FLY.DownBlowing.UI.Client\FLY.DownBlowing.UI.Client.csproj">
<Project>{37983f0f-bbb0-4727-92ff-bd18eeefcee8}</Project>
<Name>FLY.DownBlowing.UI.Client</Name>
</ProjectReference>
<ProjectReference Include="..\..\Project.FLY.DownBlowing\FLY.DownBlowing\FLY.DownBlowing.csproj">
<Project>{bb873d32-377e-49bf-bbf4-95557a9ad89f}</Project>
<Name>FLY.DownBlowing</Name>
</ProjectReference>
<ProjectReference Include="..\..\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\FLY.FeedbackRenZiJia.UI.Client.csproj"> <ProjectReference Include="..\..\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\FLY.FeedbackRenZiJia.UI.Client.csproj">
<Project>{51de4702-eabc-4984-91aa-61b7d17f7742}</Project> <Project>{51de4702-eabc-4984-91aa-61b7d17f7742}</Project>
<Name>FLY.FeedbackRenZiJia.UI.Client</Name> <Name>FLY.FeedbackRenZiJia.UI.Client</Name>
......
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.0")] [assembly: AssemblyVersion("7.6.1.1")]
[assembly: AssemblyFileVersion("7.6.0")] [assembly: AssemblyFileVersion("7.6.1.1")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")] [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.5.2")] [assembly: AssemblyVersion("7.6.0")]
[assembly: AssemblyFileVersion("7.5.2")] [assembly: AssemblyFileVersion("7.6.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")] [assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
...@@ -1373,16 +1373,25 @@ namespace FLY.Thick.Blowing.Server ...@@ -1373,16 +1373,25 @@ namespace FLY.Thick.Blowing.Server
if (frameinfo.scandata_id == null) if (frameinfo.scandata_id == null)
{ {
if (frameinfo.renZiJiaDataEventArgs.FilmVelocity < 2) if (frameinfo.renZiJiaDataEventArgs.FilmVelocity < 2)
{ {
//异常 //异常,没生产 不会再触发
frameinfo.scandata_id = -1;
continue;
}
double avg = frameinfo.renZiJiaDataEventArgs.Thicks.AverageNoNull();
if (double.IsNaN(avg) || avg<10)
{
//异常,整幅都没数据, 或均值小于 10um
frameinfo.scandata_id = -1;
continue; continue;
} }
//添加数据
var lc_scandata = Lc_AutoMapperProfile.Mapper.Map<Lc_ScanData>(frameinfo.renZiJiaDataEventArgs);
if (!mDynArea.SecuteLock)//授权过期, 没有数据 if (!mDynArea.SecuteLock)//授权过期, 没有数据
{ {
//添加数据
var lc_scandata = Lc_AutoMapperProfile.Mapper.Map<Lc_ScanData>(frameinfo.renZiJiaDataEventArgs);
historyDb.AddScanData(lc_scandata); historyDb.AddScanData(lc_scandata);
frameinfo.scandata_id = lc_scandata.ID; frameinfo.scandata_id = lc_scandata.ID;
renZiJiaDataEventArgs = frameinfo.renZiJiaDataEventArgs; renZiJiaDataEventArgs = frameinfo.renZiJiaDataEventArgs;
......
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.0.0")] [assembly: AssemblyVersion("7.6.1.1")]
[assembly: AssemblyFileVersion("7.6.0.0")] [assembly: AssemblyFileVersion("7.6.1.1")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.5.0.0")] [assembly: AssemblyVersion("7.6.0.0")]
[assembly: AssemblyFileVersion("7.5.0.0")] [assembly: AssemblyFileVersion("7.6.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")] [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
...@@ -1076,7 +1076,7 @@ namespace FLY.Thick.BlowingScan.Server ...@@ -1076,7 +1076,7 @@ namespace FLY.Thick.BlowingScan.Server
for (int j = i; j < mScanInfoList.Count; j++) for (int j = i; j < mScanInfoList.Count; j++)
{ {
scaninfo = mScanInfoList[j]; scaninfo = mScanInfoList[j];
scaninfo.IndexOfToGetAngle = 0; scaninfo.Reset2GetAngle();
} }
return; return;
} }
......
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.5.1.0")] [assembly: AssemblyVersion("7.6.0.0")]
[assembly: AssemblyFileVersion("7.5.1.0")] [assembly: AssemblyFileVersion("7.6.0.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")] [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
...@@ -5,6 +5,7 @@ using System; ...@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
...@@ -99,7 +100,7 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -99,7 +100,7 @@ namespace FLY.Winder.UI.Client.UiModule
}); });
} }
} }
private void button_v_set_Click(object sender, RoutedEventArgs e) private async void button_v_set_Click(object sender, RoutedEventArgs e)
{ {
WdSetValue w = new WdSetValue(); WdSetValue w = new WdSetValue();
w.Init(winderSystem.Accessory.VelocitySet, 200, 1, 0.1f, "速度设置", "m/min"); w.Init(winderSystem.Accessory.VelocitySet, 200, 1, 0.1f, "速度设置", "m/min");
...@@ -107,8 +108,16 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -107,8 +108,16 @@ namespace FLY.Winder.UI.Client.UiModule
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this); w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
if (w.ShowDialog() == true) { if (w.ShowDialog() == true) {
winderSystem.Accessory.VelocitySet = w.Value; winderSystem.Accessory.VelocitySet = w.Value;
//延时 300ms
await Task.Delay(300);
winderSystem.Accessory.IsVelocityChanged = false; winderSystem.Accessory.IsVelocityChanged = false;
winderSystem.Accessory.IsVelocityChanged = true; winderSystem.Accessory.IsVelocityChanged = true;
//延时 300ms
await Task.Delay(300);
winderSystem.Accessory.IsVelocityChanged = false; winderSystem.Accessory.IsVelocityChanged = false;
} }
} }
......
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.9.0")] [assembly: AssemblyVersion("7.6.0.0")]
[assembly: AssemblyFileVersion("7.0.9.0")] [assembly: AssemblyFileVersion("7.6.0.0")]
[assembly: Guid("0CE35EA7-927A-41C0-9DC6-80511329760B")] [assembly: Guid("0CE35EA7-927A-41C0-9DC6-80511329760B")]
{ {
"InstallZipVersion":"7.6.0", "InstallZipVersion":"7.6.1.1",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.6.0_20221011.7z" "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.6.1.1_20221016.7z"
} }
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.DownBlowing.UI.Client" />
<namespace name="FLY.DownBlowing.UI.Client.UiModule" />
<alias alias="IUiModule2" type="MultiLayout.UiModule.IUiModule2, MultiLayout" />
<container>
<register type="IUiModule2" mapTo="UiModule2_MenuSetting" name="downBlowing_ms" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaWinder" name="downBlowing_daw" />
<register type="IUiModule2" mapTo="UiModule2_WinderPanel" name="downBlowing_wp" />
<register type="IUiModule2" mapTo="UiModule2_TempAreaPanel" name="downBlowing_tap" />
</container>
</unity>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.DownBlowing" />
<namespace name="FLY.DownBlowing.IService" />
<namespace name="FLY.DownBlowing.Client" />
<namespace name="FLY.DownBlowing.Server.Model" />
<assembly name="FLY.OBJComponents" />
<namespace name="FLY.OBJComponents.IService" />
<namespace name="FLY.OBJComponents.Client" />
<container>
<register type="IDownBlowingSystemService" mapTo="DownBlowingSystemServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="38000" />
<param name="connName" dependencyName="cn5" />
</constructor>
</register>
<register type="IWarningSystem2Service" mapTo="WarningSystem2ServiceClient" name="downBlowingWarningService">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="20000" />
<param name="connName" dependencyName="cn5" />
</constructor>
</register>
<register type="ITAreaProfileService" mapTo="TAreaProfileServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="38005" />
<param name="connName" dependencyName="cn5" />
</constructor>
</register>
</container>
</unity>
</configuration>
\ No newline at end of file
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<instance name="cn2" value="weighter" /> <instance name="cn2" value="weighter" />
<instance name="cn3" value="ibc" /> <instance name="cn3" value="ibc" />
<instance name="cn4" value="winder" /> <instance name="cn4" value="winder" />
<instance name="cn5" value="downBlowing" />
</container> </container>
</unity> </unity>
</configuration> </configuration>
\ No newline at end of file
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"ibc.service.config", "ibc.service.config",
"thickHeatAnalyst.Fix.service.config", "thickHeatAnalyst.Fix.service.config",
"weighter2.service.config", "weighter2.service.config",
"downBlowing.service.config",
"other.service.config" "other.service.config"
], ],
"Children": [] "Children": []
...@@ -44,7 +45,8 @@ ...@@ -44,7 +45,8 @@
"thickHeatAnalyst.Fix.component.config", "thickHeatAnalyst.Fix.component.config",
"weighter.component.config", "weighter.component.config",
"weighter2.component.config", "weighter2.component.config",
"unions.component.config" "unions.component.config",
"downBlowing.component.config"
], ],
"Children": [] "Children": []
} }
......
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.DownBlowing.UI.Client" />
<namespace name="FLY.DownBlowing.UI.Client.UiModule" />
<alias alias="IUiModule2" type="MultiLayout.UiModule.IUiModule2, MultiLayout" />
<container>
<register type="IUiModule2" mapTo="UiModule2_MenuSetting" name="downBlowing_ms" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaWinder" name="downBlowing_daw" />
<register type="IUiModule2" mapTo="UiModule2_WinderPanel" name="downBlowing_wp" />
<register type="IUiModule2" mapTo="UiModule2_TempAreaPanel" name="downBlowing_tap" />
</container>
</unity>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.DownBlowing" />
<namespace name="FLY.DownBlowing.IService" />
<namespace name="FLY.DownBlowing.Client" />
<namespace name="FLY.DownBlowing.Server.Model" />
<assembly name="FLY.OBJComponents" />
<namespace name="FLY.OBJComponents.IService" />
<namespace name="FLY.OBJComponents.Client" />
<container>
<register type="IDownBlowingSystemService" mapTo="DownBlowingSystemServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="38000" />
<param name="connName" dependencyName="cn5" />
</constructor>
</register>
<register type="IWarningSystem2Service" mapTo="WarningSystem2ServiceClient" name="downBlowingWarningService">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="20000" />
<param name="connName" dependencyName="cn5" />
</constructor>
</register>
<register type="ITAreaProfileService" mapTo="TAreaProfileServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="38005" />
<param name="connName" dependencyName="cn5" />
</constructor>
</register>
</container>
</unity>
</configuration>
\ No newline at end of file
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<instance name="cn2" value="weighter" /> <instance name="cn2" value="weighter" />
<instance name="cn3" value="ibc" /> <instance name="cn3" value="ibc" />
<instance name="cn4" value="winder" /> <instance name="cn4" value="winder" />
<instance name="cn5" value="downBlowing" />
</container> </container>
</unity> </unity>
</configuration> </configuration>
\ No newline at end of file
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"ibc.service.config", "ibc.service.config",
"thickHeatAnalyst.Fix.service.config", "thickHeatAnalyst.Fix.service.config",
"weighter2.service.config", "weighter2.service.config",
"downBlowing.service.config",
"other.service.config" "other.service.config"
], ],
"Children": [] "Children": []
...@@ -44,7 +45,8 @@ ...@@ -44,7 +45,8 @@
"thickHeatAnalyst.Fix.component.config", "thickHeatAnalyst.Fix.component.config",
"weighter.component.config", "weighter.component.config",
"weighter2.component.config", "weighter2.component.config",
"unions.component.config" "unions.component.config",
"downBlowing.component.config"
], ],
"Children": [] "Children": []
} }
......
# 和美安装包_v7.6.1-20221015
## 测厚仪服务器 v7.6.0
## 测厚仪客户端 v7.6.1
1. 修复 收卷设置速度, 加长 速度确认 上升沿 与 下降沿时间间隔。 设置为0.5s
## 扫描测厚仪服务器 v7.6.0
## 扫描测厚仪客户端 v7.6.1
1. 修复 收卷设置速度, 加长 速度确认 上升沿 与 下降沿时间间隔。 设置为0.5s
## 自动风环 v7.6.0
## 称重 v7.6.0
## 称重单组 v7.6.0
## 收卷 v7.6.0
## IBC v7.6.0
## 下吹 v7.6.0
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.6.0-20221010 # 和美安装包_v7.6.0-20221010
## 测厚仪服务器 v7.6.0 ## 测厚仪服务器 v7.6.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