添加报表

master
1 year ago
parent 46758b8985
commit c2d9fb4249

@ -144,7 +144,6 @@ namespace XGL
startTime = lst.Shift_Start_Time, startTime = lst.Shift_Start_Time,
endTime = lst.Shift_End_Time endTime = lst.Shift_End_Time
}; };
new ReportForm().ShowDialog();
main = new Main(); main = new Main();
bw.RunWorkerAsync(); bw.RunWorkerAsync();
} }

@ -1,4 +1,5 @@
using System; using CommonFunc.Tools;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -89,6 +90,8 @@ namespace XGL.Views
this.Workshop.Text = string.Empty; this.Workshop.Text = string.Empty;
this.line.Text = string.Empty; this.line.Text = string.Empty;
this.date.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++) for (int i = 1; i <= 6; i++)
{ {
if (FindName(team + i) is TextBlock text11) if (FindName(team + i) is TextBlock text11)
@ -160,6 +163,7 @@ namespace XGL.Views
reports = formingMachineService.GetReportData(); reports = formingMachineService.GetReportData();
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
this.date.Text = DateTime.Now.ToString("yyyy-MM-dd");
for (int i = 0; i < reports.Count; i++) for (int i = 0; i < reports.Count; i++)
{ {
if (FindName(unqualified + (i + 1)) is TextBlock text) if (FindName(unqualified + (i + 1)) is TextBlock text)

Loading…
Cancel
Save