otPMS추가(테스트버젼)

This commit is contained in:
chi
2025-07-02 23:41:25 +09:00
parent cc4430a553
commit 4f4625b56b
42 changed files with 6901 additions and 3122 deletions

View File

@@ -85,7 +85,7 @@ namespace FBS0000
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
}
else
else if(cmbType.SelectedIndex == 1)
{
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
dsReport.Holydata_Day.Clear();
@@ -93,8 +93,16 @@ namespace FBS0000
dsReport.Holydata_Day.AcceptChanges();
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
}
else //pms
{
var taPMS = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
taPMS.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
dsReport.Holydata_Day.AcceptChanges();
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
}
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;