diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 5883e8c..0d74c1e 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index ddb18ed..f6b31fd 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb index 38197a5..b8f63bb 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll index b70636b..3161d0d 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb index d47b39b..8ac87c4 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll index 819d44a..0b32275 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb index 0959ad7..51889c8 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.dll b/shangjian/CentralControl/bin/Debug/XGL.Models.dll index d735f22..133c30b 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.dll and b/shangjian/CentralControl/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb index 61227a4..97c9a47 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll index 4084aad..bf43ef4 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb index a9e9227..69e4bff 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index d4cbf1a..9ccf070 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index ddb18ed..f6b31fd 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb index 38197a5..b8f63bb 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll index b70636b..3161d0d 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb index d47b39b..8ac87c4 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll index d735f22..133c30b 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb index 61227a4..97c9a47 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache index ee80c4b..eb5412f 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll index b70636b..3161d0d 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb index d47b39b..8ac87c4 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index b70636b..3161d0d 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb index d47b39b..8ac87c4 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index d735f22..133c30b 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll and b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb index 61227a4..97c9a47 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index 991e910..e8545ba 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs index f522f5f..74f45bc 100644 --- a/shangjian/XGL.Data/DBService/DBService.cs +++ b/shangjian/XGL.Data/DBService/DBService.cs @@ -804,7 +804,18 @@ where workorder.workorder_id = '{workOrderNo}'"; } return null; } + public DataTable GetPlcValueList(string key,string deviceCode) + { + //根据工单获取成型机 + string sql = $@"SELECT * FROM [dbo].[base_equipment_attached] where explain like '%{key}%' and device_code like '%{deviceCode}%' ORDER BY device_code ; "; + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } /// diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index b70636b..3161d0d 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb index d47b39b..8ac87c4 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll index 819d44a..0b32275 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb index 0959ad7..51889c8 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll index d735f22..133c30b 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb index 61227a4..97c9a47 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache index 468b117..8997ae6 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll index 819d44a..0b32275 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb index 0959ad7..51889c8 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index d735f22..133c30b 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll and b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb index 61227a4..97c9a47 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index d735f22..133c30b 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll and b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb index 61227a4..97c9a47 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll index 4084aad..bf43ef4 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb index a9e9227..69e4bff 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index 4084aad..bf43ef4 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb index a9e9227..69e4bff 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index 2a813b5..223e43f 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -12,7 +12,7 @@ - + diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs index 49969d7..a980fc2 100644 --- a/shangjian/XGL/FormItem/Main.xaml.cs +++ b/shangjian/XGL/FormItem/Main.xaml.cs @@ -237,13 +237,17 @@ namespace XGL.FormItem new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; } ), System.Windows.Threading.DispatcherPriority.Render); - if (dt.Rows[0][0].ToString() == "1" && time == 6) - { - //报警 - serialHelper.ComOn(); - serialHelper.redLightOff(); - serialHelper.buzzerOff(); - serialHelper.ComOff(); + if (dt.Rows[0][0].ToString() == "1" ) + { + if (time == 6) + { + //取消报警 + serialHelper.ComOn(); + serialHelper.redLightOff(); + serialHelper.buzzerOff(); + serialHelper.ComOff(); + } + } else { diff --git a/shangjian/XGL/Tools/DeviceNameConverter.cs b/shangjian/XGL/Tools/DeviceNameConverter.cs new file mode 100644 index 0000000..6ccc7a5 --- /dev/null +++ b/shangjian/XGL/Tools/DeviceNameConverter.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace XGL.Tools +{ + public class DeviceNameConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value.Equals("equ_type_cxj")) + { + return "成型机"; + } + if (value.Equals("equ_type_hf")) + { + return "烘房"; + } + if (value.Equals("equ_type_lg")) + { + return "料罐"; + } + if (value.Equals("equ_type_spdsj")) + { + return "吊筛机"; + } + + return "未知"; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml b/shangjian/XGL/Views/DryingRoomUC.xaml index 3a4f906..a512720 100644 --- a/shangjian/XGL/Views/DryingRoomUC.xaml +++ b/shangjian/XGL/Views/DryingRoomUC.xaml @@ -388,16 +388,39 @@ + + + diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml.cs b/shangjian/XGL/Views/DryingRoomUC.xaml.cs index b301573..197acd1 100644 --- a/shangjian/XGL/Views/DryingRoomUC.xaml.cs +++ b/shangjian/XGL/Views/DryingRoomUC.xaml.cs @@ -233,6 +233,17 @@ namespace XGL.Views GetDringRoomData(); GetOutDringRoomData(); } + private void btnCheckLog_Click(object sender, RoutedEventArgs e) + { + ViewLogWin viewLogWin = new ViewLogWin(); + viewLogWin.ShowDialog(); + } + + private void btnViewPlcvalue_Click(object sender, RoutedEventArgs e) + { + ViewPlcInfoWin viewPlcWin = new ViewPlcInfoWin(); + viewPlcWin.ShowDialog(); + } } public class EquipmentMode { diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml index 67e38b8..42be3b2 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml +++ b/shangjian/XGL/Views/LanJu_Operator.xaml @@ -352,10 +352,28 @@ Background="#2B7EE6" FontSize="20" Foreground="White" - Click="btnCheckLog_Click" Content="查看日志"> + Click="btnCheckLog_Click" Content="查看接口日志"> - + + + - diff --git a/shangjian/XGL/Views/ViewLogWin.xaml b/shangjian/XGL/Views/ViewLogWin.xaml index 92a8d0a..485f4cd 100644 --- a/shangjian/XGL/Views/ViewLogWin.xaml +++ b/shangjian/XGL/Views/ViewLogWin.xaml @@ -76,11 +76,11 @@ + Width="150" SelectedDateFormat="Short" IsTodayHighlighted="True"> - +