Skip to content

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

添加 称重164_v3 

修复 称重62126_v3 添加3个寄存器
parent 80e92591
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 428 additions and 8 deletions
Project.FLY.Weight/FLY.Weight.UI.Client/PgHopper.xaml
View file @ d72444f2
......@@ -124,6 +124,13 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="s" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="料阀异常" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ValveErrSet,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="s" />
</StackPanel>
</StackPanel>
</WrapPanel >
</Grid>
......@@ -153,7 +160,13 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="Hz" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="料位上限" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding MaterialUpperLimitSet,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="料位下限" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
......@@ -161,6 +174,7 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="报警偏差" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
......@@ -182,6 +196,13 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="料仓缺料" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding BinLackErrorSet,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" />
</StackPanel>
</StackPanel>
</WrapPanel >
......
Project.FLY.Weight/FLY.Weight.UI.Client/Properties/AssemblyInfo.cs
View file @ d72444f2
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.3.0.0")]
[assembly: AssemblyFileVersion("6.3.0.0")]
[assembly: AssemblyVersion("6.4.0.0")]
[assembly: AssemblyFileVersion("6.4.0.0")]
[assembly: Guid("756A3406-0E9B-4515-B08B-AEC902E5A7D4")]
Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs
View file @ d72444f2
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.3.0.0")]
[assembly: AssemblyFileVersion("6.3.0.0")]
[assembly: AssemblyVersion("6.4.0.0")]
[assembly: AssemblyFileVersion("6.4.0.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
Project.FLY.Weight/FLY.Weight/Common/WeighterC.cs
View file @ d72444f2
......@@ -588,6 +588,24 @@ namespace FLY.Weight.Common
[Description("缺料报警设定(kg)")]
public float LackErrorSet{ get; set; }
/// <summary>
/// 料位上限设定(kg)
/// </summary>
[Description("料位上限设定(kg)")]
public float MaterialUpperLimitSet { get; set; }
/// <summary>
/// 料阀异常设定(s)
/// </summary>
[Description("料阀异常设定(s)")]
public float ValveErrSet { get; set; }
/// <summary>
/// 料仓缺料设定(kg)
/// </summary>
[Description("料仓缺料设定(kg)")]
public float BinLackErrorSet { get; set; }
/// <summary>
/// 搅拌时间设定(s)
/// </summary>
......
Project.FLY.Weight/FLY.Weight/Properties/AssemblyInfo.cs
View file @ d72444f2
......@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FLY.Weight")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.3.0.0")]
[assembly: AssemblyFileVersion("6.3.0.0")]
[assembly: AssemblyVersion("6.4.0.0")]
[assembly: AssemblyFileVersion("6.4.0.0")]
Resource/称重/设备连接变量表_164_v3/Generated/WeighterAccessory.cs 0 → 100644
View file @ d72444f2
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
namespace FLY.Weight.Common
{
public class WeighterAccessory:INotifyPropertyChanged
{
#region 辅助代码生成
/// <summary>
/// 总流量设定
/// </summary>
[Description("总流量设定")]
public float TotalFlowSetting{ get; set; }
/// <summary>
/// 总流量显示
/// </summary>
[Description("总流量显示")]
public float TotalFlow{ get; set; }
/// <summary>
/// 总产量
/// </summary>
[Description("总产量")]
public float TotalProduction{ get; set; }
/// <summary>
/// 码轮周长mm
/// </summary>
[Description("码轮周长mm")]
public float WheelPerimeter{ get; set; }
/// <summary>
/// 码轮脉冲
/// </summary>
[Description("码轮脉冲")]
public float WheelPulse{ get; set; }
/// <summary>
/// 平均密度
/// </summary>
[Description("平均密度")]
public float Density{ get; set; }
/// <summary>
/// 边料不回收
/// </summary>
[Description("边料不回收")]
public bool IsRimNoRecycle{ get; set; }
/// <summary>
/// 边料kg/h
/// </summary>
[Description("边料kg/h")]
public float RimCharge{ get; set; }
/// <summary>
/// 厚度um
/// </summary>
[Description("厚度um")]
public float Thickness{ get; set; }
/// <summary>
/// 当前线速度m/min
/// </summary>
[Description("当前线速度m/min")]
public float CurrentVelocity{ get; set; }
/// <summary>
/// 当前线速度设置m/min
/// </summary>
[Description("当前线速度设置m/min")]
public float CurrentVelocitySet{ get; set; }
/// <summary>
/// 吹膜宽度mm
/// </summary>
[Description("吹膜宽度mm")]
public float TotalFilmWidth{ get; set; }
/// <summary>
/// 切边mm
/// </summary>
[Description("切边mm")]
public float RimWidth{ get; set; }
/// <summary>
/// 收卷宽度mm
/// </summary>
[Description("收卷宽度mm")]
public float ActFilmWidth{ get; set; }
/// <summary>
/// 设定厚度um
/// </summary>
[Description("设定厚度um")]
public float SetThickness{ get; set; }
/// <summary>
/// 理论速度m/min
/// </summary>
[Description("理论速度m/min")]
public float TargetVelocity{ get; set; }
/// <summary>
/// 内收卷当前m
/// </summary>
[Description("内收卷当前m")]
public float ACurrentLen{ get; set; }
/// <summary>
/// 内收卷当前kg
/// </summary>
[Description("内收卷当前kg")]
public float ACurrent{ get; set; }
/// <summary>
/// 内收卷上卷kg
/// </summary>
[Description("内收卷上卷kg")]
public float ALast{ get; set; }
/// <summary>
/// 外收卷当前m
/// </summary>
[Description("外收卷当前m")]
public float BCurrentLen{ get; set; }
/// <summary>
/// 外收卷当前kg
/// </summary>
[Description("外收卷当前kg")]
public float BCurrent{ get; set; }
/// <summary>
/// 外收卷上卷kg
/// </summary>
[Description("外收卷上卷kg")]
public float BLast{ get; set; }
/// <summary>
/// 内收卷清零
/// </summary>
[Description("内收卷清零")]
public bool AClear{ get; set; }
/// <summary>
/// 外收卷清零
/// </summary>
[Description("外收卷清零")]
public bool BClear{ get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
}
Resource/称重/设备连接变量表_164_v3/WeighterAccessory.cs 0 → 100644
View file @ d72444f2
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
namespace FLY.Weight.Common
{
public class WeighterAccessory:INotifyPropertyChanged
{
#region 辅助代码生成
/// <summary>
/// 总流量设定
/// </summary>
[Description("总流量设定")]
public float TotalFlowSetting{ get; set; }
/// <summary>
/// 总流量显示
/// </summary>
[Description("总流量显示")]
public float TotalFlow{ get; set; }
/// <summary>
/// 总产量
/// </summary>
[Description("总产量")]
public float TotalProduction{ get; set; }
/// <summary>
/// 码轮周长mm
/// </summary>
[Description("码轮周长mm")]
public float WheelPerimeter{ get; set; }
/// <summary>
/// 码轮脉冲
/// </summary>
[Description("码轮脉冲")]
public float WheelPulse{ get; set; }
/// <summary>
/// 平均密度
/// </summary>
[Description("平均密度")]
public float Density{ get; set; }
/// <summary>
/// 边料不回收
/// </summary>
[Description("边料不回收")]
public bool IsRimNoRecycle{ get; set; }
/// <summary>
/// 边料kg/h
/// </summary>
[Description("边料kg/h")]
public float RimCharge{ get; set; }
/// <summary>
/// 厚度um
/// </summary>
[Description("厚度um")]
public float Thickness{ get; set; }
/// <summary>
/// 当前线速度m/min
/// </summary>
[Description("当前线速度m/min")]
public float CurrentVelocity{ get; set; }
/// <summary>
/// 当前线速度设置m/min
/// </summary>
[Description("当前线速度设置m/min")]
public float CurrentVelocitySet{ get; set; }
/// <summary>
/// 吹膜宽度mm
/// </summary>
[Description("吹膜宽度mm")]
public float TotalFilmWidth{ get; set; }
/// <summary>
/// 切边mm
/// </summary>
[Description("切边mm")]
public float RimWidth{ get; set; }
/// <summary>
/// 收卷宽度mm
/// </summary>
[Description("收卷宽度mm")]
public float ActFilmWidth{ get; set; }
/// <summary>
/// 设定厚度um
/// </summary>
[Description("设定厚度um")]
public float SetThickness{ get; set; }
/// <summary>
/// 理论速度m/min
/// </summary>
[Description("理论速度m/min")]
public float TargetVelocity{ get; set; }
/// <summary>
/// 内收卷当前m
/// </summary>
[Description("内收卷当前m")]
public float ACurrentLen{ get; set; }
/// <summary>
/// 内收卷当前kg
/// </summary>
[Description("内收卷当前kg")]
public float ACurrent{ get; set; }
/// <summary>
/// 内收卷上卷kg
/// </summary>
[Description("内收卷上卷kg")]
public float ALast{ get; set; }
/// <summary>
/// 外收卷当前m
/// </summary>
[Description("外收卷当前m")]
public float BCurrentLen{ get; set; }
/// <summary>
/// 外收卷当前kg
/// </summary>
[Description("外收卷当前kg")]
public float BCurrent{ get; set; }
/// <summary>
/// 外收卷上卷kg
/// </summary>
[Description("外收卷上卷kg")]
public float BLast{ get; set; }
/// <summary>
/// 内收卷清零
/// </summary>
[Description("内收卷清零")]
public bool AClear{ get; set; }
/// <summary>
/// 外收卷清零
/// </summary>
[Description("外收卷清零")]
public bool BClear{ get; set; }
/// <summary>
/// 当前厚度um #.#
/// </summary>
[Description("当前厚度um #.#")]
public float Thickness4{ get; set; }
/// <summary>
/// 当前速度m/min
/// </summary>
[Description("当前速度m/min")]
public float CurrentVelocity4{ get; set; }
/// <summary>
/// 理论速度m/min
/// </summary>
[Description("理论速度m/min")]
public float TargetVelocity4{ get; set; }
/// <summary>
/// 总流量设定 kg/h
/// </summary>
[Description("总流量设定 kg/h")]
public float TotalFlowSetting4{ get; set; }
/// <summary>
/// 确定(↑）
/// </summary>
[Description("确定(↑）")]
public bool IsEnter4{ get; set; }
/// <summary>
/// 同步
/// </summary>
[Description("同步")]
public bool IsSync4{ get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
}
Resource/称重/设备连接变量表_164_v3/WeighterC.cs 0 → 100644
View file @ d72444f2
This diff is collapsed.
Resource/称重/设备连接变量表_62126_v3/Generated/plcgroup.json
View file @ d72444f2
......@@ -3095,6 +3095,33 @@
"OwnerName": "Items[4]",
"PropertyName": "LackErrorSet"
},
{
"DeviceIndex": 2,
"Mode": "4",
"Addr": 6180,
"Type": "UInt16",
"Scale": 0.1,
"OwnerName": "Items[2]",
"PropertyName": "MaterialUpperLimitSet"
},
{
"DeviceIndex": 2,
"Mode": "4",
"Addr": 6502,
"Type": "UInt16",
"Scale": 0.1,
"OwnerName": "Items[2]",
"PropertyName": "ValveErrSet"
},
{
"DeviceIndex": 2,
"Mode": "4",
"Addr": 6500,
"Type": "UInt16",
"Scale": 0.1,
"OwnerName": "Items[2]",
"PropertyName": "BinLackErrorSet"
},
{
"DeviceIndex": 0,
"Mode": "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