diff --git a/shangjian/XGL/LoginPage.xaml.cs b/shangjian/XGL/LoginPage.xaml.cs index b86d501..0758efc 100644 --- a/shangjian/XGL/LoginPage.xaml.cs +++ b/shangjian/XGL/LoginPage.xaml.cs @@ -144,7 +144,6 @@ namespace XGL startTime = lst.Shift_Start_Time, endTime = lst.Shift_End_Time }; - new ReportForm().ShowDialog(); main = new Main(); bw.RunWorkerAsync(); } diff --git a/shangjian/XGL/Views/ReportForm.xaml.cs b/shangjian/XGL/Views/ReportForm.xaml.cs index 76859d5..f8879e4 100644 --- a/shangjian/XGL/Views/ReportForm.xaml.cs +++ b/shangjian/XGL/Views/ReportForm.xaml.cs @@ -1,4 +1,5 @@ -using System; +using CommonFunc.Tools; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -89,6 +90,8 @@ namespace XGL.Views this.Workshop.Text = string.Empty; this.line.Text = string.Empty; this.date.Text = string.Empty; + this.Workshop.Text = Utils.GetAppSetting("SiteCode"); + this.line.Text= Utils.GetAppSetting("LineCode"); for (int i = 1; i <= 6; i++) { if (FindName(team + i) is TextBlock text11) @@ -160,6 +163,7 @@ namespace XGL.Views reports = formingMachineService.GetReportData(); Dispatcher.Invoke(() => { + this.date.Text = DateTime.Now.ToString("yyyy-MM-dd"); for (int i = 0; i < reports.Count; i++) { if (FindName(unqualified + (i + 1)) is TextBlock text)