diff --git a/SlnMesnac.Model/domain/real_readdata.cs b/SlnMesnac.Model/domain/real_readdata.cs index bae6aa5..7297949 100644 --- a/SlnMesnac.Model/domain/real_readdata.cs +++ b/SlnMesnac.Model/domain/real_readdata.cs @@ -22,7 +22,7 @@ namespace SlnMesnac.Repository /// Nullable:False /// [PrimaryKey] - public int objid { get; set; } + public string objid { get; set; } /// /// Desc: @@ -38,6 +38,13 @@ namespace SlnMesnac.Repository /// public string lineno { get; set; } + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string bindno { get; set; } + /// /// Desc: /// Default: diff --git a/SlnMesnac.WPF/Model/Real_DataInfo.cs b/SlnMesnac.WPF/Model/Real_DataInfo.cs index deb80ab..8841258 100644 --- a/SlnMesnac.WPF/Model/Real_DataInfo.cs +++ b/SlnMesnac.WPF/Model/Real_DataInfo.cs @@ -189,6 +189,9 @@ namespace SlnMesnac.WPF.Model } } + /// + /// 带号 + /// private string _NextProductNo = ""; public string NextProductNo { diff --git a/SlnMesnac.WPF/Model/RfidInfo.cs b/SlnMesnac.WPF/Model/RfidInfo.cs deleted file mode 100644 index e56cbfe..0000000 --- a/SlnMesnac.WPF/Model/RfidInfo.cs +++ /dev/null @@ -1,72 +0,0 @@ -using SqlSugar; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SlnMesnac.WPF.Model -{ - public class RfidInfo : INotifyPropertyChanged - { - /// - /// 备 注: - /// 默认值: - /// - public string Deviceid { get; set; } = null!; - - /// - /// 备 注: - /// 默认值: - /// - public string? Name { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public string? Connectstr { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public decimal? Connectmode { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public string? Devicetype { get; set; } - - /// - /// 备 注:所属汇集软件ID - /// 默认值: - /// - public string? Collectid { get; set; } - - private string _isOnline ="未连接"; - - public string IsOnline - { - get { return _isOnline; } - set - { - if (_isOnline != value) - { - _isOnline = value; - OnPropertyChanged(nameof(IsOnline)); - } - } - } - - - public event PropertyChangedEventHandler? PropertyChanged; - - protected virtual void OnPropertyChanged(string propertyName) - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } - } -} \ No newline at end of file diff --git a/SlnMesnac.WPF/Model/SenorInfo.cs b/SlnMesnac.WPF/Model/SenorInfo.cs deleted file mode 100644 index ffffe14..0000000 --- a/SlnMesnac.WPF/Model/SenorInfo.cs +++ /dev/null @@ -1,92 +0,0 @@ -using SqlSugar; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SlnMesnac.WPF.Model -{ - public class SenorInfo : INotifyPropertyChanged - { - /// - /// 备 注: - /// 默认值: - /// - public string Sensorid { get; set; } = null!; - - /// - /// 备 注: - /// 默认值: - /// - public string Combineid { get; set; } = null!; - - /// - /// 备 注: - /// 默认值: - /// - public string? Name { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public decimal? Sensorser { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public decimal? Sensortypeid { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public string? Deviceid { get; set; } - - /// - /// 备 注: - /// 默认值: - /// - public decimal? Readinterval { get; set; } - - private string _readtime; - - public string Readtime - { - get { return _readtime; } - set - { - if (_readtime != value) - { - _readtime = value; - OnPropertyChanged(nameof(Readtime)); - } - } - } - private string _readdata; - - public string Readdata - { - get { return _readdata; } - set - { - if (_readdata != value) - { - _readdata = value; - OnPropertyChanged(nameof(Readdata)); - } - } - } - - - public event PropertyChangedEventHandler? PropertyChanged; - - protected virtual void OnPropertyChanged(string propertyName) - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } - } -} \ No newline at end of file diff --git a/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml b/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml index 69e3782..55382da 100644 --- a/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml +++ b/SlnMesnac.WPF/Page/IndexPage/HistorySearch.xaml @@ -175,7 +175,6 @@ - diff --git a/SlnMesnac.WPF/Page/IndexPage/ProductionLineUserControl.xaml b/SlnMesnac.WPF/Page/IndexPage/ProductionLineUserControl.xaml index a541f94..20d158a 100644 --- a/SlnMesnac.WPF/Page/IndexPage/ProductionLineUserControl.xaml +++ b/SlnMesnac.WPF/Page/IndexPage/ProductionLineUserControl.xaml @@ -200,21 +200,22 @@ Content="查询" Width="200" Visibility="Hidden" FontSize="20" Command="{Binding