Skip to content

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

添加 收卷v4.0，v4.1

parent dca44ead
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 429 additions and 272 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/FLY.Thick.Blowing.UI.Fix.Server.csproj
View file @ 6da8155f
......@@ -221,6 +221,10 @@
<Project>{5ee61ac6-5269-4f0f-b8fa-4334fe4a678f}</Project>
<Name>Misc</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.ModbusMapper\FLY.ModbusMapper\FLY.ModbusMapper.csproj">
<Project>{6d4b9bda-2a66-4583-b244-758bc4213d9f}</Project>
<Name>FLY.ModbusMapper</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.Thick.Base\FLY.Thick.Base\FLY.Thick.Base.csproj">
<Project>{91a1aafe-a528-4c2e-a48a-9259e780255a}</Project>
<Name>FLY.Thick.Base</Name>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/MainWindow.xaml.cs
View file @ 6da8155f
......@@ -14,7 +14,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
TDGage mGage;
OBJProxy mOBJProxy;
PicHistory picHistory;
ThickPlcModbusTcpServer thickPlcModbusTcpServer;
public MainWindow()
{
InitializeComponent();
......@@ -33,6 +33,9 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
mOBJProxy = new OBJProxy(0, mGage);
thickPlcModbusTcpServer = new ThickPlcModbusTcpServer();
thickPlcModbusTcpServer.Init(mGage.bulkDb);
FObjBase.PollModule.Current.Start();
//周期保存图片
......@@ -44,7 +47,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
this.Hide();
PgMain p = new PgMain();
p.Init(mGage, picHistory);
p.Init(mGage, picHistory, thickPlcModbusTcpServer);
this.Navigate(p);
this.NavigationService.RemoveBackEntry();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/PgMain.xaml
View file @ 6da8155f
......@@ -18,12 +18,14 @@
<Grid >
<StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource Styles.Button.Square.Accent2}"
<Button Style="{StaticResource Styles.Button.Square.Accent2}" Width="180"
Content="设置" Command="{Binding SetupCmd}"/>
<Button Style="{StaticResource Styles.Button.Square.Accent2}" Width="auto"
Content="图片数据" Command="{Binding PicSetupCmd}"/>
<Button Style="{StaticResource Styles.Button.Square.Accent2}" Width="180"
Content="图片数据" Command="{Binding PicSetupCmd}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource Styles.Button.Square.Accent2}"
Content="调试" Command="{Binding DebugCmd}"/>
Content="辊信号列表" Command="{Binding DebugCmd}" Width="180"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}" >
<StackPanel Margin="{StaticResource ControlMargin}" DataContext="{Binding SysParam}">
......@@ -60,6 +62,34 @@
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="{Binding Position}"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}" DataContext="{Binding ModbusTcpServer}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="ModbusTcp服务地址"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="{Binding LocalEP}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="状态"/>
<TextBlock>
<TextBlock.Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldContent}">
<Setter Property="Foreground" Value="Red"/>
<Setter Property="Text" Value="停止"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsRunning}" Value="True">
<Setter Property="Foreground" Value="Green"/>
<Setter Property="Text" Value="工作中"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="当前连接数"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="{Binding ConnectedCnt}"/>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
</Page>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/PgMain.xaml.cs
View file @ 6da8155f
......@@ -30,10 +30,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
{
InitializeComponent();
}
public void Init(TDGage mGage, PicHistory picHistory)
public void Init(TDGage mGage, PicHistory picHistory, ThickPlcModbusTcpServer thickPlcModbusTcpServer)
{
viewModel = new PgMainVm();
viewModel.Init(mGage, picHistory);
viewModel.Init(mGage, picHistory, thickPlcModbusTcpServer);
this.DataContext = viewModel;
}
}
......@@ -42,7 +42,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
public event PropertyChangedEventHandler PropertyChanged;
public SysParam SysParam { get; set; }
public InitParam InitParam { get; set; }
public FlyADBase.FlyAD7 FlyAd { get; set; }
......@@ -51,8 +50,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
public RelayCommand DebugCmd { get; private set; }
public FLY.Modbus.WithThread.ServerTCP ModbusTcpServer { get; set; }
PicHistory picHistory;
TDGage mGage;
ThickPlcModbusTcpServer thickPlcModbusTcpServer;
public PgMainVm()
{
SetupCmd = new RelayCommand(Setup);
......@@ -60,36 +61,39 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
DebugCmd = new RelayCommand(OpenWdDebug);
}
private void OpenWdDebug()
{
WdBlowingDetect w = new WdBlowingDetect();
w.Init(mGage.gmRenZiJiaFix.mPDetect);
w.ShowDialog();
}
private void PicSetup()
{
WdPicHistory w = new WdPicHistory();
w.Init(picHistory);
w.Owner = App.Current.MainWindow;
w.ShowDialog();
}
public void Init(TDGage mGage, PicHistory picHistory)
public void Init(TDGage mGage, PicHistory picHistory, ThickPlcModbusTcpServer thickPlcModbusTcpServer)
{
this.mGage = mGage;
this.thickPlcModbusTcpServer = thickPlcModbusTcpServer;
SysParam = mGage.sysParam;
InitParam = mGage.initParam;
FlyAd = mGage.flyAd;
this.picHistory = picHistory;
ModbusTcpServer = thickPlcModbusTcpServer.ModbusTcpServer;
}
private void Setup()
{
//打开设置页面
WdSetup w = new WdSetup();
w.Init(SysParam, FlyAd);
w.Init(SysParam, FlyAd, thickPlcModbusTcpServer);
w.Owner = App.Current.MainWindow;
w.ShowDialog();
}
private void OpenWdDebug()
{
WdBlowingDetect w = new WdBlowingDetect();
w.Init(mGage.gmRenZiJiaFix.mPDetect);
w.ShowDialog();
}
private void PicSetup()
{
WdPicHistory w = new WdPicHistory();
w.Init(picHistory);
w.Owner = App.Current.MainWindow;
w.ShowDialog();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @ 6da8155f
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--追边测厚仪服务器")]
[assembly: AssemblyCopyright("Copyright © 2022 FlyAutomation. All rights reserved.")]
[assembly: AssemblyCopyright("Copyright © 2023 FlyAutomation. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.1")]
[assembly: AssemblyFileVersion("7.6.1")]
[assembly: AssemblyVersion("7.8.0")]
[assembly: AssemblyFileVersion("7.8.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/WdSetup.xaml
View file @ 6da8155f
......@@ -15,15 +15,19 @@
</Window.Resources>
<Grid>
<StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="服务地址"/>
<StackPanel Margin="{StaticResource ControlMargin}" >
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="服务地址:" Width="90"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Addr}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="AD盒地址"/>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="AD盒地址:" Width="90"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding FlyAdAddr}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="ModbusTcp地址:" Width="90"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding PlcAddr}"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource Styles.Button.Square.Accent2}"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/WdSetup.xaml.cs
View file @ 6da8155f
using FLY.Thick.Base.Server;
using FLY.Thick.Blowing.Server;
using FlyADBase;
using GalaSoft.MvvmLight.Command;
using System;
......@@ -28,10 +29,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
{
InitializeComponent();
}
public void Init(SysParam sysParam, FlyAD7 flyAd)
public void Init(SysParam sysParam, FlyAD7 flyAd, ThickPlcModbusTcpServer thickPlcModbusTcpServer)
{
viewModel = new WdSetupVm();
viewModel.Init(sysParam, flyAd);
viewModel.Init(sysParam, flyAd, thickPlcModbusTcpServer);
this.DataContext = viewModel;
}
}
......@@ -40,13 +41,13 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
public event PropertyChangedEventHandler PropertyChanged;
public string Addr { get; set; }
public string FlyAdAddr { get; set; }
public string PlcAddr { get; set; }
public RelayCommand OkCmd { get; private set; }
SysParam sysParam;
FlyAD7 flyAd;
InitParam initParam;
ThickPlcModbusTcpServer thickPlcModbusTcpServer;
public WdSetupVm()
{
OkCmd = new RelayCommand(Ok);
......@@ -54,12 +55,15 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
public void Init(SysParam sysParam, FlyAD7 flyAd)
public void Init(SysParam sysParam, FlyAD7 flyAd, ThickPlcModbusTcpServer thickPlcModbusTcpServer)
{
this.sysParam = sysParam;
this.flyAd = flyAd;
this.thickPlcModbusTcpServer = thickPlcModbusTcpServer;
Addr = sysParam.Addr;
FlyAdAddr = flyAd.Addr;
PlcAddr = thickPlcModbusTcpServer.ServerAddr;
}
private void Ok()
......@@ -75,6 +79,9 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
flyAd.Addr = FlyAdAddr;
flyAd.Save();
thickPlcModbusTcpServer.ServerAddr = PlcAddr;
thickPlcModbusTcpServer.Save();
System.Environment.CurrentDirectory = "../";
AppHelper.AppJustOne.Restart();
}
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/Model/BulkDB.cs
View file @ 6da8155f
......@@ -149,12 +149,7 @@ namespace FLY.Thick.Blowing.Server.Model
ProfileChangedEventArgs e = (ProfileChangedEventArgs)_e;
var profile = e.profile;
//清除本地缓存
localDb.CurrProfile = profile;
localDb.ProfileStartTime = profile.StartTime;
localDb.ProfileEndTime = profile.EndTime;
localDb.IsProfileFinished = profile.IsFinished;
LastProfileId = profile.ID;
LastTimestamp = DateTime.Now;
}
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/Model/HistoryDB.cs
View file @ 6da8155f
......@@ -43,69 +43,6 @@ namespace FLY.Thick.BlowingScan.Server.Model
ErrorBuffer.Init(dbModel.TbError);
}
/// <summary>
/// 按时间删除数据库
/// </summary>
/// <param name="month"></param>
public void KeepDBSize(int month)
{
if (month <= 3)
month = 3;
DateTime del_time = DateTime.Now - TimeSpan.FromDays(month * 30);
string det_time_str = del_time.ToStringOfSQLiteFieldType();
List<string> sqls = new List<string>();
sqls.Add(
$"DELETE FROM {dbModel.TbProfile.TableName}" +
$" WHERE EndTime < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbScanData.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbError.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbTrendData.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbSample.TableName}" +
$" WHERE Time < {det_time_str}");
dbModel.sqliteHelper.QueryTran(sqls);
}
///// <summary>
///// 按时间删除数据库
///// </summary>
//public void KeepOrgDbSize(int day)
//{
// if (day <= 2)
// day = 2;
// DateTime del_time = DateTime.Now - TimeSpan.FromDays(day);
// string det_time_str = del_time.ToStringOfSQLiteFieldType();
// List<string> sqls = new List<string>();
// sqls.Add(
// $"DELETE FROM {orgDbModel.TbSign.TableName}" +
// $" WHERE Time < {det_time_str}");
// sqls.Add(
// $"DELETE FROM {orgDbModel.TbRoll.TableName}" +
// $" WHERE Time < {det_time_str}");
// sqls.Add(
// $"DELETE FROM {orgDbModel.TbOrgScanData.TableName}" +
// $" WHERE Time < {det_time_str}");
// orgDbModel.sqliteHelper.QueryTran(sqls);
//}
/// <summary>
/// 保存产品参数
/// </summary>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/Model/HistoryDb.cs
View file @ 6da8155f
......@@ -43,69 +43,6 @@ namespace FLY.Thick.BlowingScan.Server.Model
ErrorBuffer.Init(dbModel.TbError);
}
/// <summary>
/// 按时间删除数据库
/// </summary>
/// <param name="month"></param>
public void KeepDBSize(int month)
{
if (month <= 3)
month = 3;
DateTime del_time = DateTime.Now - TimeSpan.FromDays(month * 30);
string det_time_str = del_time.ToStringOfSQLiteFieldType();
List<string> sqls = new List<string>();
sqls.Add(
$"DELETE FROM {dbModel.TbProfile.TableName}" +
$" WHERE EndTime < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbScanData.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbError.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbTrendData.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbSample.TableName}" +
$" WHERE Time < {det_time_str}");
dbModel.sqliteHelper.QueryTran(sqls);
}
///// <summary>
///// 按时间删除数据库
///// </summary>
//public void KeepOrgDbSize(int day)
//{
// if (day <= 2)
// day = 2;
// DateTime del_time = DateTime.Now - TimeSpan.FromDays(day);
// string det_time_str = del_time.ToStringOfSQLiteFieldType();
// List<string> sqls = new List<string>();
// sqls.Add(
// $"DELETE FROM {orgDbModel.TbSign.TableName}" +
// $" WHERE Time < {det_time_str}");
// sqls.Add(
// $"DELETE FROM {orgDbModel.TbRoll.TableName}" +
// $" WHERE Time < {det_time_str}");
// sqls.Add(
// $"DELETE FROM {orgDbModel.TbOrgScanData.TableName}" +
// $" WHERE Time < {det_time_str}");
// orgDbModel.sqliteHelper.QueryTran(sqls);
//}
/// <summary>
/// 保存产品参数
/// </summary>
......
Resource/IBC/版本描述.txt
View file @ 6da8155f
......@@ -66,10 +66,6 @@ v4_温控7
v4.1_温控7
冷却风机报警 删除了。 因为根本没接冷却风机。 不想让它报警
//--------------------------------------------
v4.2_温控7
添加 人字板操作开合，侧夹板操作开合，2022/12/28
//--------------------------------------------
v5_温控9
与 v4_温控7 比较，一整页的螺杆及模头温度控制寄存器地址都不一样了
......
Resource/收卷/版本描述.txt
View file @ 6da8155f
......@@ -4,6 +4,11 @@
新长盛03是扫描架，旋转PLC是新长盛的陈工自己写的，汇川的H3U
只有旋转，用于给测厚仪旋转位置
//----------------------------------------------------------------
//2022/12/28
设备连接变量表_v0.6_和美下吹
只支持 下吹的旋转架信号, 只有 汕头茂森 两台机在使用
//----------------------------------------------------------------
//2022/04/03
//设备连接变量表_v1.1_张新成02
......@@ -45,11 +50,11 @@ HMI包含 收卷，IBC, 旋转，称重
//----------------------------------------------------------------
//2022/12/28
设备连接变量表_v4.0_下吹_20221228
下吹的收卷
设备连接变量表_v4.0_(下吹)汕头茂森_20221228
下吹的收卷, 只有 汕头茂森 两台机在使用
//----------------------------------------------------------------
//2023/02/18
设备连接变量表_v4.1_下吹内外反转_20230218
下吹的收卷反转了
下吹的收卷反转了， 常规版本
脚本/hemeiInstallZipVersionInfo.json
View file @ 6da8155f
{
"InstallZipVersion":"7.7.4.1",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.4.1_20230214.7z"
"InstallZipVersion":"7.8.0.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.8.0.0_20230228.7z"
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-下吹/graphcustom.json
View file @ 6da8155f
......@@ -198,7 +198,7 @@
{
"Graphs": [
{
"ID": 48252249,
"ID": 53704147,
"Rect": "0, 0, 1, 1"
}
],
......@@ -215,158 +215,158 @@
],
"Components": [
{
"ID": 13630977,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_MenuSetting",
"ID": 17611460,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MainGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 24847051,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MenuSetting",
"ID": 24554252,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_TempAreaPanel",
"ServiceContainerName": "gage0.service"
},
{
"ID": 44866487,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ID": 48662582,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 43552930,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_MenuSetting",
"ID": 1501989,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 8223768,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_MenuProfile",
"ID": 52015891,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 66283545,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_MenuMotion",
"ID": 44960719,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 31616714,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick",
"ID": 38016717,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 38141718,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_DynAreaProfile",
"ID": 6455868,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 27935207,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaFilmWidth",
"ID": 33594135,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 64726287,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample",
"ID": 29300865,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FlowGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48687165,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaBlowing",
"ID": 64244561,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 21215025,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO",
"ID": 62419562,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraphCircular",
"ServiceContainerName": "gage0.service"
},
{
"ID": 22167861,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ID": 28792051,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 40975656,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ID": 18036132,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 36105850,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_DynAreaWinder",
"ID": 57121810,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_WinderPanel",
"ServiceContainerName": "gage0.service"
},
{
"ID": 17611460,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MainGraph",
"ID": 53704147,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_FeederPanel",
"ServiceContainerName": "gage0.service"
},
{
"ID": 24554252,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_TempAreaPanel",
"ID": 13630977,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48662582,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing",
"ID": 24847051,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 1501989,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ID": 44866487,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 52015891,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ID": 43552930,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 44960719,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ID": 8223768,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_MenuProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 38016717,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ID": 66283545,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_MenuMotion",
"ServiceContainerName": "gage0.service"
},
{
"ID": 6455868,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph",
"ID": 31616714,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service"
},
{
"ID": 33594135,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraph2",
"ID": 38141718,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 29300865,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FlowGraph",
"ID": 27935207,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaFilmWidth",
"ServiceContainerName": "gage0.service"
},
{
"ID": 64244561,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph",
"ID": 64726287,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaSample",
"ServiceContainerName": "gage0.service"
},
{
"ID": 62419562,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_ScanGraphCircular",
"ID": 48687165,
"Module": "FLY.Thick.BlowingScan.UI.Client.UiModule.UiModule2_DynAreaBlowing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 28792051,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ID": 21215025,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO",
"ServiceContainerName": "gage0.service"
},
{
"ID": 18036132,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ID": 22167861,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 57121810,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_WinderPanel",
"ID": 40975656,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48252249,
"Module": "FLY.Weight.UI.Client.UiModule.UiModule2_FeederPanel",
"ID": 36105850,
"Module": "FLY.DownBlowing.UI.Client.UiModule.UiModule2_DynAreaWinder",
"ServiceContainerName": "gage0.service"
}
]
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-下吹/trendgraph.json
View file @ 6da8155f
{
"Items": [
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 64244561
}
]
}
\ No newline at end of file
{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":0,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":true,"IsPercent":true,"ID":48220637}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/fixgraph.json 0 → 100644
View file @ 6da8155f
{"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051},{"Len":500,"Interval":50,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":18036132}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/flowgraph.json 0 → 100644
View file @ 6da8155f
{"Interval":6,"IsYRangeAuto":false,"IsYRangePercent":true,"YRangePercent":0.15,"YRange":20}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/paramDict.json 0 → 100644
View file @ 6da8155f
[
{
"Key": "LCUS1_PortName",
"Value": "COM1"
},
{
"Key": "LCUS1_Enable",
"Value": false
},
{
"Key": "XStep",
"Value": 5
},
{
"Key": "HaveOSK",
"Value": true
},
{
"Key": "HaveOSK_mouse",
"Value": true
},
{
"Key": "gage0.service.stateChanged",
"Value": null
},
{
"Key": "HaveThick",
"Value": true
},
{
"Key": "HaveWeight",
"Value": false
},
{
"Key": "HaveIbc",
"Value": false
},
{
"Key": "HaveWinder",
"Value": false
},
{
"Key": "HaveDownBlowing",
"Value": false
},
{
"Key": "HaveTArea",
"Value": false
},
{
"Key": "HaveFeeder",
"Value": false
},
{
"Key": "WarningTipPath",
"Value": ""
},
{
"Key": "WarningDurationSec",
"Value": 5
},
{
"Key": "EnableScanErrBigTip",
"Value": false
}
]
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/scangraph.json 0 → 100644
View file @ 6da8155f
{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":28722627},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":44810590},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-15,"IsPercent":true,"IsAutoTarget":true,"ID":19620867},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-10,"IsPercent":true,"IsAutoTarget":true,"ID":23742817},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":9828942},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":37500900}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/scangraphcircular.json 0 → 100644
View file @ 6da8155f
{"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":43629015}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/trendgraph.json 0 → 100644
View file @ 6da8155f
{
"Items": [
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 51283066
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷4-IBC-温区/trendgraph2.json 0 → 100644
View file @ 6da8155f
{"Items":[{"Interval":1,"YRangePercent":3.0,"Mix":1,"ID":51283066}]}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/flowgraph.json 0 → 100644
View file @ 6da8155f
{"Interval":6,"IsYRangeAuto":false,"IsYRangePercent":true,"YRangePercent":0.15,"YRange":20}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/graphcustom.json
View file @ 6da8155f
......@@ -158,6 +158,23 @@
false
],
"Header": "定点"
},
{
"Graphs": [
{
"ID": 37010918,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "趋势2"
}
],
"Components": [
......@@ -290,6 +307,11 @@
"ID": 18036132,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 37010918,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
"ServiceContainerName": "gage0.service"
}
]
}
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/scangraph.json
View file @ 6da8155f
{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":41709209},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":63400648},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-15,"IsPercent":true,"IsAutoTarget":true,"ID":54302323},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-10,"IsPercent":true,"IsAutoTarget":true,"ID":46404226},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":42496437},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":50443655}]}
\ No newline at end of file
{
"Items": [
{
"UiModule": "scangraph2",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -5,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 41709209
},
{
"UiModule": "scangraph2",
"YRangePercent": 3.0,
"Mix": 1,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 63400648
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -15,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 54302323
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -10,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 46404226
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": -5,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 42496437
},
{
"UiModule": "scangraph2",
"YRangePercent": 3.0,
"Mix": 1,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 50443655
},
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 37010918
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重/trendgraph.json
View file @ 6da8155f
{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":0,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":true,"IsPercent":true,"ID":48220637}]}
\ No newline at end of file
{
"Items": [
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 26947909
},
{
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 37010918
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/fixgraph.json
View file @ 6da8155f
{"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051}]}
\ No newline at end of file
{
"Items": [
{
"Len": 500,
"Interval": 1000,
"Mix": 1,
"IsAutoTarget": true,
"IsADMode": false,
"IsAutoY": false,
"YTarget": 0.0,
"YRange": 10.0,
"ID": 28792051
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/graphcustom.json
View file @ 6da8155f
......@@ -82,7 +82,7 @@
{
"Graphs": [
{
"ID": 54302323,
"ID": 19728236,
"Rect": "0, 0, 1, 1"
}
],
......@@ -224,7 +224,7 @@
"ServiceContainerName": "gage0.service"
},
{
"ID": 54302323,
"ID": 19728236,
"Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
"ServiceContainerName": "gage0.service"
},
......
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/scangraph.json
View file @ 6da8155f
......@@ -57,11 +57,11 @@
{
"UiModule": "scangraph",
"YRangePercent": 3.0,
"Mix": 1,
"Mix": 2,
"Number": 0,
"IsPercent": true,
"IsAutoTarget": true,
"ID": 54302323
"ID": 19728236
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/scangraphcircular.json
View file @ 6da8155f
{"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":32000920}]}
\ No newline at end of file
{
"Items": [
{
"Mix": 1,
"Number": 0,
"YRangePercent": 3.0,
"IsPercent": true,
"IsAutoTarget": true,
"HasAlianZone": false,
"AlianZoneBoltNoOf3oClock": 1.0,
"AlianZoneBoltCnt": 8,
"AlianZoneIsCCW": false,
"AlianZoneIsShowXStep": false,
"ID": 32000920
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环/trendgraph.json
View file @ 6da8155f
......@@ -4,7 +4,7 @@
"Interval": 1,
"YRangePercent": 3.0,
"Mix": 1,
"ID": 54302323
"ID": 19728236
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/winder.component.config
View file @ 6da8155f
......@@ -12,7 +12,8 @@
<register type="IUiModule2" mapTo="UiModule2_DynAreaWinder" name="winder_da" />
<register type="IUiModule2" mapTo="UiModule2_MainPanel" name="winder_mp" />
<register type="IUiModule2" mapTo="UiModule2_CenterWinderPanel" name="winder_cwp" />
<register type="IUiModule2" mapTo="UiModule2_MainPanel2" name="winder_mp2" />
<register type="IUiModule2" mapTo="UiModule2_MainPanelV4" name="winder_mp4" />
<register type="IUiModule2" mapTo="UiModule2_ManualPanelV4" name="winder_map4" />
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/release_conf/FLY.Weight.UI.Server/Gage1/plcgroups/版本描述.txt
View file @ 6da8155f
......@@ -14,7 +14,8 @@ v3
//------------------------------
v4
少了内外收卷重量，计算理论线速度,没了边料设置
有特殊的总流量设置, 与IBC联动。
有特殊的总流量设置, 与IBC联动。
就只是杏坛胜亚乐在用
//------------------------------
v5
......
脚本/release_conf/FLY.Winder.UI.Server/Gage1/plcgroups/版本描述.txt
View file @ 6da8155f
......@@ -4,6 +4,11 @@
新长盛03是扫描架，旋转PLC是新长盛的陈工自己写的，汇川的H3U
只有旋转，用于给测厚仪旋转位置
//----------------------------------------------------------------
//2022/12/28
设备连接变量表_v0.6_和美下吹
只支持 下吹的旋转架信号, 只有 汕头茂森 两台机在使用
//----------------------------------------------------------------
//2022/04/03
//设备连接变量表_v1.1_张新成02
......@@ -43,3 +48,13 @@ HMI包含 收卷，IBC, 旋转，称重
设备连接变量表_v3.1_全部合体-20210302
与v3对比 未知
//----------------------------------------------------------------
//2022/12/28
设备连接变量表_v4.0_(下吹)汕头茂森_20221228
下吹的收卷, 只有 汕头茂森 两台机在使用
//----------------------------------------------------------------
//2023/02/18
设备连接变量表_v4.1_下吹内外反转_20230218
下吹的收卷反转了， 常规版本
脚本/版本描述.md
View file @ 6da8155f
# 和美安装包_v7.8.0-20230222
## 测厚仪服务器 v7.6.2
# 和美安装包_v7.8.0-20230227
## 测厚仪服务器 v7.8.0
1. 添加 支持modbus tcp 服务。
## 测厚仪客户端 v7.7.4
......
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