@@ -8,7 +8,7 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="BPA.ApolloClient" Version="1.0.12" /> | <PackageReference Include="BPA.ApolloClient" Version="1.0.12" /> | ||||
<PackageReference Include="BPA.Helper" Version="1.0.54" /> | |||||
<PackageReference Include="BPA.Helper" Version="1.0.64" /> | |||||
<PackageReference Include="BPA.Message" Version="1.0.86" /> | <PackageReference Include="BPA.Message" Version="1.0.86" /> | ||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" /> | <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" /> | ||||
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" /> | <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" /> | ||||
@@ -17,10 +17,8 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" /> | <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" /> | ||||
<ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" /> | |||||
<ProjectReference Include="..\BPASmartClient.Http\BPASmartClient.Http.csproj" /> | <ProjectReference Include="..\BPASmartClient.Http\BPASmartClient.Http.csproj" /> | ||||
<ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" /> | <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" /> | ||||
<ProjectReference Include="..\BPASmartClient.MQTT\BPASmartClient.MQTT.csproj" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
</Project> | </Project> |
@@ -459,14 +459,13 @@ | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="BPA.Helper" Version="1.0.62" /> | |||||
<PackageReference Include="BPA.Helper" Version="1.0.64" /> | |||||
<PackageReference Include="BPA.Message" Version="1.0.86" /> | <PackageReference Include="BPA.Message" Version="1.0.86" /> | ||||
<PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" /> | <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" /> | ||||
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" /> | <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" /> | |||||
<ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" /> | <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" /> | ||||
<ProjectReference Include="..\BPASmartClient.Nfc\BPASmartClient.Nfc.csproj" /> | <ProjectReference Include="..\BPASmartClient.Nfc\BPASmartClient.Nfc.csproj" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
@@ -4,7 +4,7 @@ using System.Linq; | |||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using BPASmartClient.CustomResource.Pages.Enums; | using BPASmartClient.CustomResource.Pages.Enums; | ||||
using System.Windows; | using System.Windows; | ||||
@@ -13,7 +13,7 @@ namespace BPASmartClient.CustomResource.Pages.Model | |||||
/// <summary> | /// <summary> | ||||
/// 在启动界面之前设置菜单项 | /// 在启动界面之前设置菜单项 | ||||
/// </summary> | /// </summary> | ||||
public class MenuManage : ObservableObject | |||||
public class MenuManage : NotifyBase | |||||
{ | { | ||||
private volatile static MenuManage _Instance; | private volatile static MenuManage _Instance; | ||||
public static MenuManage GetInstance => _Instance ?? (_Instance = new MenuManage()); | public static MenuManage GetInstance => _Instance ?? (_Instance = new MenuManage()); | ||||
@@ -22,7 +22,7 @@ namespace BPASmartClient.CustomResource.Pages.Model | |||||
public ObservableCollection<MenuModel> menuModels { get; set; } = new ObservableCollection<MenuModel>(); | public ObservableCollection<MenuModel> menuModels { get; set; } = new ObservableCollection<MenuModel>(); | ||||
} | } | ||||
public class MenuModel : ObservableObject | |||||
public class MenuModel : NotifyBase | |||||
{ | { | ||||
private Permission[] pers | private Permission[] pers | ||||
@@ -84,7 +84,7 @@ namespace BPASmartClient.CustomResource.Pages.Model | |||||
} | } | ||||
public class SubMenumodel : ObservableObject | |||||
public class SubMenumodel : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 子菜单名称 | /// 子菜单名称 | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Concurrent; | using System.Collections.Concurrent; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -9,7 +9,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class PlcVariableInfoManage:ObservableObject | |||||
public class PlcVariableInfoManage:NotifyBase | |||||
{ | { | ||||
public ConcurrentDictionary<string, ObservableCollection<PlcVariableInfoModel>> VariablesInfo { get; set; } = new ConcurrentDictionary<string, ObservableCollection<PlcVariableInfoModel>>(); | public ConcurrentDictionary<string, ObservableCollection<PlcVariableInfoModel>> VariablesInfo { get; set; } = new ConcurrentDictionary<string, ObservableCollection<PlcVariableInfoModel>>(); | ||||
} | } | ||||
@@ -1,5 +1,5 @@ | |||||
| | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -8,7 +8,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class PlcVariableInfoModel : ObservableObject | |||||
public class PlcVariableInfoModel : NotifyBase | |||||
{ | { | ||||
//public int Id { get { return _id; } set { _id = value;OnPropertyChanged(); } } | //public int Id { get { return _id; } set { _id = value;OnPropertyChanged(); } } | ||||
//private int _id; | //private int _id; | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||
@@ -8,7 +8,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class RecipeCompleteLog : ObservableObject | |||||
public class RecipeCompleteLog : NotifyBase | |||||
{ | { | ||||
[Key] | [Key] | ||||
public int Id { get; set; } | public int Id { get; set; } | ||||
@@ -4,12 +4,12 @@ using System.Linq; | |||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using System.ComponentModel; | using System.ComponentModel; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
[Serializable] | [Serializable] | ||||
public class ReportBase : ObservableObject | |||||
public class ReportBase : NotifyBase | |||||
{ | { | ||||
} | } | ||||
} | } |
@@ -4,7 +4,7 @@ using System.ComponentModel; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
@@ -4,11 +4,11 @@ using System.ComponentModel.DataAnnotations; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class RunLog : ObservableObject | |||||
public class RunLog : NotifyBase | |||||
{ | { | ||||
[Key] | [Key] | ||||
public int Id { get; set; } | public int Id { get; set; } | ||||
@@ -1,6 +1,6 @@ | |||||
using BPASmartClient.CustomResource.Pages.Enums; | using BPASmartClient.CustomResource.Pages.Enums; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -9,7 +9,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class UserInfo : ObservableObject | |||||
public class UserInfo : NotifyBase | |||||
{ | { | ||||
public String LastLogInTime { get; set; } = "无"; | public String LastLogInTime { get; set; } = "无"; | ||||
@@ -4,11 +4,11 @@ using System.ComponentModel.DataAnnotations; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class UserLog : ObservableObject | |||||
public class UserLog : NotifyBase | |||||
{ | { | ||||
[Key] | [Key] | ||||
public int Id { get; set; } | public int Id { get; set; } | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.Model | namespace BPASmartClient.CustomResource.Pages.Model | ||||
{ | { | ||||
public class UserTreeViewModel: ObservableObject | |||||
public class UserTreeViewModel: NotifyBase | |||||
{ | { | ||||
public string Name { get; set; } | public string Name { get; set; } | ||||
@@ -1,6 +1,6 @@ | |||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -10,7 +10,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class AddNewUserViewModel:ObservableObject | |||||
public class AddNewUserViewModel:NotifyBase | |||||
{ | { | ||||
public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } } | public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } } | ||||
private string _mErrorInfo; | private string _mErrorInfo; | ||||
@@ -3,11 +3,10 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.Concurrent; | using System.Collections.Concurrent; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Windows; | using System.Windows; | ||||
using BPASmartClient.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
@@ -16,7 +15,7 @@ using System.Threading; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class AlarmViewModel : ObservableObject | |||||
public class AlarmViewModel : NotifyBase | |||||
{ | { | ||||
public AlarmViewModel() | public AlarmViewModel() | ||||
{ | { | ||||
@@ -72,7 +71,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel | |||||
private void GetHistoryAlarm() | private void GetHistoryAlarm() | ||||
{ | { | ||||
var data = Sqlite<Alarm>.GetInstance.GetData(); | |||||
var data = Sqlite<BPASmartClient.Model.Alarm>.GetInstance.GetData(); | |||||
if (data != null) | if (data != null) | ||||
{ | { | ||||
HistoryAlarm.Clear(); | HistoryAlarm.Clear(); | ||||
@@ -132,8 +131,8 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel | |||||
private DateTime _mEndDateTime = DateTime.Now; | private DateTime _mEndDateTime = DateTime.Now; | ||||
public static ObservableCollection<Alarm> AlarmInfos { get; set; } | |||||
public ObservableCollection<Alarm> HistoryAlarm { get; set; } = new ObservableCollection<Alarm>(); | |||||
public static ObservableCollection<BPASmartClient.Model.Alarm> AlarmInfos { get; set; } | |||||
public ObservableCollection<BPASmartClient.Model.Alarm> HistoryAlarm { get; set; } = new(); | |||||
} | } | ||||
} | } |
@@ -5,14 +5,14 @@ using System.Linq; | |||||
using System.Runtime.CompilerServices; | using System.Runtime.CompilerServices; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using BPA.Helper; | using BPA.Helper; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Windows.Media; | using System.Windows.Media; | ||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class DebugLogViewModel : ObservableObject | |||||
public class DebugLogViewModel : NotifyBase | |||||
{ | { | ||||
public DebugLogViewModel() | public DebugLogViewModel() | ||||
{ | { | ||||
@@ -38,7 +38,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel | |||||
} | } | ||||
public class MessageModel : ObservableObject | |||||
public class MessageModel : NotifyBase | |||||
{ | { | ||||
public string LogInfo { get { return _mLogInfo; } set { _mLogInfo = value; OnPropertyChanged(); } } | public string LogInfo { get { return _mLogInfo; } set { _mLogInfo = value; OnPropertyChanged(); } } | ||||
private string _mLogInfo; | private string _mLogInfo; | ||||
@@ -6,12 +6,12 @@ using System.Threading.Tasks; | |||||
using System.Windows; | using System.Windows; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class LoginViewModel : ObservableObject | |||||
public class LoginViewModel : NotifyBase | |||||
{ | { | ||||
public LoginViewModel() | public LoginViewModel() | ||||
{ | { | ||||
@@ -11,12 +11,12 @@ using System.Windows.Media; | |||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class MainViewModel : ObservableObject | |||||
public class MainViewModel : NotifyBase | |||||
{ | { | ||||
public MainViewModel() | public MainViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.CustomResource.Pages.Enums; | using BPASmartClient.CustomResource.Pages.Enums; | ||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
@@ -14,7 +14,7 @@ using BPASmartClient.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class NfcSetViewModel : ObservableObject | |||||
public class NfcSetViewModel : NotifyBase | |||||
{ | { | ||||
public NfcSetViewModel() | public NfcSetViewModel() | ||||
{ | { | ||||
@@ -161,7 +161,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel | |||||
} | } | ||||
public class PermissionSelect : ObservableObject | |||||
public class PermissionSelect : NotifyBase | |||||
{ | { | ||||
public string PermissionName { get { return _mPermissionName; } set { _mPermissionName = value; OnPropertyChanged(); } } | public string PermissionName { get { return _mPermissionName; } set { _mPermissionName = value; OnPropertyChanged(); } } | ||||
@@ -5,13 +5,13 @@ using System.Text; | |||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class PasswordChangeViewModel : ObservableObject | |||||
public class PasswordChangeViewModel : NotifyBase | |||||
{ | { | ||||
private void CheckPassword(UserInfo userInfo) | private void CheckPassword(UserInfo userInfo) | ||||
{ | { | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class PermissionConfigurationViewModel:ObservableObject | |||||
public class PermissionConfigurationViewModel:NotifyBase | |||||
{ | { | ||||
} | } | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class ProductionDataViewModel : ObservableObject | |||||
public class ProductionDataViewModel : NotifyBase | |||||
{ | { | ||||
public ProductionDataViewModel() | public ProductionDataViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
@@ -12,7 +12,7 @@ using BPASmartClient.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class RecipeCompleteViewModel : ObservableObject | |||||
public class RecipeCompleteViewModel : NotifyBase | |||||
{ | { | ||||
public RecipeCompleteViewModel() | public RecipeCompleteViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
@@ -13,7 +13,7 @@ using System.Diagnostics; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class RunLogViewModel : ObservableObject | |||||
public class RunLogViewModel : NotifyBase | |||||
{ | { | ||||
public RunLogViewModel() | public RunLogViewModel() | ||||
{ | { | ||||
@@ -2,7 +2,7 @@ | |||||
using BPASmartClient.CustomResource.Pages.View; | using BPASmartClient.CustomResource.Pages.View; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -14,7 +14,7 @@ using System.Windows; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class UserConfigViewModel:ObservableObject | |||||
public class UserConfigViewModel:NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 页面列表集合 | /// 页面列表集合 | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using System.Windows; | using System.Windows; | ||||
@@ -12,7 +12,7 @@ using BPASmartClient.Helper; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class UserLogViewModel : ObservableObject | |||||
public class UserLogViewModel : NotifyBase | |||||
{ | { | ||||
public UserLogViewModel() | public UserLogViewModel() | ||||
{ | { | ||||
@@ -1,7 +1,7 @@ | |||||
using BPA.Message; | using BPA.Message; | ||||
using BPASmartClient.CustomResource.Pages.Enums; | using BPASmartClient.CustomResource.Pages.Enums; | ||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using Newtonsoft.Json; | using Newtonsoft.Json; | ||||
using System; | using System; | ||||
@@ -15,7 +15,7 @@ using System.Windows; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
internal class UserManageViewModel:ObservableObject | |||||
internal class UserManageViewModel:NotifyBase | |||||
{ | { | ||||
//private static UserManageViewModel _instance; | //private static UserManageViewModel _instance; | ||||
//public static UserManageViewModel GetInstance => _instance ??= new UserManageViewModel(); | //public static UserManageViewModel GetInstance => _instance ??= new UserManageViewModel(); | ||||
@@ -2,7 +2,7 @@ | |||||
using BPASmartClient.CustomResource.UserControls; | using BPASmartClient.CustomResource.UserControls; | ||||
using BPASmartClient.CustomResource.UserControls.MessageShow; | using BPASmartClient.CustomResource.UserControls.MessageShow; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -14,7 +14,7 @@ using System.Windows; | |||||
namespace BPASmartClient.CustomResource.Pages.ViewModel | namespace BPASmartClient.CustomResource.Pages.ViewModel | ||||
{ | { | ||||
public class VariableViewModel : ObservableObject | |||||
public class VariableViewModel : NotifyBase | |||||
{ | { | ||||
public ObservableCollection<PlcVariableInfoModel> Variables { get; set; } = new ObservableCollection<PlcVariableInfoModel>(); | public ObservableCollection<PlcVariableInfoModel> Variables { get; set; } = new ObservableCollection<PlcVariableInfoModel>(); | ||||
@@ -12,7 +12,6 @@ | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" /> | |||||
<ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" /> | <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" /> | ||||
<ProjectReference Include="..\BPASmartClient.Peripheral\BPASmartClient.Peripheral.csproj" /> | <ProjectReference Include="..\BPASmartClient.Peripheral\BPASmartClient.Peripheral.csproj" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
@@ -1,7 +1,5 @@ | |||||
using BPA.Message; | using BPA.Message; | ||||
using BPA.Message.Enum; | using BPA.Message.Enum; | ||||
using BPASmartClient.Helper; | |||||
using BPASmartClient.Message; | |||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using BPASmartClient.Peripheral; | using BPASmartClient.Peripheral; | ||||
using System; | using System; | ||||
@@ -14,8 +12,8 @@ using System.Threading; | |||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.Model.单片机; | using BPASmartClient.Model.单片机; | ||||
using BPASmartClient.EventBus; | |||||
using BPA.Models; | using BPA.Models; | ||||
using BPA.Helper; | |||||
namespace BPASmartClient.Device | namespace BPASmartClient.Device | ||||
{ | { | ||||
@@ -67,7 +67,7 @@ namespace BPASmartClient.Device | |||||
/// <summary> | /// <summary> | ||||
/// 设备报警信息集合 | /// 设备报警信息集合 | ||||
/// </summary> | /// </summary> | ||||
List<Alarm> alarms { get; set; } | |||||
List<BPASmartClient.Model.Alarm> alarms { get; set; } | |||||
/// <summary> | /// <summary> | ||||
/// 接口报警对象 | /// 接口报警对象 | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.Device | namespace BPASmartClient.Device | ||||
{ | { | ||||
public class VariableMonitor : ObservableObject | |||||
public class VariableMonitor : NotifyBase | |||||
{ | { | ||||
public int Id { get { return _mId; } set { _mId = value; OnPropertyChanged(); } } | public int Id { get { return _mId; } set { _mId = value; OnPropertyChanged(); } } | ||||
private int _mId; | private int _mId; | ||||
@@ -16,7 +16,7 @@ | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="BPA.Helper" Version="1.0.54" /> | |||||
<PackageReference Include="BPA.Helper" Version="1.0.64" /> | |||||
<PackageReference Include="BPA.Message" Version="1.0.86" /> | <PackageReference Include="BPA.Message" Version="1.0.86" /> | ||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> | <PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> | ||||
</ItemGroup> | </ItemGroup> | ||||
@@ -6,8 +6,4 @@ | |||||
<Nullable>enable</Nullable> | <Nullable>enable</Nullable> | ||||
</PropertyGroup> | </PropertyGroup> | ||||
<ItemGroup> | |||||
<ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" /> | |||||
</ItemGroup> | |||||
</Project> | </Project> |
@@ -16,7 +16,7 @@ | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="BPA.Communication" Version="1.0.105" /> | |||||
<PackageReference Include="BPA.Communication" Version="1.0.106" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -1,8 +1,8 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model.Bom | namespace BPASmartClient.FoodStationTest.Model.Bom | ||||
{ | { | ||||
public class BomMaterial : ObservableObject | |||||
public class BomMaterial : NotifyBase | |||||
{ | { | ||||
public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } } | public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } } | ||||
public int _count { get; set; } | public int _count { get; set; } | ||||
@@ -1,11 +1,11 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model.GVL | namespace BPASmartClient.FoodStationTest.Model.GVL | ||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// PLC变量信息 | /// PLC变量信息 | ||||
/// </summary> | /// </summary> | ||||
public class PlcInfos : ObservableObject | |||||
public class PlcInfos : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 变量序号 | /// 变量序号 | ||||
@@ -1,11 +1,11 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model.Par | namespace BPASmartClient.FoodStationTest.Model.Par | ||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 连接参数设置。 | /// 连接参数设置。 | ||||
/// </summary> | /// </summary> | ||||
public class ConnectParMode : ObservableObject | |||||
public class ConnectParMode : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 海科PLC是否连接 | /// 海科PLC是否连接 | ||||
@@ -1,11 +1,11 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model | namespace BPASmartClient.FoodStationTest.Model | ||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 味魔方当前状态。 | /// 味魔方当前状态。 | ||||
/// </summary> | /// </summary> | ||||
public class DeviceCurrentStatus : ObservableObject | |||||
public class DeviceCurrentStatus : NotifyBase | |||||
{ | { | ||||
public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } | public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } | ||||
@@ -1,12 +1,12 @@ | |||||
using BPASmartClient.FoodStationTest.Model.Bom; | using BPASmartClient.FoodStationTest.Model.Bom; | ||||
using BPASmartClient.FoodStationTest.Model.Par; | using BPASmartClient.FoodStationTest.Model.Par; | ||||
using BPASmartClient.FoodStationTest.Model.RawMaterial; | using BPASmartClient.FoodStationTest.Model.RawMaterial; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
namespace BPASmartClient.FoodStationTest.Model | namespace BPASmartClient.FoodStationTest.Model | ||||
{ | { | ||||
public class DevicePar : ObservableObject | |||||
public class DevicePar : NotifyBase | |||||
{ | { | ||||
public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>(); | public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>(); | ||||
public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } } | public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } } | ||||
@@ -1,8 +1,8 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model | namespace BPASmartClient.FoodStationTest.Model | ||||
{ | { | ||||
public class DeviceParMode : ObservableObject | |||||
public class DeviceParMode : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
@@ -1,8 +1,8 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model.RawMaterial | namespace BPASmartClient.FoodStationTest.Model.RawMaterial | ||||
{ | { | ||||
public class RawMaterialColl : ObservableObject | |||||
public class RawMaterialColl : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 原料设备IP | /// 原料设备IP | ||||
@@ -1,8 +1,8 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model.RawMaterial | namespace BPASmartClient.FoodStationTest.Model.RawMaterial | ||||
{ | { | ||||
public class RawMaterialStockBin : ObservableObject | |||||
public class RawMaterialStockBin : NotifyBase | |||||
{ | { | ||||
public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } } | public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } } | ||||
@@ -1,5 +1,5 @@ | |||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Threading; | using System.Threading; | ||||
@@ -8,7 +8,7 @@ namespace BPASmartClient.FoodStationTest.Model | |||||
/// <summary> | /// <summary> | ||||
/// 配方模块 | /// 配方模块 | ||||
/// </summary> | /// </summary> | ||||
public class RecipeModel : ObservableObject | |||||
public class RecipeModel : NotifyBase | |||||
{ | { | ||||
[Newtonsoft.Json.JsonIgnore] | [Newtonsoft.Json.JsonIgnore] | ||||
public bool IsEnable { get { return _mIsEnable; } set { _mIsEnable = value; OnPropertyChanged(); } } | public bool IsEnable { get { return _mIsEnable; } set { _mIsEnable = value; OnPropertyChanged(); } } | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
namespace BPASmartClient.FoodStationTest.Model | namespace BPASmartClient.FoodStationTest.Model | ||||
@@ -7,7 +7,7 @@ namespace BPASmartClient.FoodStationTest.Model | |||||
/// <summary> | /// <summary> | ||||
/// 远程配方数据。 | /// 远程配方数据。 | ||||
/// </summary> | /// </summary> | ||||
public class RemoteRecipeData : ObservableObject | |||||
public class RemoteRecipeData : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 配方名称 | /// 配方名称 | ||||
@@ -1,8 +1,8 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.FoodStationTest.Model | namespace BPASmartClient.FoodStationTest.Model | ||||
{ | { | ||||
public class RemoteRecipeRawMaterial : ObservableObject | |||||
public class RemoteRecipeRawMaterial : NotifyBase | |||||
{ | { | ||||
public int DeviceIp { get { return _mIp; } set { _mIp = value; } } | public int DeviceIp { get { return _mIp; } set { _mIp = value; } } | ||||
private int _mIp; | private int _mIp; | ||||
@@ -4,14 +4,14 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.Model.Bom; | using BPASmartClient.FoodStationTest.Model.Bom; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class BomOfMaterialViewModel : ObservableObject | |||||
public class BomOfMaterialViewModel : NotifyBase | |||||
{ | { | ||||
public BomOfMaterialViewModel() | public BomOfMaterialViewModel() | ||||
{ | { | ||||
@@ -1,14 +1,14 @@ | |||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class ChangeDeviceNameViewModel : ObservableObject | |||||
public class ChangeDeviceNameViewModel : NotifyBase | |||||
{ | { | ||||
public ChangeDeviceNameViewModel() | public ChangeDeviceNameViewModel() | ||||
{ | { | ||||
@@ -1,13 +1,13 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.View; | using BPASmartClient.FoodStationTest.View; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class DeviceListViewModel : ObservableObject | |||||
public class DeviceListViewModel : NotifyBase | |||||
{ | { | ||||
public DeviceListViewModel() | public DeviceListViewModel() | ||||
{ | { | ||||
@@ -53,7 +53,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel | |||||
public ObservableCollection<Devices> devices { get; set; } | public ObservableCollection<Devices> devices { get; set; } | ||||
} | } | ||||
public class Devices : ObservableObject | |||||
public class Devices : NotifyBase | |||||
{ | { | ||||
public int Serial { get { return _mSerial; } set { _mSerial = value; OnPropertyChanged(); } } | public int Serial { get { return _mSerial; } set { _mSerial = value; OnPropertyChanged(); } } | ||||
private int _mSerial; | private int _mSerial; | ||||
@@ -2,14 +2,14 @@ | |||||
using BPASmartClient.CustomResource.UserControls.MessageShow; | using BPASmartClient.CustomResource.UserControls.MessageShow; | ||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class DeviceMaterialParViewModel : ObservableObject | |||||
public class DeviceMaterialParViewModel : NotifyBase | |||||
{ | { | ||||
public DeviceMaterialParViewModel() | public DeviceMaterialParViewModel() | ||||
{ | { | ||||
@@ -1,10 +1,10 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class HardwareStatusViewModel : ObservableObject | |||||
public class HardwareStatusViewModel : NotifyBase | |||||
{ | { | ||||
public HardwareStatusViewModel() | public HardwareStatusViewModel() | ||||
{ | { | ||||
@@ -1,12 +1,12 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class ManualCommViewModel : ObservableObject | |||||
public class ManualCommViewModel : NotifyBase | |||||
{ | { | ||||
public ManualCommViewModel() | public ManualCommViewModel() | ||||
{ | { | ||||
@@ -2,7 +2,7 @@ | |||||
using BPASmartClient.CustomResource.UserControls.MessageShow; | using BPASmartClient.CustomResource.UserControls.MessageShow; | ||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -13,7 +13,7 @@ using System.Threading; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class ManualControlViewModel : ObservableObject | |||||
public class ManualControlViewModel : NotifyBase | |||||
{ | { | ||||
public ManualControlViewModel() | public ManualControlViewModel() | ||||
{ | { | ||||
@@ -409,7 +409,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel | |||||
public class CylinderModel : ObservableObject | |||||
public class CylinderModel : NotifyBase | |||||
{ | { | ||||
public bool LeftTog { get { return _mLeftTog; } set { _mLeftTog = value; OnPropertyChanged(); } } | public bool LeftTog { get { return _mLeftTog; } set { _mLeftTog = value; OnPropertyChanged(); } } | ||||
private bool _mLeftTog; | private bool _mLeftTog; | ||||
@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.Model.HK_PLC; | using BPASmartClient.FoodStationTest.Model.HK_PLC; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.ComponentModel; | using System.ComponentModel; | ||||
@@ -15,7 +15,7 @@ using System.Windows; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class ManualFlowViewModel : ObservableObject | |||||
public class ManualFlowViewModel : NotifyBase | |||||
{ | { | ||||
public ManualFlowViewModel() | public ManualFlowViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using BPASmartClient.CustomResource.UserControls; | |||||
using BPASmartClient.CustomResource.UserControls.MessageShow; | using BPASmartClient.CustomResource.UserControls.MessageShow; | ||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -11,7 +11,7 @@ using System.Linq; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class NewLocalRecipeViewModel : ObservableObject | |||||
public class NewLocalRecipeViewModel : NotifyBase | |||||
{ | { | ||||
public NewLocalRecipeViewModel() | public NewLocalRecipeViewModel() | ||||
{ | { | ||||
@@ -1,7 +1,7 @@ | |||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -9,7 +9,7 @@ using System.Linq; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel; | namespace BPASmartClient.FoodStationTest.ViewModel; | ||||
public class NewMaterialViewModel : ObservableObject | |||||
public class NewMaterialViewModel : NotifyBase | |||||
{ | { | ||||
public ObservableCollection<RawMaterialModel> Materials { get; set; } = Json<LocaMaterial>.Data.LocalMaterails; | public ObservableCollection<RawMaterialModel> Materials { get; set; } = Json<LocaMaterial>.Data.LocalMaterails; | ||||
@@ -2,7 +2,7 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -11,7 +11,7 @@ using System.Text; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class NewRecipeViewModel : ObservableObject | |||||
public class NewRecipeViewModel : NotifyBase | |||||
{ | { | ||||
public NewRecipeViewModel() | public NewRecipeViewModel() | ||||
{ | { | ||||
@@ -1,11 +1,11 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.Model.GVL; | using BPASmartClient.FoodStationTest.Model.GVL; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class PlcVarMonitorViewModel : ObservableObject | |||||
public class PlcVarMonitorViewModel : NotifyBase | |||||
{ | { | ||||
public PlcVarMonitorViewModel() | public PlcVarMonitorViewModel() | ||||
{ | { | ||||
@@ -1,11 +1,11 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.Model.GVL; | using BPASmartClient.FoodStationTest.Model.GVL; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class ProcessMonitorViewModel : ObservableObject | |||||
public class ProcessMonitorViewModel : NotifyBase | |||||
{ | { | ||||
public ProcessMonitorViewModel() | public ProcessMonitorViewModel() | ||||
{ | { | ||||
@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.Model; | using BPASmartClient.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Concurrent; | using System.Collections.Concurrent; | ||||
@@ -14,7 +14,7 @@ using System.Threading; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class RecipeControlViewModel : ObservableObject | |||||
public class RecipeControlViewModel : NotifyBase | |||||
{ | { | ||||
ConcurrentQueue<string> devices = new ConcurrentQueue<string>(); | ConcurrentQueue<string> devices = new ConcurrentQueue<string>(); | ||||
@@ -1,6 +1,6 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -8,7 +8,7 @@ using System.Linq; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class RecipeInfosViewModel : ObservableObject | |||||
public class RecipeInfosViewModel : NotifyBase | |||||
{ | { | ||||
public RecipeInfosViewModel() | public RecipeInfosViewModel() | ||||
{ | { | ||||
@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.View; | using BPASmartClient.FoodStationTest.View; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -12,7 +12,7 @@ using System.Linq; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class RecipeReceiveViewModel : ObservableObject | |||||
public class RecipeReceiveViewModel : NotifyBase | |||||
{ | { | ||||
//ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>(); | //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>(); | ||||
public RecipeReceiveViewModel() | public RecipeReceiveViewModel() | ||||
@@ -4,14 +4,14 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.View; | using BPASmartClient.FoodStationTest.View; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class RecipeSettingsViewModel : ObservableObject | |||||
public class RecipeSettingsViewModel : NotifyBase | |||||
{ | { | ||||
public RecipeSettingsViewModel() | public RecipeSettingsViewModel() | ||||
{ | { | ||||
@@ -1,13 +1,13 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
internal class SelectRecipesViewModel : ObservableObject | |||||
internal class SelectRecipesViewModel : NotifyBase | |||||
{ | { | ||||
public SelectRecipesViewModel() | public SelectRecipesViewModel() | ||||
{ | { | ||||
@@ -93,7 +93,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel | |||||
public RelayCommand ConfirmCommand { get; set; } | public RelayCommand ConfirmCommand { get; set; } | ||||
internal class RecipeDataWithCheck : ObservableObject | |||||
internal class RecipeDataWithCheck : NotifyBase | |||||
{ | { | ||||
public RemoteRecipeData Recipe { get; set; } | public RemoteRecipeData Recipe { get; set; } | ||||
private bool _IsSelected; | private bool _IsSelected; | ||||
@@ -2,14 +2,14 @@ | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.View; | using BPASmartClient.FoodStationTest.View; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Linq; | using System.Linq; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class SiemensRecipeReceiveViewModel : ObservableObject | |||||
public class SiemensRecipeReceiveViewModel : NotifyBase | |||||
{ | { | ||||
//ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>(); | //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>(); | ||||
public SiemensRecipeReceiveViewModel() | public SiemensRecipeReceiveViewModel() | ||||
@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.FoodStationTest.Model; | using BPASmartClient.FoodStationTest.Model; | ||||
using BPASmartClient.FoodStationTest.Model.RawMaterial; | using BPASmartClient.FoodStationTest.Model.RawMaterial; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -12,7 +12,7 @@ using System.Linq; | |||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class StockBinRawMaterialViewModel : ObservableObject | |||||
public class StockBinRawMaterialViewModel : NotifyBase | |||||
{ | { | ||||
public StockBinRawMaterialViewModel() | public StockBinRawMaterialViewModel() | ||||
{ | { | ||||
@@ -4,12 +4,12 @@ using BPASmartClient.FoodStationTest.Model; | |||||
using BPASmartClient.FoodStationTest.Model.HK_PLC; | using BPASmartClient.FoodStationTest.Model.HK_PLC; | ||||
using BPASmartClient.FoodStationTest.Model.Par; | using BPASmartClient.FoodStationTest.Model.Par; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
namespace BPASmartClient.FoodStationTest.ViewModel | namespace BPASmartClient.FoodStationTest.ViewModel | ||||
{ | { | ||||
public class SystemParViewModel : ObservableObject | |||||
public class SystemParViewModel : NotifyBase | |||||
{ | { | ||||
public SystemParViewModel() | public SystemParViewModel() | ||||
{ | { | ||||
@@ -18,7 +18,6 @@ | |||||
<ItemGroup> | <ItemGroup> | ||||
<ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" /> | <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" /> | ||||
<ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
</Project> | </Project> |
@@ -17,7 +17,7 @@ | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
<PackageReference Include="BPA.Communication" Version="1.0.36" /> | |||||
<PackageReference Include="BPA.Communication" Version="1.0.106" /> | |||||
</ItemGroup> | </ItemGroup> | ||||
<ItemGroup> | <ItemGroup> | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.JXJFoodBigStation.Model | namespace BPASmartClient.JXJFoodBigStation.Model | ||||
{ | { | ||||
public class DeviceCurrentStatus : ObservableObject | |||||
public class DeviceCurrentStatus : NotifyBase | |||||
{ | { | ||||
public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } | public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.Model | namespace BPASmartClient.JXJFoodBigStation.Model | ||||
{ | { | ||||
internal class DeviceInfo:ObservableObject | |||||
internal class DeviceInfo:NotifyBase | |||||
{ | { | ||||
public string IpAddress { get { return _mIpAddress; } set { _mIpAddress = value; OnPropertyChanged(); } } | public string IpAddress { get { return _mIpAddress; } set { _mIpAddress = value; OnPropertyChanged(); } } | ||||
private string _mIpAddress; | private string _mIpAddress; | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.Model | namespace BPASmartClient.JXJFoodBigStation.Model | ||||
{ | { | ||||
public class PlcVarMonitor: ObservableObject | |||||
public class PlcVarMonitor: NotifyBase | |||||
{ | { | ||||
private int _serialNum; | private int _serialNum; | ||||
public int SerialNum { get { return _serialNum; } set { _serialNum = value;OnPropertyChanged(); } } | public int SerialNum { get { return _serialNum; } set { _serialNum = value;OnPropertyChanged(); } } | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.Model | namespace BPASmartClient.JXJFoodBigStation.Model | ||||
{ | { | ||||
public class RawMaterial :ObservableObject | |||||
public class RawMaterial :NotifyBase | |||||
{ | { | ||||
private int _mIp; | private int _mIp; | ||||
public int DeviceIp { get { return _mIp; } set { _mIp = value; OnPropertyChanged(); } } | public int DeviceIp { get { return _mIp; } set { _mIp = value; OnPropertyChanged(); } } | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -8,7 +8,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.Model | namespace BPASmartClient.JXJFoodBigStation.Model | ||||
{ | { | ||||
public class RecipeData : ObservableObject | |||||
public class RecipeData : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 配方名称 | /// 配方名称 | ||||
@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -18,7 +18,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class BomOfMaterialViewModel : ObservableObject | |||||
public class BomOfMaterialViewModel : NotifyBase | |||||
{ | { | ||||
public BomOfMaterialViewModel() | public BomOfMaterialViewModel() | ||||
{ | { | ||||
@@ -1,6 +1,6 @@ | |||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -10,7 +10,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
internal class ChangeDeviceNameViewModel:ObservableObject | |||||
internal class ChangeDeviceNameViewModel:NotifyBase | |||||
{ | { | ||||
private static string IpAddress = string.Empty; | private static string IpAddress = string.Empty; | ||||
@@ -2,7 +2,7 @@ | |||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.View; | using BPASmartClient.JXJFoodBigStation.View; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -13,7 +13,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
internal class DeviceManageViewModel:ObservableObject | |||||
internal class DeviceManageViewModel:NotifyBase | |||||
{ | { | ||||
public ObservableCollection<DeviceInfo> Devices { get; set; } = new ObservableCollection<DeviceInfo>() { new DeviceInfo { DeviceName = "123", IpAddress = "123.213.123.213." } }; | public ObservableCollection<DeviceInfo> Devices { get; set; } = new ObservableCollection<DeviceInfo>() { new DeviceInfo { DeviceName = "123", IpAddress = "123.213.123.213." } }; | ||||
@@ -1,7 +1,7 @@ | |||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -15,7 +15,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class HKPlcCommMonitorViewModel:ObservableObject | |||||
public class HKPlcCommMonitorViewModel:NotifyBase | |||||
{ | { | ||||
public HKPlcCommMonitorViewModel() | public HKPlcCommMonitorViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.Concurrent; | using System.Collections.Concurrent; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Windows; | using System.Windows; | ||||
@@ -17,7 +17,7 @@ using System.Reflection; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class HardwareStatusViewModel : ObservableObject | |||||
public class HardwareStatusViewModel : NotifyBase | |||||
{ | { | ||||
public HardwareStatusViewModel() | public HardwareStatusViewModel() | ||||
{ | { | ||||
@@ -5,7 +5,7 @@ using BPASmartClient.Helper; | |||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | ||||
using BPASmartClient.JXJFoodBigStation.Model.Siemens; | using BPASmartClient.JXJFoodBigStation.Model.Siemens; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -20,7 +20,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class ManualFlowViewModel:ObservableObject | |||||
public class ManualFlowViewModel:NotifyBase | |||||
{ | { | ||||
public ManualFlowViewModel() | public ManualFlowViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
@@ -16,7 +16,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class RecipeInfosViewModel : ObservableObject | |||||
public class RecipeInfosViewModel : NotifyBase | |||||
{ | { | ||||
public RecipeInfosViewModel() | public RecipeInfosViewModel() | ||||
{ | { | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.Concurrent; | using System.Collections.Concurrent; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using System.Windows; | using System.Windows; | ||||
@@ -21,7 +21,7 @@ using BPASmartClient.JXJFoodBigStation.Model.Siemens; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class RecipeReceiveViewModel : ObservableObject | |||||
public class RecipeReceiveViewModel : NotifyBase | |||||
{ | { | ||||
public ObservableCollection<RawMaterial> RawMaterials { get; set; } = new ObservableCollection<RawMaterial>(); | public ObservableCollection<RawMaterial> RawMaterials { get; set; } = new ObservableCollection<RawMaterial>(); | ||||
public RecipeReceiveViewModel() | public RecipeReceiveViewModel() | ||||
@@ -5,7 +5,7 @@ using BPASmartClient.Helper; | |||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.Model.Siemens; | using BPASmartClient.JXJFoodBigStation.Model.Siemens; | ||||
using BPASmartClient.JXJFoodBigStation.View; | using BPASmartClient.JXJFoodBigStation.View; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -16,7 +16,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
internal class RecipeSendDownViewModel:ObservableObject | |||||
internal class RecipeSendDownViewModel:NotifyBase | |||||
{ | { | ||||
public ObservableCollection<RecipeData> Recipes { get; set; } = Json<LocalRecipe>.Data.Recipes; | public ObservableCollection<RecipeData> Recipes { get; set; } = Json<LocalRecipe>.Data.Recipes; | ||||
/// <summary> | /// <summary> | ||||
@@ -1,7 +1,7 @@ | |||||
using BPASmartClient.CustomResource.Pages.Model; | using BPASmartClient.CustomResource.Pages.Model; | ||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -12,7 +12,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
internal class SelectRecipesViewModel:ObservableObject | |||||
internal class SelectRecipesViewModel:NotifyBase | |||||
{ | { | ||||
public SelectRecipesViewModel() | public SelectRecipesViewModel() | ||||
{ | { | ||||
@@ -100,7 +100,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel | |||||
/// <summary> | /// <summary> | ||||
/// 一个配方数据的包装类。 | /// 一个配方数据的包装类。 | ||||
/// </summary> | /// </summary> | ||||
internal class RecipeDataWithCheck:ObservableObject | |||||
internal class RecipeDataWithCheck:NotifyBase | |||||
{ | { | ||||
public RecipeData Recipe { get; set; } | public RecipeData Recipe { get; set; } | ||||
private bool _IsSelected; | private bool _IsSelected; | ||||
@@ -1,7 +1,7 @@ | |||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.Model.Siemens; | using BPASmartClient.JXJFoodBigStation.Model.Siemens; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -12,7 +12,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class SiemensRecipeSendDownViewModel : ObservableObject | |||||
public class SiemensRecipeSendDownViewModel : NotifyBase | |||||
{ | { | ||||
public ObservableCollection<RecipeData> Recipes { get; set; } = Json<RemoteRecipe>.Data.Recipes; | public ObservableCollection<RecipeData> Recipes { get; set; } = Json<RemoteRecipe>.Data.Recipes; | ||||
public SiemensRecipeSendDownViewModel() | public SiemensRecipeSendDownViewModel() | ||||
@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; | |||||
using BPASmartClient.Helper; | using BPASmartClient.Helper; | ||||
using BPASmartClient.JXJFoodBigStation.Model; | using BPASmartClient.JXJFoodBigStation.Model; | ||||
using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | using BPASmartClient.JXJFoodBigStation.Model.HK_PLC; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
@@ -18,7 +18,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodBigStation.ViewModel | namespace BPASmartClient.JXJFoodBigStation.ViewModel | ||||
{ | { | ||||
public class StockBinRawMaterialViewModel : ObservableObject | |||||
public class StockBinRawMaterialViewModel : NotifyBase | |||||
{ | { | ||||
public StockBinRawMaterialViewModel() | public StockBinRawMaterialViewModel() | ||||
{ | { | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model.Bom | namespace BPASmartClient.JXJFoodSmallStation.Model.Bom | ||||
{ | { | ||||
public class BomMaterial:ObservableObject | |||||
public class BomMaterial:NotifyBase | |||||
{ | { | ||||
public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } } | public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } } | ||||
public int _count { get; set; } | public int _count { get; set; } | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model.GVL | namespace BPASmartClient.JXJFoodSmallStation.Model.GVL | ||||
{ | { | ||||
public class PlcInfos: ObservableObject | |||||
public class PlcInfos: NotifyBase | |||||
{ | { | ||||
public int Count { get { return _Count; } set { _Count = value;OnPropertyChanged(); } } | public int Count { get { return _Count; } set { _Count = value;OnPropertyChanged(); } } | ||||
private int _Count { get; set; } | private int _Count { get; set; } | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model.Par | namespace BPASmartClient.JXJFoodSmallStation.Model.Par | ||||
{ | { | ||||
public class ConnectParMode: ObservableObject | |||||
public class ConnectParMode: NotifyBase | |||||
{ | { | ||||
public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } } | public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } } | ||||
private bool _mSiemensConnect; | private bool _mSiemensConnect; | ||||
@@ -3,12 +3,12 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using Microsoft.Toolkit.Mvvm.Input; | using Microsoft.Toolkit.Mvvm.Input; | ||||
namespace BPASmartClient.JXJFoodSmallStation.Model | namespace BPASmartClient.JXJFoodSmallStation.Model | ||||
{ | { | ||||
public class ActionMenu : ObservableObject | |||||
public class ActionMenu : NotifyBase | |||||
{ | { | ||||
public string CommandParameter { get { return _mCommandParameter; } set { _mCommandParameter = value; OnPropertyChanged(); } } | public string CommandParameter { get { return _mCommandParameter; } set { _mCommandParameter = value; OnPropertyChanged(); } } | ||||
private string _mCommandParameter; | private string _mCommandParameter; | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model | namespace BPASmartClient.JXJFoodSmallStation.Model | ||||
{ | { | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model | namespace BPASmartClient.JXJFoodSmallStation.Model | ||||
{ | { | ||||
public class CylinderStatusModel : ObservableObject | |||||
public class CylinderStatusModel : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 气缸原点信号 | /// 气缸原点信号 | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model | namespace BPASmartClient.JXJFoodSmallStation.Model | ||||
{ | { | ||||
public class DeviceCurrentStatus : ObservableObject | |||||
public class DeviceCurrentStatus : NotifyBase | |||||
{ | { | ||||
public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } | public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } | ||||
@@ -3,7 +3,7 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System.Collections.ObjectModel; | using System.Collections.ObjectModel; | ||||
using BPASmartClient.JXJFoodSmallStation.Model.Par; | using BPASmartClient.JXJFoodSmallStation.Model.Par; | ||||
using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial; | using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial; | ||||
@@ -11,7 +11,7 @@ using BPASmartClient.JXJFoodSmallStation.Model.Bom; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model | namespace BPASmartClient.JXJFoodSmallStation.Model | ||||
{ | { | ||||
public class DevicePar:ObservableObject | |||||
public class DevicePar:NotifyBase | |||||
{ | { | ||||
public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>(); | public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>(); | ||||
public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } } | public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } } | ||||
@@ -3,11 +3,11 @@ using System.Collections.Generic; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model | namespace BPASmartClient.JXJFoodSmallStation.Model | ||||
{ | { | ||||
public class DeviceParMode : ObservableObject | |||||
public class DeviceParMode : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial | namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial | ||||
{ | { | ||||
public class RawMaterialColl : ObservableObject | |||||
public class RawMaterialColl : NotifyBase | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// 原料设备IP | /// 原料设备IP | ||||
@@ -1,4 +1,4 @@ | |||||
using Microsoft.Toolkit.Mvvm.ComponentModel; | |||||
using BPA.Helper; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Linq; | using System.Linq; | ||||
@@ -7,7 +7,7 @@ using System.Threading.Tasks; | |||||
namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial | namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial | ||||
{ | { | ||||
public class RawMaterialStockBin : ObservableObject | |||||
public class RawMaterialStockBin : NotifyBase | |||||
{ | { | ||||
public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } } | public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } } | ||||