From 4f4625b56b120ecca5eaadbfd8463a3322079165 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 2 Jul 2025 23:41:25 +0900 Subject: [PATCH] =?UTF-8?q?otPMS=EC=B6=94=EA=B0=80(=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=B2=84=EC=A0=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- .../.vs/StaffLayoutCtl.csproj.dtbcache.json | 1 + Sub/YARTE/.vs/YARTE.csproj.dtbcache.json | 1 + .../.vs/UMSControl.csproj.dtbcache.json | 1 + SubProject/FBS0000/FBS0000.csproj | 1 + .../FBS0000/Holiday/fHolyDayData.Designer.cs | 13 +- SubProject/FBS0000/Holiday/fHolyDayData.cs | 15 +- SubProject/FBS0000/Holiday/fHolyDayData.resx | 3 - .../Holiday/fHolyDayDataSum.Designer.cs | 12 +- SubProject/FBS0000/Holiday/fHolyDayDataSum.cs | 12 +- .../FBS0000/Holiday/fHolyDayDataSum.resx | 3 + SubProject/FBS0000/Holiday/rHolyData.rdlc | 12 + SubProject/FBS0000/Holiday/rHolyDataSum.rdlc | 11 +- SubProject/FBS0000/dsMSSQL.Designer.cs | 51 +- SubProject/FBS0000/dsMSSQL.xsd | 7 +- SubProject/FBS0000/dsMSSQL.xss | 2 +- SubProject/FBS0000/dsReport.Designer.cs | 5484 ++++++++++++----- SubProject/FBS0000/dsReport.xsd | 101 +- SubProject/FBS0000/dsReport.xss | 9 +- SubProject/FPJ0000/DSKuntae.Designer.cs | 22 +- SubProject/FPJ0000/DSKuntae.xsd | 16 +- .../JobReport_/rJobReportOT.Designer.cs | 338 +- SubProject/FPJ0000/JobReport_/rJobReportOT.cs | 366 +- .../FPJ0000/JobReport_/rJobReportOT.resx | 50 +- .../OtConfirm/fHolyRequestAdd.Designer.cs | 27 +- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 11 +- .../FPJ0000/OtConfirm/fHolyRequestAdd.resx | 50 +- .../FPJ0000/OtConfirm/fOTConfirm.Designer.cs | 1323 ++-- SubProject/FPJ0000/OtConfirm/fOTConfirm.cs | 24 +- SubProject/FPJ0000/OtConfirm/fOTConfirm.resx | 154 +- .../OtConfirm/fOTConfirmOK.Designer.cs | 163 +- SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs | 47 +- .../FPJ0000/OtConfirm/fOTConfirmOK.resx | 53 +- .../OtConfirm/fOTConfirmValue.Designer.cs | 143 +- .../FPJ0000/OtConfirm/fOTConfirmValue.cs | 57 +- .../FPJ0000/OtConfirm/fOTConfirmValue.resx | 59 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 859 ++- SubProject/FPJ0000/dsPRJ.xsd | 206 +- SubProject/FPJ0000/dsPRJ.xss | 12 +- SubProject/FPJ0000/dsReport.Designer.cs | 245 +- SubProject/FPJ0000/dsReport.xsd | 43 +- SubProject/FPJ0000/dsReport.xss | 12 +- 42 files changed, 6901 insertions(+), 3122 deletions(-) create mode 100644 Sub/StaffLayoutCtl/.vs/StaffLayoutCtl.csproj.dtbcache.json create mode 100644 Sub/YARTE/.vs/YARTE.csproj.dtbcache.json create mode 100644 SubProject/CMSControl/.vs/UMSControl.csproj.dtbcache.json diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 0928e5b..597b57e 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("25.05.22.1000")] -[assembly: AssemblyFileVersion("25.05.22.1000")] +[assembly: AssemblyVersion("25.07.02.2320")] +[assembly: AssemblyFileVersion("25.07.02.2320")] diff --git a/Sub/StaffLayoutCtl/.vs/StaffLayoutCtl.csproj.dtbcache.json b/Sub/StaffLayoutCtl/.vs/StaffLayoutCtl.csproj.dtbcache.json new file mode 100644 index 0000000..1459213 --- /dev/null +++ b/Sub/StaffLayoutCtl/.vs/StaffLayoutCtl.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl","ProjectFileName":"StaffLayoutCtl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"grid.cs"},{"SourceFile":"grid.Designer.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.dll","OutputItemRelativePath":"StaffLayoutCtl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.pdb","OutputItemRelativePath":"StaffLayoutCtl.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/Sub/YARTE/.vs/YARTE.csproj.dtbcache.json b/Sub/YARTE/.vs/YARTE.csproj.dtbcache.json new file mode 100644 index 0000000..5615436 --- /dev/null +++ b/Sub/YARTE/.vs/YARTE.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE","ProjectFileName":"YARTE.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Buttons\\BoldButton.cs"},{"SourceFile":"Buttons\\CheckboxButton.cs"},{"SourceFile":"Buttons\\ForecolorButton.cs"},{"SourceFile":"Buttons\\IButton.cs"},{"SourceFile":"Buttons\\IFunctionButton.cs"},{"SourceFile":"Buttons\\IHTMLEditorButton.cs"},{"SourceFile":"Buttons\\InsertLinkedImageButton.cs"},{"SourceFile":"Buttons\\ItalicButton.cs"},{"SourceFile":"Buttons\\JustifyCenterButton.cs"},{"SourceFile":"Buttons\\JustifyLeftButton.cs"},{"SourceFile":"Buttons\\JustifyRightButton.cs"},{"SourceFile":"Buttons\\LinkButton.cs"},{"SourceFile":"Buttons\\OrderedListButton.cs"},{"SourceFile":"Buttons\\PredefinedButtonSets.cs"},{"SourceFile":"Buttons\\ReadOnlyButton.cs"},{"SourceFile":"Buttons\\UnderlineButton.cs"},{"SourceFile":"Buttons\\UnlinkButton.cs"},{"SourceFile":"Buttons\\UnorderedListButton.cs"},{"SourceFile":"CheckboxItem.cs"},{"SourceFile":"HtmlEditor.cs"},{"SourceFile":"HTMLEditor.Designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.VisualBasic.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","OutputItemRelativePath":"YARTE.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.pdb","OutputItemRelativePath":"YARTE.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SubProject/CMSControl/.vs/UMSControl.csproj.dtbcache.json b/SubProject/CMSControl/.vs/UMSControl.csproj.dtbcache.json new file mode 100644 index 0000000..6af9ffb --- /dev/null +++ b/SubProject/CMSControl/.vs/UMSControl.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl","ProjectFileName":"UMSControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cmsview.cs"},{"SourceFile":"EventArgs.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Slot.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.dll","OutputItemRelativePath":"UMSControl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.pdb","OutputItemRelativePath":"UMSControl.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index eef91a5..3f3b56f 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -305,6 +305,7 @@ MSDataSetGenerator Designer + dsReport1.Designer.cs dsReport.xsd diff --git a/SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs b/SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs index 8227cde..2fc50c8 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayData.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayData)); - Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource(); + Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource(); this.bsDay = new System.Windows.Forms.BindingSource(this.components); this.dsReport = new FBS0000.dsReport(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -164,9 +164,11 @@ // // cmbType // + this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbType.Items.AddRange(new object[] { "일반 원장", - "대체 원장"}); + "대체 원장", + "PMS 원장"}); this.cmbType.Name = "cmbType"; this.cmbType.Size = new System.Drawing.Size(150, 37); this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged); @@ -175,9 +177,9 @@ // reportViewer1 // this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; - reportDataSource2.Name = "DataSet1"; - reportDataSource2.Value = this.bsDay; - this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2); + reportDataSource1.Name = "DataSet1"; + reportDataSource1.Value = this.bsDay; + this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1); this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyData.rdlc"; this.reportViewer1.Location = new System.Drawing.Point(0, 37); this.reportViewer1.Name = "reportViewer1"; @@ -207,7 +209,6 @@ this.Controls.Add(this.reportViewer1); this.Controls.Add(this.toolStrip1); this.Name = "fHolyDayData"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "근태 원장"; this.Load += new System.EventHandler(this.rJobReport_Load); ((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit(); diff --git a/SubProject/FBS0000/Holiday/fHolyDayData.cs b/SubProject/FBS0000/Holiday/fHolyDayData.cs index 4956992..547a0ef 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayData.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayData.cs @@ -70,7 +70,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(); @@ -78,10 +78,19 @@ 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; diff --git a/SubProject/FBS0000/Holiday/fHolyDayData.resx b/SubProject/FBS0000/Holiday/fHolyDayData.resx index 467956f..4099123 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayData.resx +++ b/SubProject/FBS0000/Holiday/fHolyDayData.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 119, 17 diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs b/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs index 80acdf9..26ffd96 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs @@ -30,7 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayDataSum)); - Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource(); + Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource(); this.bsDay = new System.Windows.Forms.BindingSource(this.components); this.dsReport = new FBS0000.dsReport(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -143,9 +143,11 @@ // // cmbType // + this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbType.Items.AddRange(new object[] { "일반 원장", - "대체 원장"}); + "대체 원장", + "PMS 원장"}); this.cmbType.Name = "cmbType"; this.cmbType.Size = new System.Drawing.Size(150, 37); this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged); @@ -154,9 +156,9 @@ // reportViewer1 // this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; - reportDataSource1.Name = "DataSet1"; - reportDataSource1.Value = this.bsDay; - this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1); + reportDataSource2.Name = "DataSet1"; + reportDataSource2.Value = this.bsDay; + this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2); this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyDataSum.rdlc"; this.reportViewer1.Location = new System.Drawing.Point(0, 37); this.reportViewer1.Name = "reportViewer1"; diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs index 32a5920..c53cae9 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.cs @@ -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; diff --git a/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx b/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx index 438592c..a662cab 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx +++ b/SubProject/FBS0000/Holiday/fHolyDayDataSum.resx @@ -123,6 +123,9 @@ 17, 17 + + 17, 17 + 119, 17 diff --git a/SubProject/FBS0000/Holiday/rHolyData.rdlc b/SubProject/FBS0000/Holiday/rHolyData.rdlc index 7677105..322bfee 100644 --- a/SubProject/FBS0000/Holiday/rHolyData.rdlc +++ b/SubProject/FBS0000/Holiday/rHolyData.rdlc @@ -748,6 +748,7 @@ @@ -786,6 +787,7 @@ 2pt + true @@ -801,6 +803,7 @@ @@ -839,6 +842,7 @@ 2pt + true @@ -854,6 +858,7 @@ @@ -892,6 +897,7 @@ 2pt + true @@ -946,6 +952,7 @@ 2pt + true @@ -1173,6 +1180,7 @@ @@ -1212,6 +1220,7 @@ 2pt + true @@ -1227,6 +1236,7 @@ @@ -1266,6 +1276,7 @@ 2pt + true @@ -1321,6 +1332,7 @@ 2pt + true diff --git a/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc b/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc index 0bb72a7..ae28478 100644 --- a/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc +++ b/SubProject/FBS0000/Holiday/rHolyDataSum.rdlc @@ -81,7 +81,9 @@ =Sum(Fields!Dr.Value) - - true @@ -262,7 +265,6 @@ 2pt - true @@ -661,7 +663,6 @@ 2pt - true diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index de221a6..f9fdc69 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/SubProject/FBS0000/dsMSSQL.Designer.cs @@ -3121,6 +3121,8 @@ namespace FBS0000 { private global::System.Data.DataColumn columnoutdate; + private global::System.Data.DataColumn columnotPMS; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public vJobReportForUserDataTable() { @@ -3346,6 +3348,14 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn otPMSColumn { + get { + return this.columnotPMS; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3407,7 +3417,8 @@ namespace FBS0000 { string otReason, string grade, string indate, - string outdate) { + string outdate, + double otPMS) { vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow())); object[] columnValuesArray = new object[] { idx, @@ -3433,7 +3444,8 @@ namespace FBS0000 { otReason, grade, indate, - outdate}; + outdate, + otPMS}; rowvJobReportForUserRow.ItemArray = columnValuesArray; this.Rows.Add(rowvJobReportForUserRow); return rowvJobReportForUserRow; @@ -3480,6 +3492,7 @@ namespace FBS0000 { this.columngrade = base.Columns["grade"]; this.columnindate = base.Columns["indate"]; this.columnoutdate = base.Columns["outdate"]; + this.columnotPMS = base.Columns["otPMS"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3533,6 +3546,8 @@ namespace FBS0000 { base.Columns.Add(this.columnindate); this.columnoutdate = new global::System.Data.DataColumn("outdate", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnoutdate); + this.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnotPMS); this.columnidx.AllowDBNull = false; this.columnpdate.MaxLength = 10; this.columngcode.AllowDBNull = false; @@ -6352,6 +6367,22 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double otPMS { + get { + if (this.IsotPMSNull()) { + return 0D; + } + else { + return ((double)(this[this.tablevJobReportForUser.otPMSColumn])); + } + } + set { + this[this.tablevJobReportForUser.otPMSColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -6615,6 +6646,18 @@ namespace FBS0000 { public void SetoutdateNull() { this[this.tablevJobReportForUser.outdateColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsotPMSNull() { + return this.IsNull(this.tablevJobReportForUser.otPMSColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetotPMSNull() { + this[this.tablevJobReportForUser.otPMSColumn] = global::System.Convert.DBNull; + } } /// @@ -10887,6 +10930,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM tableMapping.ColumnMappings.Add("grade", "grade"); tableMapping.ColumnMappings.Add("indate", "indate"); tableMapping.ColumnMappings.Add("outdate", "outdate"); + tableMapping.ColumnMappings.Add("otPMS", "otPMS"); this._adapter.TableMappings.Add(tableMapping); } @@ -10903,7 +10947,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate + this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate, + otPMS FROM vJobReportForUser WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) ORDER BY pdate"; diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index a68cadd..189eabe 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -708,7 +708,8 @@ WHERE (gcode = @gcode) AND (empno = @empno) - SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate + SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate, + otPMS FROM vJobReportForUser WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) ORDER BY pdate @@ -746,6 +747,7 @@ ORDER BY pdate + @@ -1120,7 +1122,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1382,6 +1384,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= + diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss index 698ace6..c52f368 100644 --- a/SubProject/FBS0000/dsMSSQL.xss +++ b/SubProject/FBS0000/dsMSSQL.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/SubProject/FBS0000/dsReport.Designer.cs b/SubProject/FBS0000/dsReport.Designer.cs index cf259f1..a91238d 100644 --- a/SubProject/FBS0000/dsReport.Designer.cs +++ b/SubProject/FBS0000/dsReport.Designer.cs @@ -10,9 +10,10 @@ #pragma warning disable 1591 -namespace FBS0000 { - - +namespace FBS0000 +{ + + /// ///Represents a strongly typed in-memory cache of data. /// @@ -22,21 +23,25 @@ namespace FBS0000 { [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedDataSetSchema")] [global::System.Xml.Serialization.XmlRootAttribute("dsReport")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")] - public partial class dsReport : global::System.Data.DataSet { - + public partial class dsReport : global::System.Data.DataSet + { + private holydataDataTable tableholydata; - + private Holydata_DayDataTable tableHolydata_Day; - + private Holydata_TimeDataTable tableHolydata_Time; - + + private Holydata_TimePMSDataTable tableHolydata_TimePMS; + private holydatasumDataTable tableholydatasum; - + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public dsReport() { + public dsReport() + { this.BeginInit(); this.InitClass(); global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); @@ -45,35 +50,47 @@ namespace FBS0000 { this.EndInit(); this.InitExpressions(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected dsReport(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context, false) { - if ((this.IsBinarySerialized(info, context) == true)) { + protected dsReport(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context, false) + { + if ((this.IsBinarySerialized(info, context) == true)) + { this.InitVars(false); global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged); this.Tables.CollectionChanged += schemaChangedHandler1; this.Relations.CollectionChanged += schemaChangedHandler1; - if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) { + if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.ExcludeSchema)) + { this.InitExpressions(); } return; } string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string)))); - if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { + if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) + { global::System.Data.DataSet ds = new global::System.Data.DataSet(); ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); - if ((ds.Tables["holydata"] != null)) { + if ((ds.Tables["holydata"] != null)) + { base.Tables.Add(new holydataDataTable(ds.Tables["holydata"])); } - if ((ds.Tables["Holydata_Day"] != null)) { + if ((ds.Tables["Holydata_Day"] != null)) + { base.Tables.Add(new Holydata_DayDataTable(ds.Tables["Holydata_Day"])); } - if ((ds.Tables["Holydata_Time"] != null)) { + if ((ds.Tables["Holydata_Time"] != null)) + { base.Tables.Add(new Holydata_TimeDataTable(ds.Tables["Holydata_Time"])); } - if ((ds.Tables["holydatasum"] != null)) { + if ((ds.Tables["Holydata_TimePMS"] != null)) + { + base.Tables.Add(new Holydata_TimePMSDataTable(ds.Tables["Holydata_TimePMS"])); + } + if ((ds.Tables["holydatasum"] != null)) + { base.Tables.Add(new holydatasumDataTable(ds.Tables["holydatasum"])); } this.DataSetName = ds.DataSetName; @@ -85,7 +102,8 @@ namespace FBS0000 { this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add); this.InitVars(); } - else { + else + { this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema))); this.InitExpressions(); } @@ -94,125 +112,166 @@ namespace FBS0000 { base.Tables.CollectionChanged += schemaChangedHandler; this.Relations.CollectionChanged += schemaChangedHandler; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] - public holydataDataTable holydata { - get { + public holydataDataTable holydata + { + get + { return this.tableholydata; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] - public Holydata_DayDataTable Holydata_Day { - get { + public Holydata_DayDataTable Holydata_Day + { + get + { return this.tableHolydata_Day; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] - public Holydata_TimeDataTable Holydata_Time { - get { + public Holydata_TimeDataTable Holydata_Time + { + get + { return this.tableHolydata_Time; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] - public holydatasumDataTable holydatasum { - get { + public Holydata_TimePMSDataTable Holydata_TimePMS + { + get + { + return this.tableHolydata_TimePMS; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public holydatasumDataTable holydatasum + { + get + { return this.tableholydatasum; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)] - public override global::System.Data.SchemaSerializationMode SchemaSerializationMode { - get { + public override global::System.Data.SchemaSerializationMode SchemaSerializationMode + { + get + { return this._schemaSerializationMode; } - set { + set + { this._schemaSerializationMode = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] - public new global::System.Data.DataTableCollection Tables { - get { + public new global::System.Data.DataTableCollection Tables + { + get + { return base.Tables; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)] - public new global::System.Data.DataRelationCollection Relations { - get { + public new global::System.Data.DataRelationCollection Relations + { + get + { return base.Relations; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void InitializeDerivedDataSet() { + protected override void InitializeDerivedDataSet() + { this.BeginInit(); this.InitClass(); this.EndInit(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public override global::System.Data.DataSet Clone() { + public override global::System.Data.DataSet Clone() + { dsReport cln = ((dsReport)(base.Clone())); cln.InitVars(); cln.InitExpressions(); cln.SchemaSerializationMode = this.SchemaSerializationMode; return cln; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override bool ShouldSerializeTables() { + protected override bool ShouldSerializeTables() + { return false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override bool ShouldSerializeRelations() { + protected override bool ShouldSerializeRelations() + { return false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) { - if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) { + protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) + { + if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) + { this.Reset(); global::System.Data.DataSet ds = new global::System.Data.DataSet(); ds.ReadXml(reader); - if ((ds.Tables["holydata"] != null)) { + if ((ds.Tables["holydata"] != null)) + { base.Tables.Add(new holydataDataTable(ds.Tables["holydata"])); } - if ((ds.Tables["Holydata_Day"] != null)) { + if ((ds.Tables["Holydata_Day"] != null)) + { base.Tables.Add(new Holydata_DayDataTable(ds.Tables["Holydata_Day"])); } - if ((ds.Tables["Holydata_Time"] != null)) { + if ((ds.Tables["Holydata_Time"] != null)) + { base.Tables.Add(new Holydata_TimeDataTable(ds.Tables["Holydata_Time"])); } - if ((ds.Tables["holydatasum"] != null)) { + if ((ds.Tables["Holydata_TimePMS"] != null)) + { + base.Tables.Add(new Holydata_TimePMSDataTable(ds.Tables["Holydata_TimePMS"])); + } + if ((ds.Tables["holydatasum"] != null)) + { base.Tables.Add(new holydatasumDataTable(ds.Tables["holydatasum"])); } this.DataSetName = ds.DataSetName; @@ -224,59 +283,80 @@ namespace FBS0000 { this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add); this.InitVars(); } - else { + else + { this.ReadXml(reader); this.InitVars(); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() { + protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() + { global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream(); this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null)); stream.Position = 0; return global::System.Xml.Schema.XmlSchema.Read(new global::System.Xml.XmlTextReader(stream), null); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars() { + internal void InitVars() + { this.InitVars(true); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars(bool initTable) { + internal void InitVars(bool initTable) + { this.tableholydata = ((holydataDataTable)(base.Tables["holydata"])); - if ((initTable == true)) { - if ((this.tableholydata != null)) { + if ((initTable == true)) + { + if ((this.tableholydata != null)) + { this.tableholydata.InitVars(); } } this.tableHolydata_Day = ((Holydata_DayDataTable)(base.Tables["Holydata_Day"])); - if ((initTable == true)) { - if ((this.tableHolydata_Day != null)) { + if ((initTable == true)) + { + if ((this.tableHolydata_Day != null)) + { this.tableHolydata_Day.InitVars(); } } this.tableHolydata_Time = ((Holydata_TimeDataTable)(base.Tables["Holydata_Time"])); - if ((initTable == true)) { - if ((this.tableHolydata_Time != null)) { + if ((initTable == true)) + { + if ((this.tableHolydata_Time != null)) + { this.tableHolydata_Time.InitVars(); } } + this.tableHolydata_TimePMS = ((Holydata_TimePMSDataTable)(base.Tables["Holydata_TimePMS"])); + if ((initTable == true)) + { + if ((this.tableHolydata_TimePMS != null)) + { + this.tableHolydata_TimePMS.InitVars(); + } + } this.tableholydatasum = ((holydatasumDataTable)(base.Tables["holydatasum"])); - if ((initTable == true)) { - if ((this.tableholydatasum != null)) { + if ((initTable == true)) + { + if ((this.tableholydatasum != null)) + { this.tableholydatasum.InitVars(); } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitClass() { + private void InitClass() + { this.DataSetName = "dsReport"; this.Prefix = ""; this.Namespace = "http://tempuri.org/dsReport.xsd"; @@ -288,45 +368,61 @@ namespace FBS0000 { base.Tables.Add(this.tableHolydata_Day); this.tableHolydata_Time = new Holydata_TimeDataTable(); base.Tables.Add(this.tableHolydata_Time); + this.tableHolydata_TimePMS = new Holydata_TimePMSDataTable(); + base.Tables.Add(this.tableHolydata_TimePMS); this.tableholydatasum = new holydatasumDataTable(); base.Tables.Add(this.tableholydatasum); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private bool ShouldSerializeholydata() { + private bool ShouldSerializeholydata() + { return false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private bool ShouldSerializeHolydata_Day() { + private bool ShouldSerializeHolydata_Day() + { return false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private bool ShouldSerializeHolydata_Time() { + private bool ShouldSerializeHolydata_Time() + { return false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private bool ShouldSerializeholydatasum() { + private bool ShouldSerializeHolydata_TimePMS() + { return false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { - if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) { + private bool ShouldSerializeholydatasum() + { + return false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) + { + if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) + { this.InitVars(); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) + { dsReport ds = new dsReport(); global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); @@ -335,34 +431,43 @@ namespace FBS0000 { sequence.Items.Add(any); type.Particle = sequence; global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { + if (xs.Contains(dsSchema.TargetNamespace)) + { global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { + try + { global::System.Xml.Schema.XmlSchema schema = null; dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext();) + { schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); s2.SetLength(0); schema.Write(s2); - if ((s1.Length == s2.Length)) { + if ((s1.Length == s2.Length)) + { s1.Position = 0; s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte()));) + { ; } - if ((s1.Position == s1.Length)) { + if ((s1.Position == s1.Length)) + { return type; } } } } - finally { - if ((s1 != null)) { + finally + { + if ((s1 != null)) + { s1.Close(); } - if ((s2 != null)) { + if ((s2 != null)) + { s2.Close(); } } @@ -370,223 +475,264 @@ namespace FBS0000 { xs.Add(dsSchema); return type; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitExpressions() { + private void InitExpressions() + { this.Holydata_Day.janColumn.Expression = "jun+dr-cr"; } - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void holydataRowChangeEventHandler(object sender, holydataRowChangeEvent e); - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void Holydata_DayRowChangeEventHandler(object sender, Holydata_DayRowChangeEvent e); - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void Holydata_TimeRowChangeEventHandler(object sender, Holydata_TimeRowChangeEvent e); - + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public delegate void Holydata_TimePMSRowChangeEventHandler(object sender, Holydata_TimePMSRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void holydatasumRowChangeEventHandler(object sender, holydatasumRowChangeEvent e); - + /// ///Represents the strongly named DataTable class. /// [global::System.Serializable()] [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class holydataDataTable : global::System.Data.TypedTableBase { - + public partial class holydataDataTable : global::System.Data.TypedTableBase + { + private global::System.Data.DataColumn columnuid; - + private global::System.Data.DataColumn columncate; - + private global::System.Data.DataColumn columnDrTime; - + private global::System.Data.DataColumn columnCrTime; - + private global::System.Data.DataColumn columngcode; - + private global::System.Data.DataColumn columnProcess; - + private global::System.Data.DataColumn columnname; - + private global::System.Data.DataColumn columnCrDay; - + private global::System.Data.DataColumn columnDrDay; - + private global::System.Data.DataColumn columnsdate; - + private global::System.Data.DataColumn columnedate; - + private global::System.Data.DataColumn columniwol; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataDataTable() { + public holydataDataTable() + { this.TableName = "holydata"; this.BeginInit(); this.InitClass(); this.EndInit(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal holydataDataTable(global::System.Data.DataTable table) { + internal holydataDataTable(global::System.Data.DataTable table) + { this.TableName = table.TableName; - if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) + { this.CaseSensitive = table.CaseSensitive; } - if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) + { this.Locale = table.Locale; } - if ((table.Namespace != table.DataSet.Namespace)) { + if ((table.Namespace != table.DataSet.Namespace)) + { this.Namespace = table.Namespace; } this.Prefix = table.Prefix; this.MinimumCapacity = table.MinimumCapacity; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected holydataDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context) { + protected holydataDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) + { this.InitVars(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn uidColumn { - get { + public global::System.Data.DataColumn uidColumn + { + get + { return this.columnuid; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn cateColumn { - get { + public global::System.Data.DataColumn cateColumn + { + get + { return this.columncate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn DrTimeColumn { - get { + public global::System.Data.DataColumn DrTimeColumn + { + get + { return this.columnDrTime; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn CrTimeColumn { - get { + public global::System.Data.DataColumn CrTimeColumn + { + get + { return this.columnCrTime; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn gcodeColumn { - get { + public global::System.Data.DataColumn gcodeColumn + { + get + { return this.columngcode; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn ProcessColumn { - get { + public global::System.Data.DataColumn ProcessColumn + { + get + { return this.columnProcess; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn nameColumn { - get { + public global::System.Data.DataColumn nameColumn + { + get + { return this.columnname; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn CrDayColumn { - get { + public global::System.Data.DataColumn CrDayColumn + { + get + { return this.columnCrDay; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn DrDayColumn { - get { + public global::System.Data.DataColumn DrDayColumn + { + get + { return this.columnDrDay; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn sdateColumn { - get { + public global::System.Data.DataColumn sdateColumn + { + get + { return this.columnsdate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn edateColumn { - get { + public global::System.Data.DataColumn edateColumn + { + get + { return this.columnedate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn iwolColumn { - get { + public global::System.Data.DataColumn iwolColumn + { + get + { return this.columniwol; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] - public int Count { - get { + public int Count + { + get + { return this.Rows.Count; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataRow this[int index] { - get { + public holydataRow this[int index] + { + get + { return ((holydataRow)(this.Rows[index])); } } - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydataRowChangeEventHandler holydataRowChanging; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydataRowChangeEventHandler holydataRowChanged; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydataRowChangeEventHandler holydataRowDeleting; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydataRowChangeEventHandler holydataRowDeleted; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void AddholydataRow(holydataRow row) { + public void AddholydataRow(holydataRow row) + { this.Rows.Add(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataRow AddholydataRow(string uid, string cate, double DrTime, double CrTime, string gcode, string Process, string name, double CrDay, double DrDay, System.DateTime sdate, System.DateTime edate, bool iwol) { + public holydataRow AddholydataRow(string uid, string cate, double DrTime, double CrTime, string gcode, string Process, string name, double CrDay, double DrDay, System.DateTime sdate, System.DateTime edate, bool iwol) + { holydataRow rowholydataRow = ((holydataRow)(this.NewRow())); object[] columnValuesArray = new object[] { uid, @@ -605,24 +751,27 @@ namespace FBS0000 { this.Rows.Add(rowholydataRow); return rowholydataRow; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public override global::System.Data.DataTable Clone() { + public override global::System.Data.DataTable Clone() + { holydataDataTable cln = ((holydataDataTable)(base.Clone())); cln.InitVars(); return cln; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataTable CreateInstance() { + protected override global::System.Data.DataTable CreateInstance() + { return new holydataDataTable(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars() { + internal void InitVars() + { this.columnuid = base.Columns["uid"]; this.columncate = base.Columns["cate"]; this.columnDrTime = base.Columns["DrTime"]; @@ -636,10 +785,11 @@ namespace FBS0000 { this.columnedate = base.Columns["edate"]; this.columniwol = base.Columns["iwol"]; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitClass() { + private void InitClass() + { this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuid); this.columncate = new global::System.Data.DataColumn("cate", typeof(string), null, global::System.Data.MappingType.Element); @@ -671,70 +821,83 @@ namespace FBS0000 { this.columnProcess.MaxLength = 50; this.columnname.MaxLength = 100; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataRow NewholydataRow() { + public holydataRow NewholydataRow() + { return ((holydataRow)(this.NewRow())); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) + { return new holydataRow(builder); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Type GetRowType() { + protected override global::System.Type GetRowType() + { return typeof(holydataRow); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanged(e); - if ((this.holydataRowChanged != null)) { + if ((this.holydataRowChanged != null)) + { this.holydataRowChanged(this, new holydataRowChangeEvent(((holydataRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanging(e); - if ((this.holydataRowChanging != null)) { + if ((this.holydataRowChanging != null)) + { this.holydataRowChanging(this, new holydataRowChangeEvent(((holydataRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleted(e); - if ((this.holydataRowDeleted != null)) { + if ((this.holydataRowDeleted != null)) + { this.holydataRowDeleted(this, new holydataRowChangeEvent(((holydataRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleting(e); - if ((this.holydataRowDeleting != null)) { + if ((this.holydataRowDeleting != null)) + { this.holydataRowDeleting(this, new holydataRowChangeEvent(((holydataRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void RemoveholydataRow(holydataRow row) { + public void RemoveholydataRow(holydataRow row) + { this.Rows.Remove(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) + { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); dsReport ds = new dsReport(); @@ -759,34 +922,43 @@ namespace FBS0000 { type.Attributes.Add(attribute2); type.Particle = sequence; global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { + if (xs.Contains(dsSchema.TargetNamespace)) + { global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { + try + { global::System.Xml.Schema.XmlSchema schema = null; dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext();) + { schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); s2.SetLength(0); schema.Write(s2); - if ((s1.Length == s2.Length)) { + if ((s1.Length == s2.Length)) + { s1.Position = 0; s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte()));) + { ; } - if ((s1.Position == s1.Length)) { + if ((s1.Position == s1.Length)) + { return type; } } } } - finally { - if ((s1 != null)) { + finally + { + if ((s1 != null)) + { s1.Close(); } - if ((s2 != null)) { + if ((s2 != null)) + { s2.Close(); } } @@ -795,224 +967,265 @@ namespace FBS0000 { return type; } } - + /// ///Represents the strongly named DataTable class. /// [global::System.Serializable()] [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class Holydata_DayDataTable : global::System.Data.TypedTableBase { - + public partial class Holydata_DayDataTable : global::System.Data.TypedTableBase + { + private global::System.Data.DataColumn columnidx; - + private global::System.Data.DataColumn columnsdate; - + private global::System.Data.DataColumn columnuid; - + private global::System.Data.DataColumn columncate; - + private global::System.Data.DataColumn columnjun; - + private global::System.Data.DataColumn columnDr; - + private global::System.Data.DataColumn columnCr; - + private global::System.Data.DataColumn columncontents; - + private global::System.Data.DataColumn columngcode; - + private global::System.Data.DataColumn columnname; - + private global::System.Data.DataColumn columnProcess; - + private global::System.Data.DataColumn columnjan; - + private global::System.Data.DataColumn columniwol; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayDataTable() : - this(false) { + public Holydata_DayDataTable() : + this(false) + { } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayDataTable(bool initExpressions) { + public Holydata_DayDataTable(bool initExpressions) + { this.TableName = "Holydata_Day"; this.BeginInit(); this.InitClass(); - if ((initExpressions == true)) { + if ((initExpressions == true)) + { this.InitExpressions(); } this.EndInit(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal Holydata_DayDataTable(global::System.Data.DataTable table) { + internal Holydata_DayDataTable(global::System.Data.DataTable table) + { this.TableName = table.TableName; - if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) + { this.CaseSensitive = table.CaseSensitive; } - if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) + { this.Locale = table.Locale; } - if ((table.Namespace != table.DataSet.Namespace)) { + if ((table.Namespace != table.DataSet.Namespace)) + { this.Namespace = table.Namespace; } this.Prefix = table.Prefix; this.MinimumCapacity = table.MinimumCapacity; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected Holydata_DayDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context) { + protected Holydata_DayDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) + { this.InitVars(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn idxColumn { - get { + public global::System.Data.DataColumn idxColumn + { + get + { return this.columnidx; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn sdateColumn { - get { + public global::System.Data.DataColumn sdateColumn + { + get + { return this.columnsdate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn uidColumn { - get { + public global::System.Data.DataColumn uidColumn + { + get + { return this.columnuid; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn cateColumn { - get { + public global::System.Data.DataColumn cateColumn + { + get + { return this.columncate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn junColumn { - get { + public global::System.Data.DataColumn junColumn + { + get + { return this.columnjun; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn DrColumn { - get { + public global::System.Data.DataColumn DrColumn + { + get + { return this.columnDr; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn CrColumn { - get { + public global::System.Data.DataColumn CrColumn + { + get + { return this.columnCr; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn contentsColumn { - get { + public global::System.Data.DataColumn contentsColumn + { + get + { return this.columncontents; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn gcodeColumn { - get { + public global::System.Data.DataColumn gcodeColumn + { + get + { return this.columngcode; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn nameColumn { - get { + public global::System.Data.DataColumn nameColumn + { + get + { return this.columnname; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn ProcessColumn { - get { + public global::System.Data.DataColumn ProcessColumn + { + get + { return this.columnProcess; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn janColumn { - get { + public global::System.Data.DataColumn janColumn + { + get + { return this.columnjan; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn iwolColumn { - get { + public global::System.Data.DataColumn iwolColumn + { + get + { return this.columniwol; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] - public int Count { - get { + public int Count + { + get + { return this.Rows.Count; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRow this[int index] { - get { + public Holydata_DayRow this[int index] + { + get + { return ((Holydata_DayRow)(this.Rows[index])); } } - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_DayRowChangeEventHandler Holydata_DayRowChanging; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_DayRowChangeEventHandler Holydata_DayRowChanged; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_DayRowChangeEventHandler Holydata_DayRowDeleting; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_DayRowChangeEventHandler Holydata_DayRowDeleted; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void AddHolydata_DayRow(Holydata_DayRow row) { + public void AddHolydata_DayRow(Holydata_DayRow row) + { this.Rows.Add(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, double jan, bool iwol) { + public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, double jan, bool iwol) + { Holydata_DayRow rowHolydata_DayRow = ((Holydata_DayRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1032,10 +1245,11 @@ namespace FBS0000 { this.Rows.Add(rowHolydata_DayRow); return rowHolydata_DayRow; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, bool iwol) { + public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, bool iwol) + { Holydata_DayRow rowHolydata_DayRow = ((Holydata_DayRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1055,31 +1269,35 @@ namespace FBS0000 { this.Rows.Add(rowHolydata_DayRow); return rowHolydata_DayRow; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRow FindByidx(int idx) { + public Holydata_DayRow FindByidx(int idx) + { return ((Holydata_DayRow)(this.Rows.Find(new object[] { idx}))); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public override global::System.Data.DataTable Clone() { + public override global::System.Data.DataTable Clone() + { Holydata_DayDataTable cln = ((Holydata_DayDataTable)(base.Clone())); cln.InitVars(); return cln; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataTable CreateInstance() { + protected override global::System.Data.DataTable CreateInstance() + { return new Holydata_DayDataTable(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars() { + internal void InitVars() + { this.columnidx = base.Columns["idx"]; this.columnsdate = base.Columns["sdate"]; this.columnuid = base.Columns["uid"]; @@ -1094,10 +1312,11 @@ namespace FBS0000 { this.columnjan = base.Columns["jan"]; this.columniwol = base.Columns["iwol"]; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitClass() { + private void InitClass() + { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); this.columnsdate = new global::System.Data.DataColumn("sdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); @@ -1142,76 +1361,90 @@ namespace FBS0000 { this.columnProcess.MaxLength = 50; this.columnjan.ReadOnly = true; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRow NewHolydata_DayRow() { + public Holydata_DayRow NewHolydata_DayRow() + { return ((Holydata_DayRow)(this.NewRow())); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) + { return new Holydata_DayRow(builder); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Type GetRowType() { + protected override global::System.Type GetRowType() + { return typeof(Holydata_DayRow); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitExpressions() { + private void InitExpressions() + { this.janColumn.Expression = "jun+dr-cr"; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanged(e); - if ((this.Holydata_DayRowChanged != null)) { + if ((this.Holydata_DayRowChanged != null)) + { this.Holydata_DayRowChanged(this, new Holydata_DayRowChangeEvent(((Holydata_DayRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanging(e); - if ((this.Holydata_DayRowChanging != null)) { + if ((this.Holydata_DayRowChanging != null)) + { this.Holydata_DayRowChanging(this, new Holydata_DayRowChangeEvent(((Holydata_DayRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleted(e); - if ((this.Holydata_DayRowDeleted != null)) { + if ((this.Holydata_DayRowDeleted != null)) + { this.Holydata_DayRowDeleted(this, new Holydata_DayRowChangeEvent(((Holydata_DayRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleting(e); - if ((this.Holydata_DayRowDeleting != null)) { + if ((this.Holydata_DayRowDeleting != null)) + { this.Holydata_DayRowDeleting(this, new Holydata_DayRowChangeEvent(((Holydata_DayRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void RemoveHolydata_DayRow(Holydata_DayRow row) { + public void RemoveHolydata_DayRow(Holydata_DayRow row) + { this.Rows.Remove(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) + { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); dsReport ds = new dsReport(); @@ -1236,34 +1469,43 @@ namespace FBS0000 { type.Attributes.Add(attribute2); type.Particle = sequence; global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { + if (xs.Contains(dsSchema.TargetNamespace)) + { global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { + try + { global::System.Xml.Schema.XmlSchema schema = null; dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext();) + { schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); s2.SetLength(0); schema.Write(s2); - if ((s1.Length == s2.Length)) { + if ((s1.Length == s2.Length)) + { s1.Position = 0; s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte()));) + { ; } - if ((s1.Position == s1.Length)) { + if ((s1.Position == s1.Length)) + { return type; } } } } - finally { - if ((s1 != null)) { + finally + { + if ((s1 != null)) + { s1.Close(); } - if ((s2 != null)) { + if ((s2 != null)) + { s2.Close(); } } @@ -1272,205 +1514,242 @@ namespace FBS0000 { return type; } } - + /// ///Represents the strongly named DataTable class. /// [global::System.Serializable()] [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class Holydata_TimeDataTable : global::System.Data.TypedTableBase { - + public partial class Holydata_TimeDataTable : global::System.Data.TypedTableBase + { + private global::System.Data.DataColumn columngcode; - + private global::System.Data.DataColumn columnname; - + private global::System.Data.DataColumn columnidx; - + private global::System.Data.DataColumn columnsdate; - + private global::System.Data.DataColumn columnuid; - + private global::System.Data.DataColumn columncate; - + private global::System.Data.DataColumn columnjun; - + private global::System.Data.DataColumn columnDr; - + private global::System.Data.DataColumn columnCr; - + private global::System.Data.DataColumn columncontents; - + private global::System.Data.DataColumn columnProcess; - + private global::System.Data.DataColumn columniwol; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeDataTable() { + public Holydata_TimeDataTable() + { this.TableName = "Holydata_Time"; this.BeginInit(); this.InitClass(); this.EndInit(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal Holydata_TimeDataTable(global::System.Data.DataTable table) { + internal Holydata_TimeDataTable(global::System.Data.DataTable table) + { this.TableName = table.TableName; - if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) + { this.CaseSensitive = table.CaseSensitive; } - if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) + { this.Locale = table.Locale; } - if ((table.Namespace != table.DataSet.Namespace)) { + if ((table.Namespace != table.DataSet.Namespace)) + { this.Namespace = table.Namespace; } this.Prefix = table.Prefix; this.MinimumCapacity = table.MinimumCapacity; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected Holydata_TimeDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context) { + protected Holydata_TimeDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) + { this.InitVars(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn gcodeColumn { - get { + public global::System.Data.DataColumn gcodeColumn + { + get + { return this.columngcode; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn nameColumn { - get { + public global::System.Data.DataColumn nameColumn + { + get + { return this.columnname; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn idxColumn { - get { + public global::System.Data.DataColumn idxColumn + { + get + { return this.columnidx; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn sdateColumn { - get { + public global::System.Data.DataColumn sdateColumn + { + get + { return this.columnsdate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn uidColumn { - get { + public global::System.Data.DataColumn uidColumn + { + get + { return this.columnuid; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn cateColumn { - get { + public global::System.Data.DataColumn cateColumn + { + get + { return this.columncate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn junColumn { - get { + public global::System.Data.DataColumn junColumn + { + get + { return this.columnjun; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn DrColumn { - get { + public global::System.Data.DataColumn DrColumn + { + get + { return this.columnDr; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn CrColumn { - get { + public global::System.Data.DataColumn CrColumn + { + get + { return this.columnCr; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn contentsColumn { - get { + public global::System.Data.DataColumn contentsColumn + { + get + { return this.columncontents; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn ProcessColumn { - get { + public global::System.Data.DataColumn ProcessColumn + { + get + { return this.columnProcess; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn iwolColumn { - get { + public global::System.Data.DataColumn iwolColumn + { + get + { return this.columniwol; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] - public int Count { - get { + public int Count + { + get + { return this.Rows.Count; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeRow this[int index] { - get { + public Holydata_TimeRow this[int index] + { + get + { return ((Holydata_TimeRow)(this.Rows[index])); } } - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_TimeRowChangeEventHandler Holydata_TimeRowChanging; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_TimeRowChangeEventHandler Holydata_TimeRowChanged; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_TimeRowChangeEventHandler Holydata_TimeRowDeleting; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event Holydata_TimeRowChangeEventHandler Holydata_TimeRowDeleted; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void AddHolydata_TimeRow(Holydata_TimeRow row) { + public void AddHolydata_TimeRow(Holydata_TimeRow row) + { this.Rows.Add(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeRow AddHolydata_TimeRow(string gcode, string name, System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string Process, bool iwol) { + public Holydata_TimeRow AddHolydata_TimeRow(string gcode, string name, System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string Process, bool iwol) + { Holydata_TimeRow rowHolydata_TimeRow = ((Holydata_TimeRow)(this.NewRow())); object[] columnValuesArray = new object[] { gcode, @@ -1489,31 +1768,35 @@ namespace FBS0000 { this.Rows.Add(rowHolydata_TimeRow); return rowHolydata_TimeRow; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeRow FindByidx(int idx) { + public Holydata_TimeRow FindByidx(int idx) + { return ((Holydata_TimeRow)(this.Rows.Find(new object[] { idx}))); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public override global::System.Data.DataTable Clone() { + public override global::System.Data.DataTable Clone() + { Holydata_TimeDataTable cln = ((Holydata_TimeDataTable)(base.Clone())); cln.InitVars(); return cln; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataTable CreateInstance() { + protected override global::System.Data.DataTable CreateInstance() + { return new Holydata_TimeDataTable(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars() { + internal void InitVars() + { this.columngcode = base.Columns["gcode"]; this.columnname = base.Columns["name"]; this.columnidx = base.Columns["idx"]; @@ -1527,10 +1810,11 @@ namespace FBS0000 { this.columnProcess = base.Columns["Process"]; this.columniwol = base.Columns["iwol"]; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitClass() { + private void InitClass() + { this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngcode); this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element); @@ -1572,70 +1856,83 @@ namespace FBS0000 { this.columncontents.MaxLength = 2147483647; this.columnProcess.MaxLength = 50; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeRow NewHolydata_TimeRow() { + public Holydata_TimeRow NewHolydata_TimeRow() + { return ((Holydata_TimeRow)(this.NewRow())); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) + { return new Holydata_TimeRow(builder); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Type GetRowType() { + protected override global::System.Type GetRowType() + { return typeof(Holydata_TimeRow); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanged(e); - if ((this.Holydata_TimeRowChanged != null)) { + if ((this.Holydata_TimeRowChanged != null)) + { this.Holydata_TimeRowChanged(this, new Holydata_TimeRowChangeEvent(((Holydata_TimeRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanging(e); - if ((this.Holydata_TimeRowChanging != null)) { + if ((this.Holydata_TimeRowChanging != null)) + { this.Holydata_TimeRowChanging(this, new Holydata_TimeRowChangeEvent(((Holydata_TimeRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleted(e); - if ((this.Holydata_TimeRowDeleted != null)) { + if ((this.Holydata_TimeRowDeleted != null)) + { this.Holydata_TimeRowDeleted(this, new Holydata_TimeRowChangeEvent(((Holydata_TimeRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleting(e); - if ((this.Holydata_TimeRowDeleting != null)) { + if ((this.Holydata_TimeRowDeleting != null)) + { this.Holydata_TimeRowDeleting(this, new Holydata_TimeRowChangeEvent(((Holydata_TimeRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void RemoveHolydata_TimeRow(Holydata_TimeRow row) { + public void RemoveHolydata_TimeRow(Holydata_TimeRow row) + { this.Rows.Remove(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) + { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); dsReport ds = new dsReport(); @@ -1660,34 +1957,43 @@ namespace FBS0000 { type.Attributes.Add(attribute2); type.Particle = sequence; global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { + if (xs.Contains(dsSchema.TargetNamespace)) + { global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { + try + { global::System.Xml.Schema.XmlSchema schema = null; dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext();) + { schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); s2.SetLength(0); schema.Write(s2); - if ((s1.Length == s2.Length)) { + if ((s1.Length == s2.Length)) + { s1.Position = 0; s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte()));) + { ; } - if ((s1.Position == s1.Length)) { + if ((s1.Position == s1.Length)) + { return type; } } } } - finally { - if ((s1 != null)) { + finally + { + if ((s1 != null)) + { s1.Close(); } - if ((s2 != null)) { + if ((s2 != null)) + { s2.Close(); } } @@ -1696,272 +2002,807 @@ namespace FBS0000 { return type; } } - + /// ///Represents the strongly named DataTable class. /// [global::System.Serializable()] [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] - public partial class holydatasumDataTable : global::System.Data.TypedTableBase { - + public partial class Holydata_TimePMSDataTable : global::System.Data.TypedTableBase + { + + private global::System.Data.DataColumn columngcode; + + private global::System.Data.DataColumn columnidx; + + private global::System.Data.DataColumn columnsdate; + private global::System.Data.DataColumn columnuid; - - private global::System.Data.DataColumn columnuname; - - private global::System.Data.DataColumn columnprocess; - + private global::System.Data.DataColumn columncate; - - private global::System.Data.DataColumn columndr; - - private global::System.Data.DataColumn columncr; - - private global::System.Data.DataColumn columnjan; - - private global::System.Data.DataColumn columnadd; - - private global::System.Data.DataColumn columnrate; - + + private global::System.Data.DataColumn columnjun; + + private global::System.Data.DataColumn columnDr; + + private global::System.Data.DataColumn columnCr; + + private global::System.Data.DataColumn columncontents; + + private global::System.Data.DataColumn columnname; + + private global::System.Data.DataColumn columnProcess; + private global::System.Data.DataColumn columniwol; - - private global::System.Data.DataColumn columndrday; - - private global::System.Data.DataColumn columncrday; - - private global::System.Data.DataColumn columnjanday; - - private global::System.Data.DataColumn columnrateday; - - private global::System.Data.DataColumn columnaddday; - - private global::System.Data.DataColumn columnorderno; - - private global::System.Data.DataColumn columniwolday; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydatasumDataTable() { - this.TableName = "holydatasum"; + public Holydata_TimePMSDataTable() + { + this.TableName = "Holydata_TimePMS"; this.BeginInit(); this.InitClass(); this.EndInit(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal holydatasumDataTable(global::System.Data.DataTable table) { + internal Holydata_TimePMSDataTable(global::System.Data.DataTable table) + { this.TableName = table.TableName; - if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) + { this.CaseSensitive = table.CaseSensitive; } - if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) + { this.Locale = table.Locale; } - if ((table.Namespace != table.DataSet.Namespace)) { + if ((table.Namespace != table.DataSet.Namespace)) + { this.Namespace = table.Namespace; } this.Prefix = table.Prefix; this.MinimumCapacity = table.MinimumCapacity; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected holydatasumDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : - base(info, context) { + protected Holydata_TimePMSDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) + { this.InitVars(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn uidColumn { - get { + public global::System.Data.DataColumn gcodeColumn + { + get + { + return this.columngcode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn idxColumn + { + get + { + return this.columnidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sdateColumn + { + get + { + return this.columnsdate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn uidColumn + { + get + { return this.columnuid; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn unameColumn { - get { - return this.columnuname; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn processColumn { - get { - return this.columnprocess; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn cateColumn { - get { + public global::System.Data.DataColumn cateColumn + { + get + { return this.columncate; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn drColumn { - get { - return this.columndr; + public global::System.Data.DataColumn junColumn + { + get + { + return this.columnjun; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn crColumn { - get { - return this.columncr; + public global::System.Data.DataColumn DrColumn + { + get + { + return this.columnDr; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn janColumn { - get { - return this.columnjan; + public global::System.Data.DataColumn CrColumn + { + get + { + return this.columnCr; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn addColumn { - get { - return this.columnadd; + public global::System.Data.DataColumn contentsColumn + { + get + { + return this.columncontents; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn rateColumn { - get { - return this.columnrate; + public global::System.Data.DataColumn nameColumn + { + get + { + return this.columnname; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn iwolColumn { - get { + public global::System.Data.DataColumn ProcessColumn + { + get + { + return this.columnProcess; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn iwolColumn + { + get + { return this.columniwol; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn drdayColumn { - get { - return this.columndrday; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn crdayColumn { - get { - return this.columncrday; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn jandayColumn { - get { - return this.columnjanday; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn ratedayColumn { - get { - return this.columnrateday; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn adddayColumn { - get { - return this.columnaddday; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn ordernoColumn { - get { - return this.columnorderno; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataColumn iwoldayColumn { - get { - return this.columniwolday; - } - } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] - public int Count { - get { + public int Count + { + get + { return this.Rows.Count; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydatasumRow this[int index] { - get { + public Holydata_TimePMSRow this[int index] + { + get + { + return ((Holydata_TimePMSRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Holydata_TimePMSRowChangeEventHandler Holydata_TimePMSRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Holydata_TimePMSRowChangeEventHandler Holydata_TimePMSRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Holydata_TimePMSRowChangeEventHandler Holydata_TimePMSRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event Holydata_TimePMSRowChangeEventHandler Holydata_TimePMSRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void AddHolydata_TimePMSRow(Holydata_TimePMSRow row) + { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Holydata_TimePMSRow AddHolydata_TimePMSRow(string gcode, System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string name, string Process, bool iwol) + { + Holydata_TimePMSRow rowHolydata_TimePMSRow = ((Holydata_TimePMSRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + gcode, + null, + sdate, + uid, + cate, + jun, + Dr, + Cr, + contents, + name, + Process, + iwol}; + rowHolydata_TimePMSRow.ItemArray = columnValuesArray; + this.Rows.Add(rowHolydata_TimePMSRow); + return rowHolydata_TimePMSRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Holydata_TimePMSRow FindByidx(int idx) + { + return ((Holydata_TimePMSRow)(this.Rows.Find(new object[] { + idx}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public override global::System.Data.DataTable Clone() + { + Holydata_TimePMSDataTable cln = ((Holydata_TimePMSDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() + { + return new Holydata_TimePMSDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal void InitVars() + { + this.columngcode = base.Columns["gcode"]; + this.columnidx = base.Columns["idx"]; + this.columnsdate = base.Columns["sdate"]; + this.columnuid = base.Columns["uid"]; + this.columncate = base.Columns["cate"]; + this.columnjun = base.Columns["jun"]; + this.columnDr = base.Columns["Dr"]; + this.columnCr = base.Columns["Cr"]; + this.columncontents = base.Columns["contents"]; + this.columnname = base.Columns["name"]; + this.columnProcess = base.Columns["Process"]; + this.columniwol = base.Columns["iwol"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitClass() + { + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); + this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidx); + this.columnsdate = new global::System.Data.DataColumn("sdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsdate); + this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuid); + this.columncate = new global::System.Data.DataColumn("cate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columncate); + this.columnjun = new global::System.Data.DataColumn("jun", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnjun); + this.columnDr = new global::System.Data.DataColumn("Dr", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDr); + this.columnCr = new global::System.Data.DataColumn("Cr", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCr); + this.columncontents = new global::System.Data.DataColumn("contents", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columncontents); + this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnname); + this.columnProcess = new global::System.Data.DataColumn("Process", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnProcess); + this.columniwol = new global::System.Data.DataColumn("iwol", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columniwol); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx}, true)); + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; + this.columnidx.AutoIncrement = true; + this.columnidx.AutoIncrementSeed = -1; + this.columnidx.AutoIncrementStep = -1; + this.columnidx.AllowDBNull = false; + this.columnidx.ReadOnly = true; + this.columnidx.Unique = true; + this.columnuid.MaxLength = 20; + this.columncate.MaxLength = 20; + this.columnjun.ReadOnly = true; + this.columncontents.MaxLength = 2147483647; + this.columnname.MaxLength = 100; + this.columnProcess.MaxLength = 50; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Holydata_TimePMSRow NewHolydata_TimePMSRow() + { + return ((Holydata_TimePMSRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) + { + return new Holydata_TimePMSRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Type GetRowType() + { + return typeof(Holydata_TimePMSRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) + { + base.OnRowChanged(e); + if ((this.Holydata_TimePMSRowChanged != null)) + { + this.Holydata_TimePMSRowChanged(this, new Holydata_TimePMSRowChangeEvent(((Holydata_TimePMSRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) + { + base.OnRowChanging(e); + if ((this.Holydata_TimePMSRowChanging != null)) + { + this.Holydata_TimePMSRowChanging(this, new Holydata_TimePMSRowChangeEvent(((Holydata_TimePMSRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) + { + base.OnRowDeleted(e); + if ((this.Holydata_TimePMSRowDeleted != null)) + { + this.Holydata_TimePMSRowDeleted(this, new Holydata_TimePMSRowChangeEvent(((Holydata_TimePMSRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) + { + base.OnRowDeleting(e); + if ((this.Holydata_TimePMSRowDeleting != null)) + { + this.Holydata_TimePMSRowDeleting(this, new Holydata_TimePMSRowChangeEvent(((Holydata_TimePMSRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void RemoveHolydata_TimePMSRow(Holydata_TimePMSRow row) + { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) + { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsReport ds = new dsReport(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "Holydata_TimePMSDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) + { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try + { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext();) + { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) + { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte()));) + { + ; + } + if ((s1.Position == s1.Length)) + { + return type; + } + } + } + } + finally + { + if ((s1 != null)) + { + s1.Close(); + } + if ((s2 != null)) + { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class holydatasumDataTable : global::System.Data.TypedTableBase + { + + private global::System.Data.DataColumn columnuid; + + private global::System.Data.DataColumn columnuname; + + private global::System.Data.DataColumn columnprocess; + + private global::System.Data.DataColumn columncate; + + private global::System.Data.DataColumn columndr; + + private global::System.Data.DataColumn columncr; + + private global::System.Data.DataColumn columnjan; + + private global::System.Data.DataColumn columnadd; + + private global::System.Data.DataColumn columnrate; + + private global::System.Data.DataColumn columniwol; + + private global::System.Data.DataColumn columndrday; + + private global::System.Data.DataColumn columncrday; + + private global::System.Data.DataColumn columnjanday; + + private global::System.Data.DataColumn columnrateday; + + private global::System.Data.DataColumn columnaddday; + + private global::System.Data.DataColumn columnorderno; + + private global::System.Data.DataColumn columniwolday; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public holydatasumDataTable() + { + this.TableName = "holydatasum"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal holydatasumDataTable(global::System.Data.DataTable table) + { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) + { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) + { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) + { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected holydatasumDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) + { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn uidColumn + { + get + { + return this.columnuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn unameColumn + { + get + { + return this.columnuname; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn processColumn + { + get + { + return this.columnprocess; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn cateColumn + { + get + { + return this.columncate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn drColumn + { + get + { + return this.columndr; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn crColumn + { + get + { + return this.columncr; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn janColumn + { + get + { + return this.columnjan; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn addColumn + { + get + { + return this.columnadd; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn rateColumn + { + get + { + return this.columnrate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn iwolColumn + { + get + { + return this.columniwol; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn drdayColumn + { + get + { + return this.columndrday; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn crdayColumn + { + get + { + return this.columncrday; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn jandayColumn + { + get + { + return this.columnjanday; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn ratedayColumn + { + get + { + return this.columnrateday; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn adddayColumn + { + get + { + return this.columnaddday; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn ordernoColumn + { + get + { + return this.columnorderno; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn iwoldayColumn + { + get + { + return this.columniwolday; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count + { + get + { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public holydatasumRow this[int index] + { + get + { return ((holydatasumRow)(this.Rows[index])); } } - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydatasumRowChangeEventHandler holydatasumRowChanging; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydatasumRowChangeEventHandler holydatasumRowChanged; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydatasumRowChangeEventHandler holydatasumRowDeleting; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public event holydatasumRowChangeEventHandler holydatasumRowDeleted; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void AddholydatasumRow(holydatasumRow row) { + public void AddholydatasumRow(holydatasumRow row) + { this.Rows.Add(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public holydatasumRow AddholydatasumRow( - string uid, - string uname, - string process, - string cate, - double dr, - double cr, - double jan, - double add, - double rate, - double iwol, - double drday, - double crday, - double janday, - double rateday, - double addday, - int orderno, - double iwolday) { + string uid, + string uname, + string process, + string cate, + double dr, + double cr, + double jan, + double add, + double rate, + double iwol, + double drday, + double crday, + double janday, + double rateday, + double addday, + int orderno, + double iwolday) + { holydatasumRow rowholydatasumRow = ((holydatasumRow)(this.NewRow())); object[] columnValuesArray = new object[] { uid, @@ -1985,32 +2826,36 @@ namespace FBS0000 { this.Rows.Add(rowholydatasumRow); return rowholydatasumRow; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydatasumRow FindByuidcate(string uid, string cate) { + public holydatasumRow FindByuidcate(string uid, string cate) + { return ((holydatasumRow)(this.Rows.Find(new object[] { uid, cate}))); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public override global::System.Data.DataTable Clone() { + public override global::System.Data.DataTable Clone() + { holydatasumDataTable cln = ((holydatasumDataTable)(base.Clone())); cln.InitVars(); return cln; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataTable CreateInstance() { + protected override global::System.Data.DataTable CreateInstance() + { return new holydatasumDataTable(); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal void InitVars() { + internal void InitVars() + { this.columnuid = base.Columns["uid"]; this.columnuname = base.Columns["uname"]; this.columnprocess = base.Columns["process"]; @@ -2029,10 +2874,11 @@ namespace FBS0000 { this.columnorderno = base.Columns["orderno"]; this.columniwolday = base.Columns["iwolday"]; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitClass() { + private void InitClass() + { this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuid); this.columnuname = new global::System.Data.DataColumn("uname", typeof(string), null, global::System.Data.MappingType.Element); @@ -2073,70 +2919,83 @@ namespace FBS0000 { this.columnuid.AllowDBNull = false; this.columncate.AllowDBNull = false; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydatasumRow NewholydatasumRow() { + public holydatasumRow NewholydatasumRow() + { return ((holydatasumRow)(this.NewRow())); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) + { return new holydatasumRow(builder); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override global::System.Type GetRowType() { + protected override global::System.Type GetRowType() + { return typeof(holydatasumRow); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanged(e); - if ((this.holydatasumRowChanged != null)) { + if ((this.holydatasumRowChanged != null)) + { this.holydatasumRowChanged(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowChanging(e); - if ((this.holydatasumRowChanging != null)) { + if ((this.holydatasumRowChanging != null)) + { this.holydatasumRowChanging(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleted(e); - if ((this.holydatasumRowDeleted != null)) { + if ((this.holydatasumRowDeleted != null)) + { this.holydatasumRowDeleted(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) + { base.OnRowDeleting(e); - if ((this.holydatasumRowDeleting != null)) { + if ((this.holydatasumRowDeleting != null)) + { this.holydatasumRowDeleting(this, new holydatasumRowChangeEvent(((holydatasumRow)(e.Row)), e.Action)); } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void RemoveholydatasumRow(holydatasumRow row) { + public void RemoveholydatasumRow(holydatasumRow row) + { this.Rows.Remove(row); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) + { global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); dsReport ds = new dsReport(); @@ -2161,34 +3020,43 @@ namespace FBS0000 { type.Attributes.Add(attribute2); type.Particle = sequence; global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); - if (xs.Contains(dsSchema.TargetNamespace)) { + if (xs.Contains(dsSchema.TargetNamespace)) + { global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); - try { + try + { global::System.Xml.Schema.XmlSchema schema = null; dsSchema.Write(s1); - for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext();) + { schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); s2.SetLength(0); schema.Write(s2); - if ((s1.Length == s2.Length)) { + if ((s1.Length == s2.Length)) + { s1.Position = 0; s2.Position = 0; - for (; ((s1.Position != s1.Length) - && (s1.ReadByte() == s2.ReadByte())); ) { + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte()));) + { ; } - if ((s1.Position == s1.Length)) { + if ((s1.Position == s1.Length)) + { return type; } } } } - finally { - if ((s1 != null)) { + finally + { + if ((s1 != null)) + { s1.Close(); } - if ((s2 != null)) { + if ((s2 != null)) + { s2.Close(); } } @@ -2197,1600 +3065,2418 @@ namespace FBS0000 { return type; } } - + /// ///Represents strongly named DataRow class. /// - public partial class holydataRow : global::System.Data.DataRow { - + public partial class holydataRow : global::System.Data.DataRow + { + private holydataDataTable tableholydata; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal holydataRow(global::System.Data.DataRowBuilder rb) : - base(rb) { + internal holydataRow(global::System.Data.DataRowBuilder rb) : + base(rb) + { this.tableholydata = ((holydataDataTable)(this.Table)); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string uid { - get { - try { + public string uid + { + get + { + try + { return ((string)(this[this.tableholydata.uidColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'uid\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydata.uidColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string cate { - get { - try { + public string cate + { + get + { + try + { return ((string)(this[this.tableholydata.cateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'cate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydata.cateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double DrTime { - get { - if (this.IsDrTimeNull()) { + public double DrTime + { + get + { + if (this.IsDrTimeNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydata.DrTimeColumn])); } } - set { + set + { this[this.tableholydata.DrTimeColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double CrTime { - get { - if (this.IsCrTimeNull()) { + public double CrTime + { + get + { + if (this.IsCrTimeNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydata.CrTimeColumn])); } } - set { + set + { this[this.tableholydata.CrTimeColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string gcode { - get { + public string gcode + { + get + { return ((string)(this[this.tableholydata.gcodeColumn])); } - set { + set + { this[this.tableholydata.gcodeColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Process { - get { - try { + public string Process + { + get + { + try + { return ((string)(this[this.tableholydata.ProcessColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'Process\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydata.ProcessColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string name { - get { - try { + public string name + { + get + { + try + { return ((string)(this[this.tableholydata.nameColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'name\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydata.nameColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double CrDay { - get { - if (this.IsCrDayNull()) { + public double CrDay + { + get + { + if (this.IsCrDayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydata.CrDayColumn])); } } - set { + set + { this[this.tableholydata.CrDayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double DrDay { - get { - if (this.IsDrDayNull()) { + public double DrDay + { + get + { + if (this.IsDrDayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydata.DrDayColumn])); } } - set { + set + { this[this.tableholydata.DrDayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public System.DateTime sdate { - get { - try { + public System.DateTime sdate + { + get + { + try + { return ((global::System.DateTime)(this[this.tableholydata.sdateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'sdate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydata.sdateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public System.DateTime edate { - get { - try { + public System.DateTime edate + { + get + { + try + { return ((global::System.DateTime)(this[this.tableholydata.edateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'edate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydata.edateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool iwol { - get { - if (this.IsiwolNull()) { + public bool iwol + { + get + { + if (this.IsiwolNull()) + { return false; } - else { + else + { return ((bool)(this[this.tableholydata.iwolColumn])); } } - set { + set + { this[this.tableholydata.iwolColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsuidNull() { + public bool IsuidNull() + { return this.IsNull(this.tableholydata.uidColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetuidNull() { + public void SetuidNull() + { this[this.tableholydata.uidColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscateNull() { + public bool IscateNull() + { return this.IsNull(this.tableholydata.cateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcateNull() { + public void SetcateNull() + { this[this.tableholydata.cateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsDrTimeNull() { + public bool IsDrTimeNull() + { return this.IsNull(this.tableholydata.DrTimeColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetDrTimeNull() { + public void SetDrTimeNull() + { this[this.tableholydata.DrTimeColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsCrTimeNull() { + public bool IsCrTimeNull() + { return this.IsNull(this.tableholydata.CrTimeColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetCrTimeNull() { + public void SetCrTimeNull() + { this[this.tableholydata.CrTimeColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsProcessNull() { + public bool IsProcessNull() + { return this.IsNull(this.tableholydata.ProcessColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetProcessNull() { + public void SetProcessNull() + { this[this.tableholydata.ProcessColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsnameNull() { + public bool IsnameNull() + { return this.IsNull(this.tableholydata.nameColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetnameNull() { + public void SetnameNull() + { this[this.tableholydata.nameColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsCrDayNull() { + public bool IsCrDayNull() + { return this.IsNull(this.tableholydata.CrDayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetCrDayNull() { + public void SetCrDayNull() + { this[this.tableholydata.CrDayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsDrDayNull() { + public bool IsDrDayNull() + { return this.IsNull(this.tableholydata.DrDayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetDrDayNull() { + public void SetDrDayNull() + { this[this.tableholydata.DrDayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IssdateNull() { + public bool IssdateNull() + { return this.IsNull(this.tableholydata.sdateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetsdateNull() { + public void SetsdateNull() + { this[this.tableholydata.sdateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsedateNull() { + public bool IsedateNull() + { return this.IsNull(this.tableholydata.edateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetedateNull() { + public void SetedateNull() + { this[this.tableholydata.edateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsiwolNull() { + public bool IsiwolNull() + { return this.IsNull(this.tableholydata.iwolColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetiwolNull() { + public void SetiwolNull() + { this[this.tableholydata.iwolColumn] = global::System.Convert.DBNull; } } - + /// ///Represents strongly named DataRow class. /// - public partial class Holydata_DayRow : global::System.Data.DataRow { - + public partial class Holydata_DayRow : global::System.Data.DataRow + { + private Holydata_DayDataTable tableHolydata_Day; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal Holydata_DayRow(global::System.Data.DataRowBuilder rb) : - base(rb) { + internal Holydata_DayRow(global::System.Data.DataRowBuilder rb) : + base(rb) + { this.tableHolydata_Day = ((Holydata_DayDataTable)(this.Table)); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int idx { - get { + public int idx + { + get + { return ((int)(this[this.tableHolydata_Day.idxColumn])); } - set { + set + { this[this.tableHolydata_Day.idxColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public System.DateTime sdate { - get { - try { + public System.DateTime sdate + { + get + { + try + { return ((global::System.DateTime)(this[this.tableHolydata_Day.sdateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'sdate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.sdateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string uid { - get { - try { + public string uid + { + get + { + try + { return ((string)(this[this.tableHolydata_Day.uidColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'uid\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.uidColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string cate { - get { - try { + public string cate + { + get + { + try + { return ((string)(this[this.tableHolydata_Day.cateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'cate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.cateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double jun { - get { - if (this.IsjunNull()) { + public double jun + { + get + { + if (this.IsjunNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableHolydata_Day.junColumn])); } } - set { + set + { this[this.tableHolydata_Day.junColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double Dr { - get { - if (this.IsDrNull()) { + public double Dr + { + get + { + if (this.IsDrNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableHolydata_Day.DrColumn])); } } - set { + set + { this[this.tableHolydata_Day.DrColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double Cr { - get { - if (this.IsCrNull()) { + public double Cr + { + get + { + if (this.IsCrNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableHolydata_Day.CrColumn])); } } - set { + set + { this[this.tableHolydata_Day.CrColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string contents { - get { - try { + public string contents + { + get + { + try + { return ((string)(this[this.tableHolydata_Day.contentsColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'contents\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.contentsColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string gcode { - get { + public string gcode + { + get + { return ((string)(this[this.tableHolydata_Day.gcodeColumn])); } - set { + set + { this[this.tableHolydata_Day.gcodeColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string name { - get { - try { + public string name + { + get + { + try + { return ((string)(this[this.tableHolydata_Day.nameColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'name\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.nameColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Process { - get { - try { + public string Process + { + get + { + try + { return ((string)(this[this.tableHolydata_Day.ProcessColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'Process\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.ProcessColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double jan { - get { - if (this.IsjanNull()) { + public double jan + { + get + { + if (this.IsjanNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableHolydata_Day.janColumn])); } } - set { + set + { this[this.tableHolydata_Day.janColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool iwol { - get { - try { + public bool iwol + { + get + { + try + { return ((bool)(this[this.tableHolydata_Day.iwolColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Day.iwolColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IssdateNull() { + public bool IssdateNull() + { return this.IsNull(this.tableHolydata_Day.sdateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetsdateNull() { + public void SetsdateNull() + { this[this.tableHolydata_Day.sdateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsuidNull() { + public bool IsuidNull() + { return this.IsNull(this.tableHolydata_Day.uidColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetuidNull() { + public void SetuidNull() + { this[this.tableHolydata_Day.uidColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscateNull() { + public bool IscateNull() + { return this.IsNull(this.tableHolydata_Day.cateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcateNull() { + public void SetcateNull() + { this[this.tableHolydata_Day.cateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsjunNull() { + public bool IsjunNull() + { return this.IsNull(this.tableHolydata_Day.junColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetjunNull() { + public void SetjunNull() + { this[this.tableHolydata_Day.junColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsDrNull() { + public bool IsDrNull() + { return this.IsNull(this.tableHolydata_Day.DrColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetDrNull() { + public void SetDrNull() + { this[this.tableHolydata_Day.DrColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsCrNull() { + public bool IsCrNull() + { return this.IsNull(this.tableHolydata_Day.CrColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetCrNull() { + public void SetCrNull() + { this[this.tableHolydata_Day.CrColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscontentsNull() { + public bool IscontentsNull() + { return this.IsNull(this.tableHolydata_Day.contentsColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcontentsNull() { + public void SetcontentsNull() + { this[this.tableHolydata_Day.contentsColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsnameNull() { + public bool IsnameNull() + { return this.IsNull(this.tableHolydata_Day.nameColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetnameNull() { + public void SetnameNull() + { this[this.tableHolydata_Day.nameColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsProcessNull() { + public bool IsProcessNull() + { return this.IsNull(this.tableHolydata_Day.ProcessColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetProcessNull() { + public void SetProcessNull() + { this[this.tableHolydata_Day.ProcessColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsjanNull() { + public bool IsjanNull() + { return this.IsNull(this.tableHolydata_Day.janColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetjanNull() { + public void SetjanNull() + { this[this.tableHolydata_Day.janColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsiwolNull() { + public bool IsiwolNull() + { return this.IsNull(this.tableHolydata_Day.iwolColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetiwolNull() { + public void SetiwolNull() + { this[this.tableHolydata_Day.iwolColumn] = global::System.Convert.DBNull; } } - + /// ///Represents strongly named DataRow class. /// - public partial class Holydata_TimeRow : global::System.Data.DataRow { - + public partial class Holydata_TimeRow : global::System.Data.DataRow + { + private Holydata_TimeDataTable tableHolydata_Time; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal Holydata_TimeRow(global::System.Data.DataRowBuilder rb) : - base(rb) { + internal Holydata_TimeRow(global::System.Data.DataRowBuilder rb) : + base(rb) + { this.tableHolydata_Time = ((Holydata_TimeDataTable)(this.Table)); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string gcode { - get { + public string gcode + { + get + { return ((string)(this[this.tableHolydata_Time.gcodeColumn])); } - set { + set + { this[this.tableHolydata_Time.gcodeColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string name { - get { - try { + public string name + { + get + { + try + { return ((string)(this[this.tableHolydata_Time.nameColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'name\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.nameColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int idx { - get { + public int idx + { + get + { return ((int)(this[this.tableHolydata_Time.idxColumn])); } - set { + set + { this[this.tableHolydata_Time.idxColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public System.DateTime sdate { - get { - try { + public System.DateTime sdate + { + get + { + try + { return ((global::System.DateTime)(this[this.tableHolydata_Time.sdateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'sdate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.sdateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string uid { - get { - try { + public string uid + { + get + { + try + { return ((string)(this[this.tableHolydata_Time.uidColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'uid\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.uidColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string cate { - get { - try { + public string cate + { + get + { + try + { return ((string)(this[this.tableHolydata_Time.cateColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'cate\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.cateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double jun { - get { - try { + public double jun + { + get + { + try + { return ((double)(this[this.tableHolydata_Time.junColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'jun\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.junColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double Dr { - get { - try { + public double Dr + { + get + { + try + { return ((double)(this[this.tableHolydata_Time.DrColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'Dr\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.DrColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double Cr { - get { - try { + public double Cr + { + get + { + try + { return ((double)(this[this.tableHolydata_Time.CrColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'Cr\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.CrColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string contents { - get { - try { + public string contents + { + get + { + try + { return ((string)(this[this.tableHolydata_Time.contentsColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'contents\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.contentsColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string Process { - get { - try { + public string Process + { + get + { + try + { return ((string)(this[this.tableHolydata_Time.ProcessColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'Process\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.ProcessColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool iwol { - get { - try { + public bool iwol + { + get + { + try + { return ((bool)(this[this.tableHolydata_Time.iwolColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableHolydata_Time.iwolColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsnameNull() { + public bool IsnameNull() + { return this.IsNull(this.tableHolydata_Time.nameColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetnameNull() { + public void SetnameNull() + { this[this.tableHolydata_Time.nameColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IssdateNull() { + public bool IssdateNull() + { return this.IsNull(this.tableHolydata_Time.sdateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetsdateNull() { + public void SetsdateNull() + { this[this.tableHolydata_Time.sdateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsuidNull() { + public bool IsuidNull() + { return this.IsNull(this.tableHolydata_Time.uidColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetuidNull() { + public void SetuidNull() + { this[this.tableHolydata_Time.uidColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscateNull() { + public bool IscateNull() + { return this.IsNull(this.tableHolydata_Time.cateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcateNull() { + public void SetcateNull() + { this[this.tableHolydata_Time.cateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsjunNull() { + public bool IsjunNull() + { return this.IsNull(this.tableHolydata_Time.junColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetjunNull() { + public void SetjunNull() + { this[this.tableHolydata_Time.junColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsDrNull() { + public bool IsDrNull() + { return this.IsNull(this.tableHolydata_Time.DrColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetDrNull() { + public void SetDrNull() + { this[this.tableHolydata_Time.DrColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsCrNull() { + public bool IsCrNull() + { return this.IsNull(this.tableHolydata_Time.CrColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetCrNull() { + public void SetCrNull() + { this[this.tableHolydata_Time.CrColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscontentsNull() { + public bool IscontentsNull() + { return this.IsNull(this.tableHolydata_Time.contentsColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcontentsNull() { + public void SetcontentsNull() + { this[this.tableHolydata_Time.contentsColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsProcessNull() { + public bool IsProcessNull() + { return this.IsNull(this.tableHolydata_Time.ProcessColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetProcessNull() { + public void SetProcessNull() + { this[this.tableHolydata_Time.ProcessColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsiwolNull() { + public bool IsiwolNull() + { return this.IsNull(this.tableHolydata_Time.iwolColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetiwolNull() { + public void SetiwolNull() + { this[this.tableHolydata_Time.iwolColumn] = global::System.Convert.DBNull; } } - + /// ///Represents strongly named DataRow class. /// - public partial class holydatasumRow : global::System.Data.DataRow { - - private holydatasumDataTable tableholydatasum; - + public partial class Holydata_TimePMSRow : global::System.Data.DataRow + { + + private Holydata_TimePMSDataTable tableHolydata_TimePMS; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal holydatasumRow(global::System.Data.DataRowBuilder rb) : - base(rb) { + internal Holydata_TimePMSRow(global::System.Data.DataRowBuilder rb) : + base(rb) + { + this.tableHolydata_TimePMS = ((Holydata_TimePMSDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string gcode + { + get + { + return ((string)(this[this.tableHolydata_TimePMS.gcodeColumn])); + } + set + { + this[this.tableHolydata_TimePMS.gcodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int idx + { + get + { + return ((int)(this[this.tableHolydata_TimePMS.idxColumn])); + } + set + { + this[this.tableHolydata_TimePMS.idxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public System.DateTime sdate + { + get + { + try + { + return ((global::System.DateTime)(this[this.tableHolydata_TimePMS.sdateColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'sdate\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.sdateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string uid + { + get + { + try + { + return ((string)(this[this.tableHolydata_TimePMS.uidColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'uid\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.uidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string cate + { + get + { + try + { + return ((string)(this[this.tableHolydata_TimePMS.cateColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'cate\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.cateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double jun + { + get + { + try + { + return ((double)(this[this.tableHolydata_TimePMS.junColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'jun\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.junColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double Dr + { + get + { + try + { + return ((double)(this[this.tableHolydata_TimePMS.DrColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'Dr\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.DrColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double Cr + { + get + { + try + { + return ((double)(this[this.tableHolydata_TimePMS.CrColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'Cr\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.CrColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string contents + { + get + { + try + { + return ((string)(this[this.tableHolydata_TimePMS.contentsColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'contents\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.contentsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string name + { + get + { + try + { + return ((string)(this[this.tableHolydata_TimePMS.nameColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'name\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.nameColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string Process + { + get + { + try + { + return ((string)(this[this.tableHolydata_TimePMS.ProcessColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'Process\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.ProcessColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool iwol + { + get + { + try + { + return ((bool)(this[this.tableHolydata_TimePMS.iwolColumn])); + } + catch (global::System.InvalidCastException e) + { + throw new global::System.Data.StrongTypingException("\'Holydata_TimePMS\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e); + } + } + set + { + this[this.tableHolydata_TimePMS.iwolColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IssdateNull() + { + return this.IsNull(this.tableHolydata_TimePMS.sdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetsdateNull() + { + this[this.tableHolydata_TimePMS.sdateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsuidNull() + { + return this.IsNull(this.tableHolydata_TimePMS.uidColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetuidNull() + { + this[this.tableHolydata_TimePMS.uidColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IscateNull() + { + return this.IsNull(this.tableHolydata_TimePMS.cateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetcateNull() + { + this[this.tableHolydata_TimePMS.cateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsjunNull() + { + return this.IsNull(this.tableHolydata_TimePMS.junColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetjunNull() + { + this[this.tableHolydata_TimePMS.junColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsDrNull() + { + return this.IsNull(this.tableHolydata_TimePMS.DrColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetDrNull() + { + this[this.tableHolydata_TimePMS.DrColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsCrNull() + { + return this.IsNull(this.tableHolydata_TimePMS.CrColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetCrNull() + { + this[this.tableHolydata_TimePMS.CrColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IscontentsNull() + { + return this.IsNull(this.tableHolydata_TimePMS.contentsColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetcontentsNull() + { + this[this.tableHolydata_TimePMS.contentsColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsnameNull() + { + return this.IsNull(this.tableHolydata_TimePMS.nameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetnameNull() + { + this[this.tableHolydata_TimePMS.nameColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsProcessNull() + { + return this.IsNull(this.tableHolydata_TimePMS.ProcessColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetProcessNull() + { + this[this.tableHolydata_TimePMS.ProcessColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsiwolNull() + { + return this.IsNull(this.tableHolydata_TimePMS.iwolColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetiwolNull() + { + this[this.tableHolydata_TimePMS.iwolColumn] = global::System.Convert.DBNull; + } + } + + /// + ///Represents strongly named DataRow class. + /// + public partial class holydatasumRow : global::System.Data.DataRow + { + + private holydatasumDataTable tableholydatasum; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal holydatasumRow(global::System.Data.DataRowBuilder rb) : + base(rb) + { this.tableholydatasum = ((holydatasumDataTable)(this.Table)); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string uid { - get { + public string uid + { + get + { return ((string)(this[this.tableholydatasum.uidColumn])); } - set { + set + { this[this.tableholydatasum.uidColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string uname { - get { - if (this.IsunameNull()) { + public string uname + { + get + { + if (this.IsunameNull()) + { return string.Empty; } - else { + else + { return ((string)(this[this.tableholydatasum.unameColumn])); } } - set { + set + { this[this.tableholydatasum.unameColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string process { - get { - if (this.IsprocessNull()) { + public string process + { + get + { + if (this.IsprocessNull()) + { return string.Empty; } - else { + else + { return ((string)(this[this.tableholydatasum.processColumn])); } } - set { + set + { this[this.tableholydatasum.processColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public string cate { - get { + public string cate + { + get + { return ((string)(this[this.tableholydatasum.cateColumn])); } - set { + set + { this[this.tableholydatasum.cateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double dr { - get { - if (this.IsdrNull()) { + public double dr + { + get + { + if (this.IsdrNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.drColumn])); } } - set { + set + { this[this.tableholydatasum.drColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double cr { - get { - if (this.IscrNull()) { + public double cr + { + get + { + if (this.IscrNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.crColumn])); } } - set { + set + { this[this.tableholydatasum.crColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double jan { - get { - if (this.IsjanNull()) { + public double jan + { + get + { + if (this.IsjanNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.janColumn])); } } - set { + set + { this[this.tableholydatasum.janColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double add { - get { - if (this.IsaddNull()) { + public double add + { + get + { + if (this.IsaddNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.addColumn])); } } - set { + set + { this[this.tableholydatasum.addColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double rate { - get { - if (this.IsrateNull()) { + public double rate + { + get + { + if (this.IsrateNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.rateColumn])); } } - set { + set + { this[this.tableholydatasum.rateColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double iwol { - get { - try { + public double iwol + { + get + { + try + { return ((double)(this[this.tableholydatasum.iwolColumn])); } - catch (global::System.InvalidCastException e) { + catch (global::System.InvalidCastException e) + { throw new global::System.Data.StrongTypingException("\'holydatasum\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e); } } - set { + set + { this[this.tableholydatasum.iwolColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double drday { - get { - if (this.IsdrdayNull()) { + public double drday + { + get + { + if (this.IsdrdayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.drdayColumn])); } } - set { + set + { this[this.tableholydatasum.drdayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double crday { - get { - if (this.IscrdayNull()) { + public double crday + { + get + { + if (this.IscrdayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.crdayColumn])); } } - set { + set + { this[this.tableholydatasum.crdayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double janday { - get { - if (this.IsjandayNull()) { + public double janday + { + get + { + if (this.IsjandayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.jandayColumn])); } } - set { + set + { this[this.tableholydatasum.jandayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double rateday { - get { - if (this.IsratedayNull()) { + public double rateday + { + get + { + if (this.IsratedayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.ratedayColumn])); } } - set { + set + { this[this.tableholydatasum.ratedayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double addday { - get { - if (this.IsadddayNull()) { + public double addday + { + get + { + if (this.IsadddayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.adddayColumn])); } } - set { + set + { this[this.tableholydatasum.adddayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int orderno { - get { - if (this.IsordernoNull()) { + public int orderno + { + get + { + if (this.IsordernoNull()) + { return 1; } - else { + else + { return ((int)(this[this.tableholydatasum.ordernoColumn])); } } - set { + set + { this[this.tableholydatasum.ordernoColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double iwolday { - get { - if (this.IsiwoldayNull()) { + public double iwolday + { + get + { + if (this.IsiwoldayNull()) + { return 0D; } - else { + else + { return ((double)(this[this.tableholydatasum.iwoldayColumn])); } } - set { + set + { this[this.tableholydatasum.iwoldayColumn] = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsunameNull() { + public bool IsunameNull() + { return this.IsNull(this.tableholydatasum.unameColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetunameNull() { + public void SetunameNull() + { this[this.tableholydatasum.unameColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsprocessNull() { + public bool IsprocessNull() + { return this.IsNull(this.tableholydatasum.processColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetprocessNull() { + public void SetprocessNull() + { this[this.tableholydatasum.processColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsdrNull() { + public bool IsdrNull() + { return this.IsNull(this.tableholydatasum.drColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetdrNull() { + public void SetdrNull() + { this[this.tableholydatasum.drColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscrNull() { + public bool IscrNull() + { return this.IsNull(this.tableholydatasum.crColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcrNull() { + public void SetcrNull() + { this[this.tableholydatasum.crColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsjanNull() { + public bool IsjanNull() + { return this.IsNull(this.tableholydatasum.janColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetjanNull() { + public void SetjanNull() + { this[this.tableholydatasum.janColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsaddNull() { + public bool IsaddNull() + { return this.IsNull(this.tableholydatasum.addColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetaddNull() { + public void SetaddNull() + { this[this.tableholydatasum.addColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsrateNull() { + public bool IsrateNull() + { return this.IsNull(this.tableholydatasum.rateColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetrateNull() { + public void SetrateNull() + { this[this.tableholydatasum.rateColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsiwolNull() { + public bool IsiwolNull() + { return this.IsNull(this.tableholydatasum.iwolColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetiwolNull() { + public void SetiwolNull() + { this[this.tableholydatasum.iwolColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsdrdayNull() { + public bool IsdrdayNull() + { return this.IsNull(this.tableholydatasum.drdayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetdrdayNull() { + public void SetdrdayNull() + { this[this.tableholydatasum.drdayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IscrdayNull() { + public bool IscrdayNull() + { return this.IsNull(this.tableholydatasum.crdayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetcrdayNull() { + public void SetcrdayNull() + { this[this.tableholydatasum.crdayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsjandayNull() { + public bool IsjandayNull() + { return this.IsNull(this.tableholydatasum.jandayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetjandayNull() { + public void SetjandayNull() + { this[this.tableholydatasum.jandayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsratedayNull() { + public bool IsratedayNull() + { return this.IsNull(this.tableholydatasum.ratedayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetratedayNull() { + public void SetratedayNull() + { this[this.tableholydatasum.ratedayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsadddayNull() { + public bool IsadddayNull() + { return this.IsNull(this.tableholydatasum.adddayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetadddayNull() { + public void SetadddayNull() + { this[this.tableholydatasum.adddayColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsordernoNull() { + public bool IsordernoNull() + { return this.IsNull(this.tableholydatasum.ordernoColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetordernoNull() { + public void SetordernoNull() + { this[this.tableholydatasum.ordernoColumn] = global::System.Convert.DBNull; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool IsiwoldayNull() { + public bool IsiwoldayNull() + { return this.IsNull(this.tableholydatasum.iwoldayColumn); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public void SetiwoldayNull() { + public void SetiwoldayNull() + { this[this.tableholydatasum.iwoldayColumn] = global::System.Convert.DBNull; } } - + /// ///Row event argument class /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public class holydataRowChangeEvent : global::System.EventArgs { - + public class holydataRowChangeEvent : global::System.EventArgs + { + private holydataRow eventRow; - + private global::System.Data.DataRowAction eventAction; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataRowChangeEvent(holydataRow row, global::System.Data.DataRowAction action) { + public holydataRowChangeEvent(holydataRow row, global::System.Data.DataRowAction action) + { this.eventRow = row; this.eventAction = action; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataRow Row { - get { + public holydataRow Row + { + get + { return this.eventRow; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataRowAction Action { - get { + public global::System.Data.DataRowAction Action + { + get + { return this.eventAction; } } } - + /// ///Row event argument class /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public class Holydata_DayRowChangeEvent : global::System.EventArgs { - + public class Holydata_DayRowChangeEvent : global::System.EventArgs + { + private Holydata_DayRow eventRow; - + private global::System.Data.DataRowAction eventAction; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRowChangeEvent(Holydata_DayRow row, global::System.Data.DataRowAction action) { + public Holydata_DayRowChangeEvent(Holydata_DayRow row, global::System.Data.DataRowAction action) + { this.eventRow = row; this.eventAction = action; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayRow Row { - get { + public Holydata_DayRow Row + { + get + { return this.eventRow; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataRowAction Action { - get { + public global::System.Data.DataRowAction Action + { + get + { return this.eventAction; } } } - + /// ///Row event argument class /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public class Holydata_TimeRowChangeEvent : global::System.EventArgs { - + public class Holydata_TimeRowChangeEvent : global::System.EventArgs + { + private Holydata_TimeRow eventRow; - + private global::System.Data.DataRowAction eventAction; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeRowChangeEvent(Holydata_TimeRow row, global::System.Data.DataRowAction action) { + public Holydata_TimeRowChangeEvent(Holydata_TimeRow row, global::System.Data.DataRowAction action) + { this.eventRow = row; this.eventAction = action; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_TimeRow Row { - get { + public Holydata_TimeRow Row + { + get + { return this.eventRow; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataRowAction Action { - get { + public global::System.Data.DataRowAction Action + { + get + { return this.eventAction; } } } - + /// ///Row event argument class /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public class holydatasumRowChangeEvent : global::System.EventArgs { - - private holydatasumRow eventRow; - + public class Holydata_TimePMSRowChangeEvent : global::System.EventArgs + { + + private Holydata_TimePMSRow eventRow; + private global::System.Data.DataRowAction eventAction; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydatasumRowChangeEvent(holydatasumRow row, global::System.Data.DataRowAction action) { + public Holydata_TimePMSRowChangeEvent(Holydata_TimePMSRow row, global::System.Data.DataRowAction action) + { this.eventRow = row; this.eventAction = action; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydatasumRow Row { - get { + public Holydata_TimePMSRow Row + { + get + { return this.eventRow; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public global::System.Data.DataRowAction Action { - get { + public global::System.Data.DataRowAction Action + { + get + { + return this.eventAction; + } + } + } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public class holydatasumRowChangeEvent : global::System.EventArgs + { + + private holydatasumRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public holydatasumRowChangeEvent(holydatasumRow row, global::System.Data.DataRowAction action) + { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public holydatasumRow Row + { + get + { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataRowAction Action + { + get + { return this.eventAction; } } } } } -namespace FBS0000.dsReportTableAdapters { - - +namespace FBS0000.dsReportTableAdapters +{ + + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -3800,114 +5486,142 @@ namespace FBS0000.dsReportTableAdapters { [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public partial class holydataTableAdapter : global::System.ComponentModel.Component { - + public partial class holydataTableAdapter : global::System.ComponentModel.Component + { + private global::System.Data.SqlClient.SqlDataAdapter _adapter; - + private global::System.Data.SqlClient.SqlConnection _connection; - + private global::System.Data.SqlClient.SqlTransaction _transaction; - + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; - + private bool _clearBeforeFill; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public holydataTableAdapter() { + public holydataTableAdapter() + { this.ClearBeforeFill = true; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { - get { - if ((this._adapter == null)) { + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter + { + get + { + if ((this._adapter == null)) + { this.InitAdapter(); } return this._adapter; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlConnection Connection { - get { - if ((this._connection == null)) { + internal global::System.Data.SqlClient.SqlConnection Connection + { + get + { + if ((this._connection == null)) + { this.InitConnection(); } return this._connection; } - set { + set + { this._connection = value; - if ((this.Adapter.InsertCommand != null)) { + if ((this.Adapter.InsertCommand != null)) + { this.Adapter.InsertCommand.Connection = value; } - if ((this.Adapter.DeleteCommand != null)) { + if ((this.Adapter.DeleteCommand != null)) + { this.Adapter.DeleteCommand.Connection = value; } - if ((this.Adapter.UpdateCommand != null)) { + if ((this.Adapter.UpdateCommand != null)) + { this.Adapter.UpdateCommand.Connection = value; } - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - if ((this.CommandCollection[i] != null)) { + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { + if ((this.CommandCollection[i] != null)) + { ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; } } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlTransaction Transaction { - get { + internal global::System.Data.SqlClient.SqlTransaction Transaction + { + get + { return this._transaction; } - set { + set + { this._transaction = value; - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { this.CommandCollection[i].Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.DeleteCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) + { this.Adapter.DeleteCommand.Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.InsertCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) + { this.Adapter.InsertCommand.Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.UpdateCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) + { this.Adapter.UpdateCommand.Transaction = this._transaction; } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { - get { - if ((this._commandCollection == null)) { + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection + { + get + { + if ((this._commandCollection == null)) + { this.InitCommandCollection(); } return this._commandCollection; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool ClearBeforeFill { - get { + public bool ClearBeforeFill + { + get + { return this._clearBeforeFill; } - set { + set + { this._clearBeforeFill = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitAdapter() { + private void InitAdapter() + { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); tableMapping.SourceTable = "Table"; @@ -3926,17 +5640,19 @@ namespace FBS0000.dsReportTableAdapters { tableMapping.ColumnMappings.Add("iwol", "iwol"); this._adapter.TableMappings.Add(tableMapping); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitConnection() { + private void InitConnection() + { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitCommandCollection() { + private void InitCommandCollection() + { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; @@ -3953,60 +5669,75 @@ ORDER BY Holyday.uid, CrDay"; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.holydataDataTable dataTable, string gcode, string sd, string ed) { + public virtual int Fill(dsReport.holydataDataTable dataTable, string gcode, string sd, string ed) + { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((gcode == null)) { + if ((gcode == null)) + { throw new global::System.ArgumentNullException("gcode"); } - else { + else + { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); } - if ((sd == null)) { + if ((sd == null)) + { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); } - if ((ed == null)) { + if ((ed == null)) + { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); } - if ((this.ClearBeforeFill == true)) { + if ((this.ClearBeforeFill == true)) + { dataTable.Clear(); } int returnValue = this.Adapter.Fill(dataTable); return returnValue; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.holydataDataTable GetData(string gcode, string sd, string ed) { + public virtual dsReport.holydataDataTable GetData(string gcode, string sd, string ed) + { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((gcode == null)) { + if ((gcode == null)) + { throw new global::System.ArgumentNullException("gcode"); } - else { + else + { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); } - if ((sd == null)) { + if ((sd == null)) + { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); } - if ((ed == null)) { + if ((ed == null)) + { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); } dsReport.holydataDataTable dataTable = new dsReport.holydataDataTable(); @@ -4014,7 +5745,7 @@ ORDER BY Holyday.uid, CrDay"; return dataTable; } } - + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -4024,114 +5755,142 @@ ORDER BY Holyday.uid, CrDay"; [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public partial class Holydata_DayTableAdapter : global::System.ComponentModel.Component { - + public partial class Holydata_DayTableAdapter : global::System.ComponentModel.Component + { + private global::System.Data.SqlClient.SqlDataAdapter _adapter; - + private global::System.Data.SqlClient.SqlConnection _connection; - + private global::System.Data.SqlClient.SqlTransaction _transaction; - + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; - + private bool _clearBeforeFill; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_DayTableAdapter() { + public Holydata_DayTableAdapter() + { this.ClearBeforeFill = true; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { - get { - if ((this._adapter == null)) { + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter + { + get + { + if ((this._adapter == null)) + { this.InitAdapter(); } return this._adapter; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlConnection Connection { - get { - if ((this._connection == null)) { + internal global::System.Data.SqlClient.SqlConnection Connection + { + get + { + if ((this._connection == null)) + { this.InitConnection(); } return this._connection; } - set { + set + { this._connection = value; - if ((this.Adapter.InsertCommand != null)) { + if ((this.Adapter.InsertCommand != null)) + { this.Adapter.InsertCommand.Connection = value; } - if ((this.Adapter.DeleteCommand != null)) { + if ((this.Adapter.DeleteCommand != null)) + { this.Adapter.DeleteCommand.Connection = value; } - if ((this.Adapter.UpdateCommand != null)) { + if ((this.Adapter.UpdateCommand != null)) + { this.Adapter.UpdateCommand.Connection = value; } - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - if ((this.CommandCollection[i] != null)) { + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { + if ((this.CommandCollection[i] != null)) + { ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; } } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlTransaction Transaction { - get { + internal global::System.Data.SqlClient.SqlTransaction Transaction + { + get + { return this._transaction; } - set { + set + { this._transaction = value; - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { this.CommandCollection[i].Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.DeleteCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) + { this.Adapter.DeleteCommand.Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.InsertCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) + { this.Adapter.InsertCommand.Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.UpdateCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) + { this.Adapter.UpdateCommand.Transaction = this._transaction; } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { - get { - if ((this._commandCollection == null)) { + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection + { + get + { + if ((this._commandCollection == null)) + { this.InitCommandCollection(); } return this._commandCollection; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool ClearBeforeFill { - get { + public bool ClearBeforeFill + { + get + { return this._clearBeforeFill; } - set { + set + { this._clearBeforeFill = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitAdapter() { + private void InitAdapter() + { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); tableMapping.SourceTable = "Table"; @@ -4188,17 +5947,19 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Cr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitConnection() { + private void InitConnection() + { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitCommandCollection() { + private void InitCommandCollection() + { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; @@ -4207,7 +5968,8 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON Holyday.uid = Users.id -WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) = 0) +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) = 0) AND + (EETGW_GroupUser.useUserState = 1) ORDER BY Holyday.sdate, Holyday.idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4215,135 +5977,165 @@ ORDER BY Holyday.sdate, Holyday.idx"; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.Holydata_DayDataTable dataTable, string gcode, string uid, string sd, string ed) { + public virtual int Fill(dsReport.Holydata_DayDataTable dataTable, string gcode, string uid, string sd, string ed) + { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((gcode == null)) { + if ((gcode == null)) + { throw new global::System.ArgumentNullException("gcode"); } - else { + else + { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); } - if ((uid == null)) { + if ((uid == null)) + { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(uid)); } - if ((sd == null)) { + if ((sd == null)) + { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(sd)); } - if ((ed == null)) { + if ((ed == null)) + { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed)); } - if ((this.ClearBeforeFill == true)) { + if ((this.ClearBeforeFill == true)) + { dataTable.Clear(); } int returnValue = this.Adapter.Fill(dataTable); return returnValue; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.Holydata_DayDataTable GetData(string gcode, string uid, string sd, string ed) { + public virtual dsReport.Holydata_DayDataTable GetData(string gcode, string uid, string sd, string ed) + { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((gcode == null)) { + if ((gcode == null)) + { throw new global::System.ArgumentNullException("gcode"); } - else { + else + { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); } - if ((uid == null)) { + if ((uid == null)) + { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(uid)); } - if ((sd == null)) { + if ((sd == null)) + { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(sd)); } - if ((ed == null)) { + if ((ed == null)) + { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed)); } dsReport.Holydata_DayDataTable dataTable = new dsReport.Holydata_DayDataTable(true); this.Adapter.Fill(dataTable); return dataTable; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(dsReport.Holydata_DayDataTable dataTable) { + public virtual int Update(dsReport.Holydata_DayDataTable dataTable) + { return this.Adapter.Update(dataTable); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(dsReport dataSet) { + public virtual int Update(dsReport dataSet) + { return this.Adapter.Update(dataSet, "Holydata_Day"); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow dataRow) { + public virtual int Update(global::System.Data.DataRow dataRow) + { return this.Adapter.Update(new global::System.Data.DataRow[] { dataRow}); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { + public virtual int Update(global::System.Data.DataRow[] dataRows) + { return this.Adapter.Update(dataRows); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, global::System.Nullable Original_sdate, string Original_uid, string Original_cate, double Original_Dr, double Original_Cr) { + public virtual int Delete(int Original_idx, global::System.Nullable Original_sdate, string Original_uid, string Original_cate, double Original_Dr, double Original_Cr) + { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); - if ((Original_sdate.HasValue == true)) { + if ((Original_sdate.HasValue == true)) + { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[2].Value = ((System.DateTime)(Original_sdate.Value)); } - else { + else + { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((Original_uid == null)) { + if ((Original_uid == null)) + { this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_uid)); } - if ((Original_cate == null)) { + if ((Original_cate == null)) + { this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_cate)); } @@ -4352,74 +6144,93 @@ ORDER BY Holyday.sdate, Holyday.idx"; this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[10].Value = ((double)(Original_Cr)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { + if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) + { this.Adapter.DeleteCommand.Connection.Open(); } - try { + try + { int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); return returnValue; } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + finally + { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) + { this.Adapter.DeleteCommand.Connection.Close(); } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(global::System.Nullable sdate, string uid, string cate, double Dr, double Cr, string contents, int Original_idx, global::System.Nullable Original_sdate, string Original_uid, string Original_cate, double Original_Dr, double Original_Cr, int idx) { - if ((sdate.HasValue == true)) { + public virtual int Update(global::System.Nullable sdate, string uid, string cate, double Dr, double Cr, string contents, int Original_idx, global::System.Nullable Original_sdate, string Original_uid, string Original_cate, double Original_Dr, double Original_Cr, int idx) + { + if ((sdate.HasValue == true)) + { this.Adapter.UpdateCommand.Parameters[0].Value = ((System.DateTime)(sdate.Value)); } - else { + else + { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; } - if ((uid == null)) { + if ((uid == null)) + { this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(uid)); } - if ((cate == null)) { + if ((cate == null)) + { this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(cate)); } this.Adapter.UpdateCommand.Parameters[3].Value = ((double)(Dr)); this.Adapter.UpdateCommand.Parameters[4].Value = ((double)(Cr)); - if ((contents == null)) { + if ((contents == null)) + { this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(contents)); } this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_idx)); - if ((Original_sdate.HasValue == true)) { + if ((Original_sdate.HasValue == true)) + { this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0)); this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(Original_sdate.Value)); } - else { + else + { this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; } - if ((Original_uid == null)) { + if ((Original_uid == null)) + { this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_uid)); } - if ((Original_cate == null)) { + if ((Original_cate == null)) + { this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_cate)); } @@ -4429,30 +6240,35 @@ ORDER BY Holyday.sdate, Holyday.idx"; this.Adapter.UpdateCommand.Parameters[16].Value = ((double)(Original_Cr)); this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; - if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { + if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) + { this.Adapter.UpdateCommand.Connection.Open(); } - try { + try + { int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); return returnValue; } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + finally + { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) + { this.Adapter.UpdateCommand.Connection.Close(); } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(global::System.Nullable sdate, string uid, string cate, double Dr, double Cr, string contents, int Original_idx, global::System.Nullable Original_sdate, string Original_uid, string Original_cate, double Original_Dr, double Original_Cr) { + public virtual int Update(global::System.Nullable sdate, string uid, string cate, double Dr, double Cr, string contents, int Original_idx, global::System.Nullable Original_sdate, string Original_uid, string Original_cate, double Original_Dr, double Original_Cr) + { return this.Update(sdate, uid, cate, Dr, Cr, contents, Original_idx, Original_sdate, Original_uid, Original_cate, Original_Dr, Original_Cr, Original_idx); } } - + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -4462,114 +6278,142 @@ ORDER BY Holyday.sdate, Holyday.idx"; [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public partial class Holydata_timee_adapter : global::System.ComponentModel.Component { - + public partial class Holydata_timee_adapter : global::System.ComponentModel.Component + { + private global::System.Data.SqlClient.SqlDataAdapter _adapter; - + private global::System.Data.SqlClient.SqlConnection _connection; - + private global::System.Data.SqlClient.SqlTransaction _transaction; - + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; - + private bool _clearBeforeFill; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public Holydata_timee_adapter() { + public Holydata_timee_adapter() + { this.ClearBeforeFill = true; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { - get { - if ((this._adapter == null)) { + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter + { + get + { + if ((this._adapter == null)) + { this.InitAdapter(); } return this._adapter; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlConnection Connection { - get { - if ((this._connection == null)) { + internal global::System.Data.SqlClient.SqlConnection Connection + { + get + { + if ((this._connection == null)) + { this.InitConnection(); } return this._connection; } - set { + set + { this._connection = value; - if ((this.Adapter.InsertCommand != null)) { + if ((this.Adapter.InsertCommand != null)) + { this.Adapter.InsertCommand.Connection = value; } - if ((this.Adapter.DeleteCommand != null)) { + if ((this.Adapter.DeleteCommand != null)) + { this.Adapter.DeleteCommand.Connection = value; } - if ((this.Adapter.UpdateCommand != null)) { + if ((this.Adapter.UpdateCommand != null)) + { this.Adapter.UpdateCommand.Connection = value; } - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { - if ((this.CommandCollection[i] != null)) { + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { + if ((this.CommandCollection[i] != null)) + { ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; } } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal global::System.Data.SqlClient.SqlTransaction Transaction { - get { + internal global::System.Data.SqlClient.SqlTransaction Transaction + { + get + { return this._transaction; } - set { + set + { this._transaction = value; - for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { this.CommandCollection[i].Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.DeleteCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) + { this.Adapter.DeleteCommand.Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.InsertCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) + { this.Adapter.InsertCommand.Transaction = this._transaction; } - if (((this.Adapter != null) - && (this.Adapter.UpdateCommand != null))) { + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) + { this.Adapter.UpdateCommand.Transaction = this._transaction; } } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { - get { - if ((this._commandCollection == null)) { + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection + { + get + { + if ((this._commandCollection == null)) + { this.InitCommandCollection(); } return this._commandCollection; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool ClearBeforeFill { - get { + public bool ClearBeforeFill + { + get + { return this._clearBeforeFill; } - set { + set + { this._clearBeforeFill = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitAdapter() { + private void InitAdapter() + { this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); tableMapping.SourceTable = "Table"; @@ -4588,17 +6432,19 @@ ORDER BY Holyday.sdate, Holyday.idx"; tableMapping.ColumnMappings.Add("iwol", "iwol"); this._adapter.TableMappings.Add(tableMapping); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitConnection() { + private void InitConnection() + { this._connection = new global::System.Data.SqlClient.SqlConnection(); this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private void InitCommandCollection() { + private void InitCommandCollection() + { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; @@ -4607,7 +6453,8 @@ ORDER BY Holyday.sdate, Holyday.idx"; FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users WITH (NOLOCK) ON Holyday.uid = Users.id -WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) <> 0) +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) <> 0) AND + (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate <> 'PMS') ORDER BY Holyday.sdate, Holyday.idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4615,72 +6462,91 @@ ORDER BY Holyday.sdate, Holyday.idx"; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.Holydata_TimeDataTable dataTable, string gcode, string uid, string sd, string ed) { + public virtual int Fill(dsReport.Holydata_TimeDataTable dataTable, string gcode, string uid, string sd, string ed) + { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((gcode == null)) { + if ((gcode == null)) + { throw new global::System.ArgumentNullException("gcode"); } - else { + else + { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); } - if ((uid == null)) { + if ((uid == null)) + { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(uid)); } - if ((sd == null)) { + if ((sd == null)) + { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(sd)); } - if ((ed == null)) { + if ((ed == null)) + { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed)); } - if ((this.ClearBeforeFill == true)) { + if ((this.ClearBeforeFill == true)) + { dataTable.Clear(); } int returnValue = this.Adapter.Fill(dataTable); return returnValue; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.Holydata_TimeDataTable GetData(string gcode, string uid, string sd, string ed) { + public virtual dsReport.Holydata_TimeDataTable GetData(string gcode, string uid, string sd, string ed) + { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((gcode == null)) { + if ((gcode == null)) + { throw new global::System.ArgumentNullException("gcode"); } - else { + else + { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); } - if ((uid == null)) { + if ((uid == null)) + { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(uid)); } - if ((sd == null)) { + if ((sd == null)) + { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(sd)); } - if ((ed == null)) { + if ((ed == null)) + { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - else { + else + { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed)); } dsReport.Holydata_TimeDataTable dataTable = new dsReport.Holydata_TimeDataTable(); @@ -4688,7 +6554,293 @@ ORDER BY Holyday.sdate, Holyday.idx"; return dataTable; } } - + + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class Holydata_TimePMSTableAdapter : global::System.ComponentModel.Component + { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public Holydata_TimePMSTableAdapter() + { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter + { + get + { + if ((this._adapter == null)) + { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection + { + get + { + if ((this._connection == null)) + { + this.InitConnection(); + } + return this._connection; + } + set + { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) + { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) + { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) + { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { + if ((this.CommandCollection[i] != null)) + { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction + { + get + { + return this._transaction; + } + set + { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) + { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) + { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) + { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) + { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection + { + get + { + if ((this._commandCollection == null)) + { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool ClearBeforeFill + { + get + { + return this._clearBeforeFill; + } + set + { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitAdapter() + { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "Holydata_TimePMS"; + tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("idx", "idx"); + tableMapping.ColumnMappings.Add("sdate", "sdate"); + tableMapping.ColumnMappings.Add("uid", "uid"); + tableMapping.ColumnMappings.Add("cate", "cate"); + tableMapping.ColumnMappings.Add("jun", "jun"); + tableMapping.ColumnMappings.Add("Dr", "Dr"); + tableMapping.ColumnMappings.Add("Cr", "Cr"); + tableMapping.ColumnMappings.Add("contents", "contents"); + tableMapping.ColumnMappings.Add("name", "name"); + tableMapping.ColumnMappings.Add("Process", "Process"); + tableMapping.ColumnMappings.Add("iwol", "iwol"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitConnection() + { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FBS0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() + { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = @"SELECT Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_TimePMS(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, + Holyday.DrTimePMS AS Dr, Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol +FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN + EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN + Users WITH (NOLOCK) ON Holyday.uid = Users.id +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate = 'PMS') AND + (ISNULL(Holyday.DrTimePMS, 0) + ISNULL(Holyday.CrTime, 0) <> 0) +ORDER BY Holyday.sdate, Holyday.idx"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(dsReport.Holydata_TimePMSDataTable dataTable, string gcode, string uid, string sd, string ed) + { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) + { + throw new global::System.ArgumentNullException("gcode"); + } + else + { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((uid == null)) + { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else + { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(uid)); + } + if ((sd == null)) + { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else + { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(sd)); + } + if ((ed == null)) + { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else + { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed)); + } + if ((this.ClearBeforeFill == true)) + { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual dsReport.Holydata_TimePMSDataTable GetData(string gcode, string uid, string sd, string ed) + { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) + { + throw new global::System.ArgumentNullException("gcode"); + } + else + { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((uid == null)) + { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else + { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(uid)); + } + if ((sd == null)) + { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else + { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(sd)); + } + if ((ed == null)) + { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else + { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed)); + } + dsReport.Holydata_TimePMSDataTable dataTable = new dsReport.Holydata_TimePMSDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -4697,195 +6849,235 @@ ORDER BY Holyday.sdate, Holyday.idx"; [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerDesigner, Microsoft.VSD" + "esigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapterManager")] - public partial class TableAdapterManager : global::System.ComponentModel.Component { - + public partial class TableAdapterManager : global::System.ComponentModel.Component + { + private UpdateOrderOption _updateOrder; - + private Holydata_DayTableAdapter _holydata_DayTableAdapter; - + private bool _backupDataSetBeforeUpdate; - + private global::System.Data.IDbConnection _connection; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public UpdateOrderOption UpdateOrder { - get { + public UpdateOrderOption UpdateOrder + { + get + { return this._updateOrder; } - set { + set + { this._updateOrder = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + "a", "System.Drawing.Design.UITypeEditor")] - public Holydata_DayTableAdapter Holydata_DayTableAdapter { - get { + public Holydata_DayTableAdapter Holydata_DayTableAdapter + { + get + { return this._holydata_DayTableAdapter; } - set { + set + { this._holydata_DayTableAdapter = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public bool BackupDataSetBeforeUpdate { - get { + public bool BackupDataSetBeforeUpdate + { + get + { return this._backupDataSetBeforeUpdate; } - set { + set + { this._backupDataSetBeforeUpdate = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] - public global::System.Data.IDbConnection Connection { - get { - if ((this._connection != null)) { + public global::System.Data.IDbConnection Connection + { + get + { + if ((this._connection != null)) + { return this._connection; } - if (((this._holydata_DayTableAdapter != null) - && (this._holydata_DayTableAdapter.Connection != null))) { + if (((this._holydata_DayTableAdapter != null) + && (this._holydata_DayTableAdapter.Connection != null))) + { return this._holydata_DayTableAdapter.Connection; } return null; } - set { + set + { this._connection = value; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] - public int TableAdapterInstanceCount { - get { + public int TableAdapterInstanceCount + { + get + { int count = 0; - if ((this._holydata_DayTableAdapter != null)) { + if ((this._holydata_DayTableAdapter != null)) + { count = (count + 1); } return count; } } - + /// ///Update rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private int UpdateUpdatedRows(dsReport dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { + private int UpdateUpdatedRows(dsReport dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) + { int result = 0; - if ((this._holydata_DayTableAdapter != null)) { + if ((this._holydata_DayTableAdapter != null)) + { global::System.Data.DataRow[] updatedRows = dataSet.Holydata_Day.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { + if (((updatedRows != null) + && (0 < updatedRows.Length))) + { result = (result + this._holydata_DayTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } return result; } - + /// ///Insert rows in top-down order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private int UpdateInsertedRows(dsReport dataSet, global::System.Collections.Generic.List allAddedRows) { + private int UpdateInsertedRows(dsReport dataSet, global::System.Collections.Generic.List allAddedRows) + { int result = 0; - if ((this._holydata_DayTableAdapter != null)) { + if ((this._holydata_DayTableAdapter != null)) + { global::System.Data.DataRow[] addedRows = dataSet.Holydata_Day.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { + if (((addedRows != null) + && (0 < addedRows.Length))) + { result = (result + this._holydata_DayTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } return result; } - + /// ///Delete rows in bottom-up order. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private int UpdateDeletedRows(dsReport dataSet, global::System.Collections.Generic.List allChangedRows) { + private int UpdateDeletedRows(dsReport dataSet, global::System.Collections.Generic.List allChangedRows) + { int result = 0; - if ((this._holydata_DayTableAdapter != null)) { + if ((this._holydata_DayTableAdapter != null)) + { global::System.Data.DataRow[] deletedRows = dataSet.Holydata_Day.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { + if (((deletedRows != null) + && (0 < deletedRows.Length))) + { result = (result + this._holydata_DayTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } return result; } - + /// ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List allAddedRows) { - if (((updatedRows == null) - || (updatedRows.Length < 1))) { + private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List allAddedRows) + { + if (((updatedRows == null) + || (updatedRows.Length < 1))) + { return updatedRows; } - if (((allAddedRows == null) - || (allAddedRows.Count < 1))) { + if (((allAddedRows == null) + || (allAddedRows.Count < 1))) + { return updatedRows; } global::System.Collections.Generic.List realUpdatedRows = new global::System.Collections.Generic.List(); - for (int i = 0; (i < updatedRows.Length); i = (i + 1)) { + for (int i = 0; (i < updatedRows.Length); i = (i + 1)) + { global::System.Data.DataRow row = updatedRows[i]; - if ((allAddedRows.Contains(row) == false)) { + if ((allAddedRows.Contains(row) == false)) + { realUpdatedRows.Add(row); } } return realUpdatedRows.ToArray(); } - + /// ///Update all changes to the dataset. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public virtual int UpdateAll(dsReport dataSet) { - if ((dataSet == null)) { + public virtual int UpdateAll(dsReport dataSet) + { + if ((dataSet == null)) + { throw new global::System.ArgumentNullException("dataSet"); } - if ((dataSet.HasChanges() == false)) { + if ((dataSet.HasChanges() == false)) + { return 0; } - if (((this._holydata_DayTableAdapter != null) - && (this.MatchTableAdapterConnection(this._holydata_DayTableAdapter.Connection) == false))) { + if (((this._holydata_DayTableAdapter != null) + && (this.MatchTableAdapterConnection(this._holydata_DayTableAdapter.Connection) == false))) + { throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); } global::System.Data.IDbConnection workConnection = this.Connection; - if ((workConnection == null)) { + if ((workConnection == null)) + { throw new global::System.ApplicationException("TableAdapterManager에 연결 정보가 없습니다. 각 TableAdapterManager TableAdapter 속성을 올바른 Tabl" + "eAdapter 인스턴스로 설정하십시오."); } bool workConnOpened = false; - if (((workConnection.State & global::System.Data.ConnectionState.Broken) - == global::System.Data.ConnectionState.Broken)) { + if (((workConnection.State & global::System.Data.ConnectionState.Broken) + == global::System.Data.ConnectionState.Broken)) + { workConnection.Close(); } - if ((workConnection.State == global::System.Data.ConnectionState.Closed)) { + if ((workConnection.State == global::System.Data.ConnectionState.Closed)) + { workConnection.Open(); workConnOpened = true; } global::System.Data.IDbTransaction workTransaction = workConnection.BeginTransaction(); - if ((workTransaction == null)) { + if ((workTransaction == null)) + { throw new global::System.ApplicationException("트랜잭션을 시작할 수 없습니다. 현재 데이터 연결에서 트랜잭션이 지원되지 않거나 현재 상태에서 트랜잭션을 시작할 수 없습니다."); } global::System.Collections.Generic.List allChangedRows = new global::System.Collections.Generic.List(); @@ -4894,18 +7086,22 @@ ORDER BY Holyday.sdate, Holyday.idx"; global::System.Collections.Generic.Dictionary revertConnections = new global::System.Collections.Generic.Dictionary(); int result = 0; global::System.Data.DataSet backupDataSet = null; - if (this.BackupDataSetBeforeUpdate) { + if (this.BackupDataSetBeforeUpdate) + { backupDataSet = new global::System.Data.DataSet(); backupDataSet.Merge(dataSet); } - try { + try + { // ---- Prepare for update ----------- // - if ((this._holydata_DayTableAdapter != null)) { + if ((this._holydata_DayTableAdapter != null)) + { revertConnections.Add(this._holydata_DayTableAdapter, this._holydata_DayTableAdapter.Connection); this._holydata_DayTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); this._holydata_DayTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._holydata_DayTableAdapter.Adapter.AcceptChangesDuringUpdate) { + if (this._holydata_DayTableAdapter.Adapter.AcceptChangesDuringUpdate) + { this._holydata_DayTableAdapter.Adapter.AcceptChangesDuringUpdate = false; adaptersWithAcceptChangesDuringUpdate.Add(this._holydata_DayTableAdapter.Adapter); } @@ -4913,11 +7109,13 @@ ORDER BY Holyday.sdate, Holyday.idx"; // //---- Perform updates ----------- // - if ((this.UpdateOrder == UpdateOrderOption.UpdateInsertDelete)) { + if ((this.UpdateOrder == UpdateOrderOption.UpdateInsertDelete)) + { result = (result + this.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows)); result = (result + this.UpdateInsertedRows(dataSet, allAddedRows)); } - else { + else + { result = (result + this.UpdateInsertedRows(dataSet, allAddedRows)); result = (result + this.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows)); } @@ -4926,36 +7124,45 @@ ORDER BY Holyday.sdate, Holyday.idx"; //---- Commit updates ----------- // workTransaction.Commit(); - if ((0 < allAddedRows.Count)) { + if ((0 < allAddedRows.Count)) + { global::System.Data.DataRow[] rows = new System.Data.DataRow[allAddedRows.Count]; allAddedRows.CopyTo(rows); - for (int i = 0; (i < rows.Length); i = (i + 1)) { + for (int i = 0; (i < rows.Length); i = (i + 1)) + { global::System.Data.DataRow row = rows[i]; row.AcceptChanges(); } } - if ((0 < allChangedRows.Count)) { + if ((0 < allChangedRows.Count)) + { global::System.Data.DataRow[] rows = new System.Data.DataRow[allChangedRows.Count]; allChangedRows.CopyTo(rows); - for (int i = 0; (i < rows.Length); i = (i + 1)) { + for (int i = 0; (i < rows.Length); i = (i + 1)) + { global::System.Data.DataRow row = rows[i]; row.AcceptChanges(); } } } - catch (global::System.Exception ex) { + catch (global::System.Exception ex) + { workTransaction.Rollback(); // ---- Restore the dataset ----------- - if (this.BackupDataSetBeforeUpdate) { + if (this.BackupDataSetBeforeUpdate) + { global::System.Diagnostics.Debug.Assert((backupDataSet != null)); dataSet.Clear(); dataSet.Merge(backupDataSet); } - else { - if ((0 < allAddedRows.Count)) { + else + { + if ((0 < allAddedRows.Count)) + { global::System.Data.DataRow[] rows = new System.Data.DataRow[allAddedRows.Count]; allAddedRows.CopyTo(rows); - for (int i = 0; (i < rows.Length); i = (i + 1)) { + for (int i = 0; (i < rows.Length); i = (i + 1)) + { global::System.Data.DataRow row = rows[i]; row.AcceptChanges(); row.SetAdded(); @@ -4964,18 +7171,23 @@ ORDER BY Holyday.sdate, Holyday.idx"; } throw ex; } - finally { - if (workConnOpened) { + finally + { + if (workConnOpened) + { workConnection.Close(); } - if ((this._holydata_DayTableAdapter != null)) { + if ((this._holydata_DayTableAdapter != null)) + { this._holydata_DayTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._holydata_DayTableAdapter])); this._holydata_DayTableAdapter.Transaction = null; } - if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { + if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) + { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); - for (int i = 0; (i < adapters.Length); i = (i + 1)) { + for (int i = 0; (i < adapters.Length); i = (i + 1)) + { global::System.Data.Common.DataAdapter adapter = adapters[i]; adapter.AcceptChangesDuringUpdate = true; } @@ -4983,65 +7195,76 @@ ORDER BY Holyday.sdate, Holyday.idx"; } return result; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) { + protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) + { global::System.Array.Sort(rows, new SelfReferenceComparer(relation, childFirst)); } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) { - if ((this._connection != null)) { + protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) + { + if ((this._connection != null)) + { return true; } - if (((this.Connection == null) - || (inputConnection == null))) { + if (((this.Connection == null) + || (inputConnection == null))) + { return true; } - if (string.Equals(this.Connection.ConnectionString, inputConnection.ConnectionString, global::System.StringComparison.Ordinal)) { + if (string.Equals(this.Connection.ConnectionString, inputConnection.ConnectionString, global::System.StringComparison.Ordinal)) + { return true; } return false; } - + /// ///Update Order Option /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public enum UpdateOrderOption { - + public enum UpdateOrderOption + { + InsertUpdateDelete = 0, - + UpdateInsertDelete = 1, } - + /// ///Used to sort self-referenced table's rows /// [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer { - + private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer + { + private global::System.Data.DataRelation _relation; - + private int _childFirst; - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) { + internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) + { this._relation = relation; - if (childFirst) { + if (childFirst) + { this._childFirst = -1; } - else { + else + { this._childFirst = 1; } } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) { + private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) + { global::System.Diagnostics.Debug.Assert((row != null)); global::System.Data.DataRow root = row; distance = 0; @@ -5051,23 +7274,26 @@ ORDER BY Holyday.sdate, Holyday.idx"; global::System.Data.DataRow parent = row.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default); for ( - ; ((parent != null) - && (traversedRows.ContainsKey(parent) == false)); - ) { + ; ((parent != null) + && (traversedRows.ContainsKey(parent) == false)); + ) + { distance = (distance + 1); root = parent; traversedRows[parent] = parent; parent = parent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default); } - if ((distance == 0)) { + if ((distance == 0)) + { traversedRows.Clear(); traversedRows[row] = row; parent = row.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original); for ( - ; ((parent != null) - && (traversedRows.ContainsKey(parent) == false)); - ) { + ; ((parent != null) + && (traversedRows.ContainsKey(parent) == false)); + ) + { distance = (distance + 1); root = parent; traversedRows[parent] = parent; @@ -5077,17 +7303,21 @@ ORDER BY Holyday.sdate, Holyday.idx"; return root; } - + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) { - if (object.ReferenceEquals(row1, row2)) { + public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) + { + if (object.ReferenceEquals(row1, row2)) + { return 0; } - if ((row1 == null)) { + if ((row1 == null)) + { return -1; } - if ((row2 == null)) { + if ((row2 == null)) + { return 1; } @@ -5097,16 +7327,20 @@ ORDER BY Holyday.sdate, Holyday.idx"; int distance2 = 0; global::System.Data.DataRow root2 = this.GetRoot(row2, out distance2); - if (object.ReferenceEquals(root1, root2)) { + if (object.ReferenceEquals(root1, root2)) + { return (this._childFirst * distance1.CompareTo(distance2)); } - else { - global::System.Diagnostics.Debug.Assert(((root1.Table != null) + else + { + global::System.Diagnostics.Debug.Assert(((root1.Table != null) && (root2.Table != null))); - if ((root1.Table.Rows.IndexOf(root1) < root2.Table.Rows.IndexOf(root2))) { + if ((root1.Table.Rows.IndexOf(root1) < root2.Table.Rows.IndexOf(root2))) + { return -1; } - else { + else + { return 1; } } diff --git a/SubProject/FBS0000/dsReport.xsd b/SubProject/FBS0000/dsReport.xsd index 3c9c478..2dfff23 100644 --- a/SubProject/FBS0000/dsReport.xsd +++ b/SubProject/FBS0000/dsReport.xsd @@ -139,7 +139,7 @@ FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users WITH (NOLOCK) ON Holyday.uid = Users.id WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) <> 0) AND - (EETGW_GroupUser.useUserState = 1) + (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate <> 'PMS') ORDER BY Holyday.sdate, Holyday.idx @@ -167,6 +167,45 @@ ORDER BY Holyday.sdate, Holyday.idx + + + + + + SELECT Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_TimePMS(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, + Holyday.DrTimePMS AS Dr, Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol +FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN + EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN + Users WITH (NOLOCK) ON Holyday.uid = Users.id +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate = 'PMS') AND + (ISNULL(Holyday.DrTimePMS, 0) + ISNULL(Holyday.CrTime, 0) <> 0) +ORDER BY Holyday.sdate, Holyday.idx + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,7 +383,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -355,6 +394,60 @@ ORDER BY Holyday.sdate, Holyday.idx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -370,5 +463,9 @@ ORDER BY Holyday.sdate, Holyday.idx + + + + \ No newline at end of file diff --git a/SubProject/FBS0000/dsReport.xss b/SubProject/FBS0000/dsReport.xss index ebca15d..4b4edca 100644 --- a/SubProject/FBS0000/dsReport.xss +++ b/SubProject/FBS0000/dsReport.xss @@ -6,10 +6,11 @@ --> - - - - + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/DSKuntae.Designer.cs b/SubProject/FPJ0000/DSKuntae.Designer.cs index f7428ec..9d400f5 100644 --- a/SubProject/FPJ0000/DSKuntae.Designer.cs +++ b/SubProject/FPJ0000/DSKuntae.Designer.cs @@ -628,7 +628,7 @@ namespace FPJ0000 { string HolyReason, string HolyBackup, string HolyLocation, - int HolyDays, + double HolyDays, double HolyTimes, bool sendmail, string stime, @@ -761,7 +761,7 @@ namespace FPJ0000 { base.Columns.Add(this.columnHolyBackup); this.columnHolyLocation = new global::System.Data.DataColumn("HolyLocation", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnHolyLocation); - this.columnHolyDays = new global::System.Data.DataColumn("HolyDays", typeof(int), null, global::System.Data.MappingType.Element); + this.columnHolyDays = new global::System.Data.DataColumn("HolyDays", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnHolyDays); this.columnHolyTimes = new global::System.Data.DataColumn("HolyTimes", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnHolyTimes); @@ -1232,13 +1232,13 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public int HolyDays { + public double HolyDays { get { if (this.IsHolyDaysNull()) { - return 0; + return 0D; } else { - return ((int)(this[this.tableEETGW_HolydayRequest.HolyDaysColumn])); + return ((double)(this[this.tableEETGW_HolydayRequest.HolyDaysColumn])); } } set { @@ -1818,7 +1818,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyReason", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyReason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyBackup", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyBackup", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyLocation", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyLocation", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1847,7 +1847,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyReason", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyReason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyBackup", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyBackup", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyLocation", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyLocation", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -2015,7 +2015,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; string HolyReason, string HolyBackup, string HolyLocation, - global::System.Nullable HolyDays, + global::System.Nullable HolyDays, global::System.Nullable HolyTimes, global::System.Nullable sendmail, string stime, @@ -2096,7 +2096,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; this.Adapter.InsertCommand.Parameters[12].Value = ((string)(HolyLocation)); } if ((HolyDays.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[13].Value = ((int)(HolyDays.Value)); + this.Adapter.InsertCommand.Parameters[13].Value = ((double)(HolyDays.Value)); } else { this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value; @@ -2171,7 +2171,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; string HolyReason, string HolyBackup, string HolyLocation, - global::System.Nullable HolyDays, + global::System.Nullable HolyDays, global::System.Nullable HolyTimes, global::System.Nullable sendmail, string stime, @@ -2254,7 +2254,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(HolyLocation)); } if ((HolyDays.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(HolyDays.Value)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((double)(HolyDays.Value)); } else { this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; diff --git a/SubProject/FPJ0000/DSKuntae.xsd b/SubProject/FPJ0000/DSKuntae.xsd index e0ec5dc..1400915 100644 --- a/SubProject/FPJ0000/DSKuntae.xsd +++ b/SubProject/FPJ0000/DSKuntae.xsd @@ -39,7 +39,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + @@ -89,7 +89,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + @@ -144,7 +144,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + @@ -187,14 +187,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + - + @@ -259,7 +259,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + @@ -276,14 +276,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + - + diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs index c4685ab..bf087c1 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs @@ -28,160 +28,186 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsReport = new FPJ0000.dsReport(); - this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter(); - this.dataGridView1 = new arCtl.arDatagridView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.button1 = new System.Windows.Forms.Button(); - this.tbProcess = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.btRefresh = new System.Windows.Forms.Button(); - this.tbSd = new System.Windows.Forms.TextBox(); - this.tbEd = new System.Windows.Forms.TextBox(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.panel1.SuspendLayout(); - this.SuspendLayout(); - // - // bs - // - this.bs.DataMember = "jobreport"; - this.bs.DataSource = this.dsReport; - // - // dsReport - // - this.dsReport.DataSetName = "dsReport"; - this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // dataGridView1 - // - this.dataGridView1.A_DelCurrentCell = true; - this.dataGridView1.A_EnterToTab = true; - this.dataGridView1.A_KoreanField = null; - this.dataGridView1.A_UpperField = null; - this.dataGridView1.A_ViewRownumOnHeader = true; - this.dataGridView1.AllowUserToAddRows = false; - this.dataGridView1.AllowUserToDeleteRows = false; - this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(0, 42); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.ReadOnly = true; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1348, 657); - this.dataGridView1.TabIndex = 2; - // - // panel1 - // - this.panel1.Controls.Add(this.tbEd); - this.panel1.Controls.Add(this.button1); - this.panel1.Controls.Add(this.tbProcess); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.linkLabel1); - this.panel1.Controls.Add(this.btRefresh); - this.panel1.Controls.Add(this.tbSd); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1348, 42); - this.panel1.TabIndex = 3; - // - // button1 - // - this.button1.Dock = System.Windows.Forms.DockStyle.Right; - this.button1.Location = new System.Drawing.Point(1193, 5); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 32); - this.button1.TabIndex = 8; - this.button1.Text = "내보내기"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // tbProcess - // - this.tbProcess.FormattingEnabled = true; - this.tbProcess.Location = new System.Drawing.Point(344, 10); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.Size = new System.Drawing.Size(158, 20); - this.tbProcess.TabIndex = 7; - this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(309, 15); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); - this.label1.TabIndex = 6; - this.label1.Text = "공정"; - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(13, 15); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(45, 12); - this.linkLabel1.TabIndex = 0; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "조회 년"; - // - // btRefresh - // - this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; - this.btRefresh.Location = new System.Drawing.Point(1268, 5); - this.btRefresh.Name = "btRefresh"; - this.btRefresh.Size = new System.Drawing.Size(75, 32); - this.btRefresh.TabIndex = 2; - this.btRefresh.Text = "새로고침"; - this.btRefresh.UseVisualStyleBackColor = true; - this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); - // - // tbSd - // - this.tbSd.Location = new System.Drawing.Point(66, 10); - this.tbSd.Name = "tbSd"; - this.tbSd.Size = new System.Drawing.Size(115, 21); - this.tbSd.TabIndex = 1; - this.tbSd.Text = "2020"; - this.tbSd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tbEd - // - this.tbEd.Location = new System.Drawing.Point(187, 10); - this.tbEd.Name = "tbEd"; - this.tbEd.Size = new System.Drawing.Size(115, 21); - this.tbEd.TabIndex = 9; - this.tbEd.Text = "2020"; - this.tbEd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // rJobReportOT - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1348, 699); - this.Controls.Add(this.dataGridView1); - this.Controls.Add(this.panel1); - this.Name = "rJobReportOT"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "휴일/연장근무 집계표"; - this.Load += new System.EventHandler(this.rJobReport_Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.ResumeLayout(false); + this.components = new System.ComponentModel.Container(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsReport = new FPJ0000.dsReport(); + this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter(); + this.dataGridView1 = new arCtl.arDatagridView(); + this.panel1 = new System.Windows.Forms.Panel(); + this.tbEd = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.tbProcess = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.btRefresh = new System.Windows.Forms.Button(); + this.tbSd = new System.Windows.Forms.TextBox(); + this.radType = new System.Windows.Forms.RadioButton(); + this.radTypePMS = new System.Windows.Forms.RadioButton(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // bs + // + this.bs.DataMember = "jobreport"; + this.bs.DataSource = this.dsReport; + // + // dsReport + // + this.dsReport.DataSetName = "dsReport"; + this.dsReport.Namespace = "http://tempuri.org/dsReport.xsd"; + this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // dataGridView1 + // + this.dataGridView1.A_DelCurrentCell = true; + this.dataGridView1.A_EnterToTab = true; + this.dataGridView1.A_KoreanField = null; + this.dataGridView1.A_UpperField = null; + this.dataGridView1.A_ViewRownumOnHeader = true; + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dataGridView1.Location = new System.Drawing.Point(0, 42); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(1348, 657); + this.dataGridView1.TabIndex = 2; + // + // panel1 + // + this.panel1.Controls.Add(this.radTypePMS); + this.panel1.Controls.Add(this.radType); + this.panel1.Controls.Add(this.tbEd); + this.panel1.Controls.Add(this.button1); + this.panel1.Controls.Add(this.tbProcess); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.linkLabel1); + this.panel1.Controls.Add(this.btRefresh); + this.panel1.Controls.Add(this.tbSd); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(5); + this.panel1.Size = new System.Drawing.Size(1348, 42); + this.panel1.TabIndex = 3; + // + // tbEd + // + this.tbEd.Location = new System.Drawing.Point(187, 11); + this.tbEd.Name = "tbEd"; + this.tbEd.Size = new System.Drawing.Size(115, 21); + this.tbEd.TabIndex = 9; + this.tbEd.Text = "2020"; + this.tbEd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Right; + this.button1.Location = new System.Drawing.Point(1193, 5); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 32); + this.button1.TabIndex = 8; + this.button1.Text = "내보내기"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tbProcess + // + this.tbProcess.FormattingEnabled = true; + this.tbProcess.Location = new System.Drawing.Point(344, 11); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(158, 20); + this.tbProcess.TabIndex = 7; + this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(309, 15); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 6; + this.label1.Text = "공정"; + // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(13, 15); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(45, 12); + this.linkLabel1.TabIndex = 0; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "조회 년"; + // + // btRefresh + // + this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; + this.btRefresh.Location = new System.Drawing.Point(1268, 5); + this.btRefresh.Name = "btRefresh"; + this.btRefresh.Size = new System.Drawing.Size(75, 32); + this.btRefresh.TabIndex = 2; + this.btRefresh.Text = "새로고침"; + this.btRefresh.UseVisualStyleBackColor = true; + this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); + // + // tbSd + // + this.tbSd.Location = new System.Drawing.Point(66, 11); + this.tbSd.Name = "tbSd"; + this.tbSd.Size = new System.Drawing.Size(115, 21); + this.tbSd.TabIndex = 1; + this.tbSd.Text = "2020"; + this.tbSd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // radType + // + this.radType.AutoSize = true; + this.radType.Checked = true; + this.radType.Location = new System.Drawing.Point(528, 13); + this.radType.Name = "radType"; + this.radType.Size = new System.Drawing.Size(47, 16); + this.radType.TabIndex = 10; + this.radType.TabStop = true; + this.radType.Text = "대체"; + this.radType.UseVisualStyleBackColor = true; + // + // radTypePMS + // + this.radTypePMS.AutoSize = true; + this.radTypePMS.Location = new System.Drawing.Point(584, 13); + this.radTypePMS.Name = "radTypePMS"; + this.radTypePMS.Size = new System.Drawing.Size(50, 16); + this.radTypePMS.TabIndex = 11; + this.radTypePMS.Text = "PMS"; + this.radTypePMS.UseVisualStyleBackColor = true; + // + // rJobReportOT + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1348, 699); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.panel1); + this.Name = "rJobReportOT"; + this.Text = "휴일/연장근무 집계표"; + this.Load += new System.EventHandler(this.rJobReport_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); } @@ -198,5 +224,7 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Button button1; private System.Windows.Forms.TextBox tbEd; - } + private System.Windows.Forms.RadioButton radTypePMS; + private System.Windows.Forms.RadioButton radType; + } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.cs b/SubProject/FPJ0000/JobReport_/rJobReportOT.cs index 22fed47..abbad64 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.cs @@ -10,216 +10,230 @@ using System.Windows.Forms; namespace FPJ0000.JobReport_ { - public partial class rJobReportOT : fBase - { - public rJobReportOT() - { - InitializeComponent(); - //this.WindowState = FormWindowState.Maximized; - } + public partial class rJobReportOT : fBase + { + public rJobReportOT() + { + InitializeComponent(); + //this.WindowState = FormWindowState.Maximized; + } - private void rJobReport_Load(object sender, EventArgs e) + private void rJobReport_Load(object sender, EventArgs e) { EnsureVisibleAndUsableSize(); this.tbProcess.Items.Clear(); - tbProcess.Items.Add("전체"); - //var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); - var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode); + tbProcess.Items.Add("전체"); + //var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); + var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode); foreach (var dr in dtProcessList) - tbProcess.Items.Add(dr); + tbProcess.Items.Add(dr); - //this.tbProcess.Text = FCOMMON.info.Login.process; - if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; + //this.tbProcess.Text = FCOMMON.info.Login.process; + if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; - this.tbSd.Text = DateTime.Now.Year.ToString() + "-01"; - this.tbEd.Text = DateTime.Now.Year.ToString() + "-12"; - this.Show(); - Application.DoEvents(); + this.tbSd.Text = DateTime.Now.Year.ToString() + "-01"; + this.tbEd.Text = DateTime.Now.Year.ToString() + "-12"; + this.Show(); + Application.DoEvents(); - refrehData(); - } + refrehData(); + } - void refrehData() - { - ////휴일데이터가 들어가 있음. - //var taH = new dsReportTableAdapters.HolidayLIstTableAdapter(); - //taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%"); + void refrehData() + { + ////휴일데이터가 들어가 있음. + //var taH = new dsReportTableAdapters.HolidayLIstTableAdapter(); + //taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%"); - string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); - this.ta.FillByOt2(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text); + string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); + if (radType.Checked) + this.ta.FillByOt2(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text); + else + + this.ta.FillByOtPMS(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text); - //그리드뷰 생성 - this.dataGridView1.AllowUserToAddRows = false; - this.dataGridView1.AllowUserToDeleteRows = false; - this.dataGridView1.Rows.Clear(); - this.dataGridView1.Columns.Clear(); - this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; - this.dataGridView1.ColumnHeadersHeight = 35; - this.dataGridView1.Columns.Add("공정", "공정"); - this.dataGridView1.Columns.Add("이름", "이름"); - this.dataGridView1.Columns.Add("사번", "사번"); + //그리드뷰 생성 + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + this.dataGridView1.Rows.Clear(); + this.dataGridView1.Columns.Clear(); + this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + this.dataGridView1.ColumnHeadersHeight = 35; + this.dataGridView1.Columns.Add("공정", "공정"); + this.dataGridView1.Columns.Add("이름", "이름"); + this.dataGridView1.Columns.Add("사번", "사번"); + + var otTitle = radType.Checked ? "연장" : "PMS"; + + //이름/년도데이터추가 + var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm); + foreach (var ym in ymlist) + { + var drYm = ym.FirstOrDefault(); + var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", "")); + this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\n휴일");// + "\r\n(" + basehr.ToString() + ")"); + this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n{otTitle}"); + this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].Tag = basehr; + this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].Tag = basehr; + this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].DefaultCellStyle.Format = "N1"; + this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].DefaultCellStyle.Format = "N1"; + } + this.dataGridView1.Columns.Add("subtotal", "합계\n휴일"); + this.dataGridView1.Columns.Add($"subtotal", $"합계\n{otTitle}"); + + //이름으로 정렬해서 데이터를 가져온다 + var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname); + foreach (var uname in namelist) + { + var drName = uname.FirstOrDefault(); + + List rowdata = new List(); + rowdata.Add(drName.UserProcess); + rowdata.Add(drName.uname); + rowdata.Add(drName.uid); - //이름/년도데이터추가 - var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm); - foreach (var ym in ymlist) - { - var drYm = ym.FirstOrDefault(); - var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", "")); - this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\n휴일");// + "\r\n(" + basehr.ToString() + ")"); - this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n연장"); - this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].Tag = basehr; - this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].Tag = basehr; - } - this.dataGridView1.Columns.Add("subtotal", "합계\n휴일"); - this.dataGridView1.Columns.Add("subtotal", "합계\n연장"); - //이름으로 정렬해서 데이터를 가져온다 - var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname); - foreach (var uname in namelist) - { - var drName = uname.FirstOrDefault(); + double User_sumhl = 0; + double User_sumot = 0; - List rowdata = new List(); - rowdata.Add(drName.UserProcess); - rowdata.Add(drName.uname); - rowdata.Add(drName.uid); + List high = new List(); + List low = new List(); + for (int i = 3; i < this.dataGridView1.ColumnCount; i += 2) + { + var col = dataGridView1.Columns[i]; + var coltitle = col.HeaderText; + if (col.Tag == null) continue; + var basehr = int.Parse(col.Tag.ToString()); - if (drName.uid.Equals("221597")) - { + var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == col.Name); + if (userDatas == null || userDatas.Count() == 0) + { + //이달에는 데이터가없다 + rowdata.Add(null); //휴일 + rowdata.Add(null); //연장 + high.Add(false); + low.Add(false); + } + else + { + ////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다. + //var sumhr = 0f; + //var sumot = 0f; + //var sumholy = 0f; + //foreach(dsReport.jobReportRow item in userDatas) + //{ + // dsReport.HolidayLIst.Where(t => t.pdate == item.yymm); + //} - } + var sumhr = userDatas.Sum(t => t.hrs); + double sumot = 0.0; + double sumhl = 0.0; + if (radType.Checked) + { + sumot = userDatas.Sum(t => t.ot2); + sumhl = userDatas.Sum(t => t.holyot2); + } + else + { + sumot = userDatas.Sum(t => t.otPMS); + sumhl = userDatas.Sum(t => t.holyotPMS); + } - double User_sumhl = 0; - double User_sumot = 0; + User_sumhl += sumhl; + User_sumot += sumot; - List high = new List(); - List low = new List(); - for (int i = 3; i < this.dataGridView1.ColumnCount; i += 2) - { - var col = dataGridView1.Columns[i]; - var coltitle = col.HeaderText; - if (col.Tag == null) continue; - var basehr = int.Parse(col.Tag.ToString()); + if (sumhl == 0.0) rowdata.Add(null); + else rowdata.Add($"{Math.Round(sumhl,1)}"); - var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == col.Name); - if (userDatas == null || userDatas.Count() == 0) - { - //이달에는 데이터가없다 - rowdata.Add(null); //휴일 - rowdata.Add(null); //연장 - high.Add(false); - low.Add(false); - } - else - { - ////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다. - //var sumhr = 0f; - //var sumot = 0f; - //var sumholy = 0f; - //foreach(dsReport.jobReportRow item in userDatas) - //{ - // dsReport.HolidayLIst.Where(t => t.pdate == item.yymm); - //} + if (sumot == 0.0) rowdata.Add(null); + else rowdata.Add($"{Math.Round(sumot,1)}"); - var sumhr = userDatas.Sum(t => t.hrs); - var sumot = userDatas.Sum(t => t.ot2); - var sumhl = userDatas.Sum(t => t.holyot2); + if (sumhr > basehr) high.Add(true); + else high.Add(false); - User_sumhl += sumhl; - User_sumot += sumot; - - if (sumhl == 0.0) rowdata.Add(null); - else rowdata.Add($"{sumhl}"); - - if (sumot == 0.0) rowdata.Add(null); - else rowdata.Add($"{sumot}"); - - if (sumhr > basehr) high.Add(true); - else high.Add(false); - - if (sumhr < basehr) low.Add(true); - else low.Add(false); - } - } + if (sumhr < basehr) low.Add(true); + else low.Add(false); + } + } - rowdata.Add($"{User_sumhl}"); //합게 - rowdata.Add($"{User_sumot}"); //합게 - dataGridView1.Rows.Add(rowdata.ToArray()); + rowdata.Add($"{Math.Round(User_sumhl,1)}"); //합게 + rowdata.Add($"{Math.Round(User_sumot,1)}"); //합게 + dataGridView1.Rows.Add(rowdata.ToArray()); - //이번에 추가한 줄의 셀 컬러를 지정한다 - var currentrow = dataGridView1.Rows.Count - 1; - for (int i = 0; i < this.dataGridView1.ColumnCount; i++) - { - var col = this.dataGridView1.Columns[i]; - if (col.Tag == null) - { - dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; - dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.WhiteSmoke; - continue; - } - else - { - if (col.HeaderText.Contains("연장")) - dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.Linen;// 155,82,93); - else - dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.White; - } + //이번에 추가한 줄의 셀 컬러를 지정한다 + var currentrow = dataGridView1.Rows.Count - 1; + for (int i = 0; i < this.dataGridView1.ColumnCount; i++) + { + var col = this.dataGridView1.Columns[i]; + if (col.Tag == null) + { + dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; + dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.WhiteSmoke; + continue; + } + else + { + if (col.HeaderText.Contains(otTitle)) + dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.Linen;// 155,82,93); + else + dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.White; + } - var idx = i - 2; - if (idx < high.Count) - { - if (high[idx]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red; - else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue; - else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; - } - else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; - } - } + var idx = i - 2; + if (idx < high.Count) + { + if (high[idx]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red; + else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue; + else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; + } + else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black; + } + } - //총계추가 + //총계추가 - List rowdata2 = new List(); - rowdata2.Add("합계"); - rowdata2.Add(dataGridView1.Rows.Count); - rowdata2.Add(null); - for (int i = 0; i < this.dataGridView1.ColumnCount; i++) - { - var col = this.dataGridView1.Columns[i]; - if (col.Tag == null && col.HeaderText.StartsWith("합계") == false) continue; + List rowdata2 = new List(); + rowdata2.Add("합계"); + rowdata2.Add(dataGridView1.Rows.Count); + rowdata2.Add(null); + for (int i = 0; i < this.dataGridView1.ColumnCount; i++) + { + var col = this.dataGridView1.Columns[i]; + if (col.Tag == null && col.HeaderText.StartsWith("합계") == false) continue; - var sum = 0.0; - for (int r = 0; r < this.dataGridView1.RowCount; r++) - { - var cell = dataGridView1.Rows[r].Cells[i]; - if (cell.Value != null) sum += double.Parse(cell.Value.ToString()); - } - if (sum != 0.0) rowdata2.Add(sum); - else rowdata2.Add(null); - } - dataGridView1.Rows.Add(rowdata2.ToArray()); - dataGridView1.Rows[dataGridView1.Rows.Count - 1].DefaultCellStyle.BackColor = Color.LightGray; + var sum = 0.0; + for (int r = 0; r < this.dataGridView1.RowCount; r++) + { + var cell = dataGridView1.Rows[r].Cells[i]; + if (cell.Value != null) sum += double.Parse(cell.Value.ToString()); + } + if (sum != 0.0) rowdata2.Add(sum); + else rowdata2.Add(null); + } + dataGridView1.Rows.Add(rowdata2.ToArray()); + dataGridView1.Rows[dataGridView1.Rows.Count - 1].DefaultCellStyle.BackColor = Color.LightGray; - this.dataGridView1.AutoResizeColumns(); + this.dataGridView1.AutoResizeColumns(); - } + } - private void btRefresh_Click(object sender, EventArgs e) - { - refrehData(); - } + private void btRefresh_Click(object sender, EventArgs e) + { + refrehData(); + } - private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) - { - if (tbProcess.SelectedIndex >= 0) refrehData(); - } + private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) + { + if (tbProcess.SelectedIndex >= 0) refrehData(); + } - private void button1_Click(object sender, EventArgs e) - { - dataGridView1.ExportData(string.Empty); - } - } + private void button1_Click(object sender, EventArgs e) + { + dataGridView1.ExportData(string.Empty); + } + } } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportOT.resx b/SubProject/FPJ0000/JobReport_/rJobReportOT.resx index 1693e4e..348d914 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportOT.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReportOT.resx @@ -1,17 +1,17 @@  - diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index e0b6fa2..b312d60 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -61,13 +61,13 @@ namespace FPJ0000.OtConfirm this.grpAdmin = new System.Windows.Forms.GroupBox(); this.chkSendMail = new System.Windows.Forms.CheckBox(); this.cmbPreset = new System.Windows.Forms.ComboBox(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSKuntae = new FPJ0000.DSKuntae(); this.rad2 = new System.Windows.Forms.RadioButton(); this.rad1 = new System.Windows.Forms.RadioButton(); this.rad0 = new System.Windows.Forms.RadioButton(); this.tbResponse = new System.Windows.Forms.RichTextBox(); this.button1 = new System.Windows.Forms.Button(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dSKuntae = new FPJ0000.DSKuntae(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); this.grpUser.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -264,6 +264,7 @@ namespace FPJ0000.OtConfirm this.tbTimes.Size = new System.Drawing.Size(130, 38); this.tbTimes.TabIndex = 3; this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbTimes.TextChanged += new System.EventHandler(this.tbTimes_TextChanged); // // cmbUser // @@ -425,6 +426,17 @@ namespace FPJ0000.OtConfirm this.cmbPreset.TabIndex = 6; this.cmbPreset.SelectedIndexChanged += new System.EventHandler(this.cmbPreset_SelectedIndexChanged); // + // bs + // + this.bs.DataMember = "EETGW_HolydayRequest"; + this.bs.DataSource = this.dSKuntae; + // + // dSKuntae + // + this.dSKuntae.DataSetName = "DSKuntae"; + this.dSKuntae.Namespace = "http://tempuri.org/DSKuntae.xsd"; + this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // rad2 // this.rad2.AutoSize = true; @@ -481,16 +493,6 @@ namespace FPJ0000.OtConfirm this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // - // bs - // - this.bs.DataMember = "EETGW_HolydayRequest"; - this.bs.DataSource = this.dSKuntae; - // - // dSKuntae - // - this.dSKuntae.DataSetName = "DSKuntae"; - this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // ta // this.ta.ClearBeforeFill = true; @@ -507,7 +509,6 @@ namespace FPJ0000.OtConfirm this.MinimizeBox = false; this.Name = "fHolyRequestAdd"; this.Padding = new System.Windows.Forms.Padding(3); - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "fHolyRequestAdd"; this.Load += new System.EventHandler(this.fHolyRequestAdd_Load); this.grpUser.ResumeLayout(false); diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 894fb52..04187ab 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -201,13 +201,13 @@ namespace FPJ0000.OtConfirm FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요"); return; } - var vDay = 0; + var vDay = 0f; var vTime = 0f; if (tbDays.Enabled == false) tbDays.Text = string.Empty; if (tbTimes.Enabled == false) tbTimes.Text = string.Empty; - if (double.TryParse(tbDays.Text, out double val_days)) vDay = int.Parse(tbDays.Text.Trim()); + if (double.TryParse(tbDays.Text, out double val_days)) vDay = float.Parse(tbDays.Text.Trim()); if (double.TryParse(tbTimes.Text, out double val_times)) vTime = float.Parse(tbTimes.Text.Trim()); //라디오버튼에 따른 시간 값 할당 @@ -223,7 +223,7 @@ namespace FPJ0000.OtConfirm return; } - if (vDay < 1 && vTime < 0.1 && curLevel < 5) + if (vDay < 0.1 && vTime < 0.1 && curLevel < 5) { var dlg = FCOMMON.Util.MsgQ("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요\n값을 입력하지 않고 계속할까요?"); if (dlg != DialogResult.Yes) return; @@ -577,5 +577,10 @@ namespace FPJ0000.OtConfirm { } + + private void tbTimes_TextChanged(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx index e995ea4..92a5226 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx @@ -1,17 +1,17 @@  - diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs index 1b8b195..f946c38 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs @@ -28,96 +28,98 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new FPJ0000.dsPRJ(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); - this.tbFind = new System.Windows.Forms.ToolStripTextBox(); - this.btFind = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.btConf = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.btConfAll = new System.Windows.Forms.ToolStripButton(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.lbStt = new System.Windows.Forms.ToolStripLabel(); - this.dtSD = new System.Windows.Forms.ToolStripTextBox(); - this.lbEnd = new System.Windows.Forms.ToolStripLabel(); - this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); - this.dtED = new System.Windows.Forms.ToolStripTextBox(); - this.lbTime = new System.Windows.Forms.ToolStripLabel(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); - this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); - this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.dv1 = new arCtl.arDatagridView(); - this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.WeekName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.FreeDay = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.usernameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.requestpartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.packageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.statusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ot2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.otReasonDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); - this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); - this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL = new FPJ0000.dsPRJ(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btFind = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btConf = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.btConfAll = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.dtSD = new System.Windows.Forms.ToolStripTextBox(); + this.lbEnd = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); + this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.lbTime = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); + this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.dv1 = new arCtl.arDatagridView(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.WeekName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.FreeDay = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.usernameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.requestpartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.packageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.statusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ot2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otPMS = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otReasonDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, this.bindingNavigatorSeparator, @@ -135,163 +137,165 @@ this.btConf, this.toolStripSeparator4, this.btConfAll}); - this.bn.Location = new System.Drawing.Point(0, 730); - this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.bn.Name = "bn"; - this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1364, 25); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bs - // - this.bs.DataMember = "JobReport"; - this.bs.DataSource = this.dsMSSQL; - this.bs.Sort = "pdate desc"; - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // toolStripLabel2 - // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel2.Text = "검색"; - // - // tbFind - // - this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Name = "tbFind"; - this.tbFind.Size = new System.Drawing.Size(100, 25); - this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); - // - // btFind - // - this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); - this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btFind.Name = "btFind"; - this.btFind.Size = new System.Drawing.Size(23, 22); - this.btFind.Text = "toolStripButton2"; - this.btFind.Click += new System.EventHandler(this.btFind_Click); - // - // toolStripButton5 - // - this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(144, 22); - this.toolStripButton5.Text = "휴일/연장근무 집계표"; - this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // btConf - // - this.btConf.Image = ((System.Drawing.Image)(resources.GetObject("btConf.Image"))); - this.btConf.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btConf.Name = "btConf"; - this.btConf.Size = new System.Drawing.Size(75, 22); - this.btConf.Text = "선택승인"; - this.btConf.Click += new System.EventHandler(this.toolStripButton3_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); - // - // btConfAll - // - this.btConfAll.ForeColor = System.Drawing.Color.Red; - this.btConfAll.Image = ((System.Drawing.Image)(resources.GetObject("btConfAll.Image"))); - this.btConfAll.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btConfAll.Name = "btConfAll"; - this.btConfAll.Size = new System.Drawing.Size(75, 22); - this.btConfAll.Text = "일괄승인"; - this.btConfAll.Visible = false; - this.btConfAll.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // toolStrip1 - // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bn.Location = new System.Drawing.Point(0, 730); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(1364, 25); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsMSSQL; + this.bs.Sort = "pdate desc"; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.Namespace = "http://tempuri.org/dsPRJ.xsd"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel2.Text = "검색"; + // + // tbFind + // + this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Name = "tbFind"; + this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); + // + // btFind + // + this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(23, 22); + this.btFind.Text = "toolStripButton2"; + this.btFind.Click += new System.EventHandler(this.btFind_Click); + // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(144, 22); + this.toolStripButton5.Text = "휴일/연장근무 집계표"; + this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // btConf + // + this.btConf.Image = ((System.Drawing.Image)(resources.GetObject("btConf.Image"))); + this.btConf.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btConf.Name = "btConf"; + this.btConf.Size = new System.Drawing.Size(75, 22); + this.btConf.Text = "선택승인"; + this.btConf.Click += new System.EventHandler(this.toolStripButton3_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // btConfAll + // + this.btConfAll.ForeColor = System.Drawing.Color.Red; + this.btConfAll.Image = ((System.Drawing.Image)(resources.GetObject("btConfAll.Image"))); + this.btConfAll.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btConfAll.Name = "btConfAll"; + this.btConfAll.Size = new System.Drawing.Size(75, 22); + this.btConfAll.Text = "일괄승인"; + this.btConfAll.Visible = false; + this.btConfAll.CheckStateChanged += new System.EventHandler(this.btConfAll_CheckStateChanged); + this.btConfAll.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton8, this.lbStt, this.dtSD, @@ -309,168 +313,188 @@ this.cmbUser, this.btSearch, this.toolStripButton2}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1364, 37); - this.toolStrip1.TabIndex = 4; - this.toolStrip1.Text = "toolStrip1"; - // - // lbStt - // - this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbStt.ForeColor = System.Drawing.Color.Blue; - this.lbStt.Name = "lbStt"; - this.lbStt.Size = new System.Drawing.Size(43, 34); - this.lbStt.Text = "시작일"; - this.lbStt.Click += new System.EventHandler(this.lbStt_Click); - // - // dtSD - // - this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Name = "dtSD"; - this.dtSD.Size = new System.Drawing.Size(90, 37); - this.dtSD.Text = "1982-11-23"; - this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // lbEnd - // - this.lbEnd.Name = "lbEnd"; - this.lbEnd.Size = new System.Drawing.Size(15, 34); - this.lbEnd.Text = "~"; - // - // toolStripLabel4 - // - this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; - this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(43, 34); - this.toolStripLabel4.Text = "종료일"; - this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); - // - // dtED - // - this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Name = "dtED"; - this.dtED.Size = new System.Drawing.Size(90, 37); - this.dtED.Text = "1982-11-23"; - this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // lbTime - // - this.lbTime.Name = "lbTime"; - this.lbTime.Size = new System.Drawing.Size(29, 34); - this.lbTime.Text = "{0}h"; - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); - // - // toolStripLabel1 - // - this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); - this.toolStripLabel1.Text = "공정"; - // - // tbProcess - // - this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.Size = new System.Drawing.Size(300, 37); - // - // toolStripButton4 - // - this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(34, 34); - this.toolStripButton4.Text = "toolStripButton4"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); - // - // toolStripLabel3 - // - this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(43, 34); - this.toolStripLabel3.Text = "사용자"; - this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); - // - // cmbUser - // - this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbUser.Name = "cmbUser"; - this.cmbUser.Size = new System.Drawing.Size(200, 37); - this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); - // - // btSearch - // - this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); - this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btSearch.Name = "btSearch"; - this.btSearch.Size = new System.Drawing.Size(92, 34); - this.btSearch.Text = "조회(&R)"; - this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick); - // - // toolStripButton2 - // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(65, 34); - this.toolStripButton2.Text = "닫기"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // richTextBox1 - // - this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; - this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Location = new System.Drawing.Point(0, 0); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1364, 91); - this.richTextBox1.TabIndex = 5; - this.richTextBox1.Text = ""; - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 37); - this.splitContainer1.Name = "splitContainer1"; - this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.Controls.Add(this.dv1); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); - this.splitContainer1.Size = new System.Drawing.Size(1364, 693); - this.splitContainer1.SplitterDistance = 592; - this.splitContainer1.SplitterWidth = 10; - this.splitContainer1.TabIndex = 6; - // - // dv1 - // - this.dv1.A_DelCurrentCell = true; - this.dv1.A_EnterToTab = true; - this.dv1.A_KoreanField = null; - this.dv1.A_UpperField = null; - this.dv1.A_ViewRownumOnHeader = true; - this.dv1.AllowUserToAddRows = false; - this.dv1.AllowUserToDeleteRows = false; - this.dv1.AutoGenerateColumns = false; - this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1364, 37); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton8 + // + this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(34, 34); + this.toolStripButton8.Text = "toolStripButton7"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // + // lbStt + // + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Blue; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(43, 34); + this.lbStt.Text = "시작일"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); + // + // dtSD + // + this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Name = "dtSD"; + this.dtSD.Size = new System.Drawing.Size(90, 37); + this.dtSD.Text = "1982-11-23"; + this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // lbEnd + // + this.lbEnd.Name = "lbEnd"; + this.lbEnd.Size = new System.Drawing.Size(15, 34); + this.lbEnd.Text = "~"; + // + // toolStripLabel4 + // + this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(43, 34); + this.toolStripLabel4.Text = "종료일"; + this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); + // + // dtED + // + this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Name = "dtED"; + this.dtED.Size = new System.Drawing.Size(90, 37); + this.dtED.Text = "1982-11-23"; + this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripButton7 + // + this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(34, 34); + this.toolStripButton7.Text = "toolStripButton7"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // lbTime + // + this.lbTime.Name = "lbTime"; + this.lbTime.Size = new System.Drawing.Size(29, 34); + this.lbTime.Text = "{0}h"; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel1.Text = "공정"; + // + // tbProcess + // + this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(300, 37); + // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(34, 34); + this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); + // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(43, 34); + this.toolStripLabel3.Text = "사용자"; + this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); + // + // cmbUser + // + this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUser.Name = "cmbUser"; + this.cmbUser.Size = new System.Drawing.Size(200, 37); + this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); + // + // btSearch + // + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(92, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick); + // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(1364, 91); + this.richTextBox1.TabIndex = 5; + this.richTextBox1.Text = ""; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 37); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.dv1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); + this.splitContainer1.Size = new System.Drawing.Size(1364, 693); + this.splitContainer1.SplitterDistance = 592; + this.splitContainer1.SplitterWidth = 10; + this.splitContainer1.TabIndex = 6; + // + // dv1 + // + this.dv1.A_DelCurrentCell = true; + this.dv1.A_EnterToTab = true; + this.dv1.A_KoreanField = null; + this.dv1.A_UpperField = null; + this.dv1.A_ViewRownumOnHeader = true; + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoGenerateColumns = false; + this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.wwDataGridViewTextBoxColumn, this.pdateDataGridViewTextBoxColumn, this.WeekName, @@ -482,248 +506,244 @@ this.svalueDataGridViewTextBoxColumn, this.otDataGridViewTextBoxColumn, this.ot2DataGridViewTextBoxColumn, + this.otPMS, this.otReasonDataGridViewTextBoxColumn, this.otStartDataGridViewTextBoxColumn, this.otEnd, this.projectNameDataGridViewTextBoxColumn, this.descriptionDataGridViewTextBoxColumn}); - this.dv1.DataSource = this.bs; - this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.dv1.Location = new System.Drawing.Point(0, 0); - this.dv1.Name = "dv1"; - this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(1364, 592); - this.dv1.TabIndex = 3; - this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); - // - // wwDataGridViewTextBoxColumn - // - this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19; - this.wwDataGridViewTextBoxColumn.HeaderText = "WW"; - this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn"; - this.wwDataGridViewTextBoxColumn.ReadOnly = true; - this.wwDataGridViewTextBoxColumn.Width = 50; - // - // pdateDataGridViewTextBoxColumn - // - this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20; - this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜"; - this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; - this.pdateDataGridViewTextBoxColumn.ReadOnly = true; - this.pdateDataGridViewTextBoxColumn.Width = 51; - // - // WeekName - // - this.WeekName.DataPropertyName = "WeekName"; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.WeekName.DefaultCellStyle = dataGridViewCellStyle21; - this.WeekName.HeaderText = "*"; - this.WeekName.Name = "WeekName"; - this.WeekName.ReadOnly = true; - this.WeekName.Width = 36; - // - // FreeDay - // - this.FreeDay.DataPropertyName = "FreeDay"; - this.FreeDay.HeaderText = "휴일"; - this.FreeDay.Name = "FreeDay"; - this.FreeDay.ReadOnly = true; - this.FreeDay.Width = 32; - // - // usernameDataGridViewTextBoxColumn - // - this.usernameDataGridViewTextBoxColumn.DataPropertyName = "username"; - this.usernameDataGridViewTextBoxColumn.HeaderText = "담당"; - this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn"; - this.usernameDataGridViewTextBoxColumn.ReadOnly = true; - this.usernameDataGridViewTextBoxColumn.Width = 51; - // - // requestpartDataGridViewTextBoxColumn - // - this.requestpartDataGridViewTextBoxColumn.DataPropertyName = "requestpart"; - this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서"; - this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; - this.requestpartDataGridViewTextBoxColumn.ReadOnly = true; - this.requestpartDataGridViewTextBoxColumn.Width = 61; - // - // packageDataGridViewTextBoxColumn - // - this.packageDataGridViewTextBoxColumn.DataPropertyName = "package"; - this.packageDataGridViewTextBoxColumn.HeaderText = "패키지"; - this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; - this.packageDataGridViewTextBoxColumn.ReadOnly = true; - this.packageDataGridViewTextBoxColumn.Width = 61; - // - // statusDataGridViewTextBoxColumn - // - this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22; - this.statusDataGridViewTextBoxColumn.HeaderText = "상태"; - this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn"; - this.statusDataGridViewTextBoxColumn.ReadOnly = true; - this.statusDataGridViewTextBoxColumn.Width = 51; - // - // svalueDataGridViewTextBoxColumn - // - this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue"; - this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류"; - this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn"; - this.svalueDataGridViewTextBoxColumn.ReadOnly = true; - this.svalueDataGridViewTextBoxColumn.Width = 61; - // - // otDataGridViewTextBoxColumn - // - this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Red; - dataGridViewCellStyle23.Format = "N1"; - this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle23; - this.otDataGridViewTextBoxColumn.HeaderText = "초과"; - this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; - this.otDataGridViewTextBoxColumn.ReadOnly = true; - this.otDataGridViewTextBoxColumn.Width = 51; - // - // ot2DataGridViewTextBoxColumn - // - this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - dataGridViewCellStyle24.Format = "N1"; - this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle24; - this.ot2DataGridViewTextBoxColumn.HeaderText = "승인"; - this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; - this.ot2DataGridViewTextBoxColumn.Width = 51; - // - // otReasonDataGridViewTextBoxColumn - // - this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; - dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle25; - this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; - this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; - this.otReasonDataGridViewTextBoxColumn.Width = 51; - // - // otStartDataGridViewTextBoxColumn - // - this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dataGridViewCellStyle26.Format = "HH:mm:ss"; - this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle26; - this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; - this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; - this.otStartDataGridViewTextBoxColumn.ReadOnly = true; - this.otStartDataGridViewTextBoxColumn.Visible = false; - this.otStartDataGridViewTextBoxColumn.Width = 54; - // - // otEnd - // - this.otEnd.DataPropertyName = "otEnd"; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dataGridViewCellStyle27.Format = "HH:mm:ss"; - this.otEnd.DefaultCellStyle = dataGridViewCellStyle27; - this.otEnd.HeaderText = "종료"; - this.otEnd.Name = "otEnd"; - this.otEnd.ReadOnly = true; - this.otEnd.Visible = false; - this.otEnd.Width = 54; - // - // projectNameDataGridViewTextBoxColumn - // - this.projectNameDataGridViewTextBoxColumn.DataPropertyName = "projectName"; - this.projectNameDataGridViewTextBoxColumn.HeaderText = "프로젝트(아이템)"; - this.projectNameDataGridViewTextBoxColumn.Name = "projectNameDataGridViewTextBoxColumn"; - this.projectNameDataGridViewTextBoxColumn.ReadOnly = true; - this.projectNameDataGridViewTextBoxColumn.Width = 87; - // - // descriptionDataGridViewTextBoxColumn - // - this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; - this.descriptionDataGridViewTextBoxColumn.HeaderText = "비고"; - this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; - this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; - this.descriptionDataGridViewTextBoxColumn.Width = 51; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.EETGW_JobReport_AutoInputTableAdapter = null; - this.tam.EETGW_JobReport_EBoardTableAdapter = null; - this.tam.EETGW_NoteTableAdapter = null; - this.tam.EETGW_ProjecthistoryDTableAdapter = null; - this.tam.EETGW_ProjectResonTableAdapter = null; - this.tam.EETGW_ProjectsScheduleTableAdapter = null; - this.tam.EETGW_ProjectToDoTableAdapter = null; - this.tam.EETGW_SaveCostTableAdapter = null; - this.tam.JobReportTableAdapter = this.ta; - this.tam.ProjectPartStatusTableAdapter = null; - this.tam.ProjectsHistoryTableAdapter = null; - this.tam.ProjectsIOMapTableAdapter = null; - this.tam.ProjectsMailListTableAdapter = null; - this.tam.ProjectsPartTableAdapter = null; - this.tam.ProjectsTableAdapter = null; - this.tam.SPMasterTableAdapter = null; - this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // toolStripButton8 - // - this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); - this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton8.Name = "toolStripButton8"; - this.toolStripButton8.Size = new System.Drawing.Size(34, 34); - this.toolStripButton8.Text = "toolStripButton7"; - this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); - // - // toolStripButton7 - // - this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); - this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton7.Name = "toolStripButton7"; - this.toolStripButton7.Size = new System.Drawing.Size(34, 34); - this.toolStripButton7.Text = "toolStripButton7"; - this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); - // - // fOTConfirm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1364, 755); - this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.bn); - this.Name = "fOTConfirm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "휴일/연장근무 승인"; - this.Load += new System.EventHandler(this.@__Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.dv1.DataSource = this.bs; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Name = "dv1"; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(1364, 592); + this.dv1.TabIndex = 3; + this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); + // + // tam + // + this.tam.AuthTableAdapter = null; + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_DocuFormTableAdapter = null; + this.tam.EETGW_JobReport_AutoInputTableAdapter = null; + this.tam.EETGW_JobReport_EBoardTableAdapter = null; + this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_Project_LayoutTableAdapter = null; + this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; + this.tam.EETGW_ProjectToDoTableAdapter = null; + this.tam.EETGW_SaveCostTableAdapter = null; + this.tam.JobReportTableAdapter = this.ta; + this.tam.ProjectPartStatusTableAdapter = null; + this.tam.ProjectsHistoryTableAdapter = null; + this.tam.ProjectsIOMapTableAdapter = null; + this.tam.ProjectsMailListTableAdapter = null; + this.tam.ProjectsPartTableAdapter = null; + this.tam.ProjectsTableAdapter = null; + this.tam.SPMasterTableAdapter = null; + this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.vEETGW_Project_LayoutListTableAdapter = null; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // wwDataGridViewTextBoxColumn + // + this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.wwDataGridViewTextBoxColumn.HeaderText = "WW"; + this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn"; + this.wwDataGridViewTextBoxColumn.ReadOnly = true; + this.wwDataGridViewTextBoxColumn.Width = 50; + // + // pdateDataGridViewTextBoxColumn + // + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + this.pdateDataGridViewTextBoxColumn.ReadOnly = true; + this.pdateDataGridViewTextBoxColumn.Width = 54; + // + // WeekName + // + this.WeekName.DataPropertyName = "WeekName"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.WeekName.DefaultCellStyle = dataGridViewCellStyle3; + this.WeekName.HeaderText = "*"; + this.WeekName.Name = "WeekName"; + this.WeekName.ReadOnly = true; + this.WeekName.Width = 36; + // + // FreeDay + // + this.FreeDay.DataPropertyName = "FreeDay"; + this.FreeDay.HeaderText = "휴일"; + this.FreeDay.Name = "FreeDay"; + this.FreeDay.ReadOnly = true; + this.FreeDay.Width = 35; + // + // usernameDataGridViewTextBoxColumn + // + this.usernameDataGridViewTextBoxColumn.DataPropertyName = "username"; + this.usernameDataGridViewTextBoxColumn.HeaderText = "담당"; + this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn"; + this.usernameDataGridViewTextBoxColumn.ReadOnly = true; + this.usernameDataGridViewTextBoxColumn.Width = 54; + // + // requestpartDataGridViewTextBoxColumn + // + this.requestpartDataGridViewTextBoxColumn.DataPropertyName = "requestpart"; + this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서"; + this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; + this.requestpartDataGridViewTextBoxColumn.ReadOnly = true; + this.requestpartDataGridViewTextBoxColumn.Width = 78; + // + // packageDataGridViewTextBoxColumn + // + this.packageDataGridViewTextBoxColumn.DataPropertyName = "package"; + this.packageDataGridViewTextBoxColumn.HeaderText = "패키지"; + this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; + this.packageDataGridViewTextBoxColumn.ReadOnly = true; + this.packageDataGridViewTextBoxColumn.Width = 66; + // + // statusDataGridViewTextBoxColumn + // + this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + this.statusDataGridViewTextBoxColumn.HeaderText = "상태"; + this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn"; + this.statusDataGridViewTextBoxColumn.ReadOnly = true; + this.statusDataGridViewTextBoxColumn.Width = 54; + // + // svalueDataGridViewTextBoxColumn + // + this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue"; + this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류"; + this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn"; + this.svalueDataGridViewTextBoxColumn.ReadOnly = true; + this.svalueDataGridViewTextBoxColumn.Width = 78; + // + // otDataGridViewTextBoxColumn + // + this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle5.Format = "N1"; + this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; + this.otDataGridViewTextBoxColumn.HeaderText = "초과"; + this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; + this.otDataGridViewTextBoxColumn.ReadOnly = true; + this.otDataGridViewTextBoxColumn.Width = 54; + // + // ot2DataGridViewTextBoxColumn + // + this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle6.Format = "N1"; + this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; + this.ot2DataGridViewTextBoxColumn.HeaderText = "승인(대체)"; + this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; + this.ot2DataGridViewTextBoxColumn.Width = 88; + // + // otPMS + // + this.otPMS.DataPropertyName = "otPMS"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle7.Format = "N1"; + this.otPMS.DefaultCellStyle = dataGridViewCellStyle7; + this.otPMS.HeaderText = "대체(PMS)"; + this.otPMS.Name = "otPMS"; + this.otPMS.Width = 91; + // + // otReasonDataGridViewTextBoxColumn + // + this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; + this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; + this.otReasonDataGridViewTextBoxColumn.Width = 54; + // + // otStartDataGridViewTextBoxColumn + // + this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle9.Format = "HH:mm:ss"; + this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; + this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; + this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; + this.otStartDataGridViewTextBoxColumn.ReadOnly = true; + this.otStartDataGridViewTextBoxColumn.Visible = false; + this.otStartDataGridViewTextBoxColumn.Width = 54; + // + // otEnd + // + this.otEnd.DataPropertyName = "otEnd"; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle10.Format = "HH:mm:ss"; + this.otEnd.DefaultCellStyle = dataGridViewCellStyle10; + this.otEnd.HeaderText = "종료"; + this.otEnd.Name = "otEnd"; + this.otEnd.ReadOnly = true; + this.otEnd.Visible = false; + this.otEnd.Width = 54; + // + // projectNameDataGridViewTextBoxColumn + // + this.projectNameDataGridViewTextBoxColumn.DataPropertyName = "projectName"; + this.projectNameDataGridViewTextBoxColumn.HeaderText = "프로젝트(아이템)"; + this.projectNameDataGridViewTextBoxColumn.Name = "projectNameDataGridViewTextBoxColumn"; + this.projectNameDataGridViewTextBoxColumn.ReadOnly = true; + this.projectNameDataGridViewTextBoxColumn.Width = 87; + // + // descriptionDataGridViewTextBoxColumn + // + this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; + this.descriptionDataGridViewTextBoxColumn.HeaderText = "비고"; + this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; + this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; + this.descriptionDataGridViewTextBoxColumn.Width = 51; + // + // fOTConfirm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1364, 755); + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.Name = "fOTConfirm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "휴일/연장근무 승인"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -768,6 +788,10 @@ private arCtl.arDatagridView dv1; private System.Windows.Forms.ToolStripButton btConfAll; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripButton btConf; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.ToolStripButton toolStripButton7; private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn WeekName; @@ -779,14 +803,11 @@ private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn otDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn ot2DataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otPMS; private System.Windows.Forms.DataGridViewTextBoxColumn otReasonDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn otEnd; private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn; - private System.Windows.Forms.ToolStripButton btConf; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripButton toolStripButton8; - private System.Windows.Forms.ToolStripButton toolStripButton7; - } + } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs index 5177294..835e587 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs @@ -1,4 +1,6 @@ -using System; +using FarPoint.Win.Spread; +using FPJ0000.OtConfirm; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -411,6 +413,12 @@ namespace FPJ0000 private void toolStripButton1_Click(object sender, EventArgs e) { //전체승인 + using(var f = new fOTConfirmValue()) + { + if (f.ShowDialog() != DialogResult.OK) return; + } + + var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다"); if (dlg != DialogResult.Yes) return; @@ -446,11 +454,6 @@ namespace FPJ0000 private void toolStripButton3_Click(object sender, EventArgs e) { - //var drv = this.bs.Current as DataRowView; - //if (drv == null) return; - //var dr = drv.Row as dsPRJ.JobReportRow; - - List rows = new List(); List rowindex = new List(); foreach (DataGridViewCell cell in dv1.SelectedCells) @@ -461,7 +464,7 @@ namespace FPJ0000 if (rowindex.Contains(cell.RowIndex) == false) rowindex.Add(cell.RowIndex); } - + //데이터를 외부 폼에 전송하여 값을 셋팅해온다 using (var f = new OtConfirm.fOTConfirmOK(rows.ToArray())) { if (f.ShowDialog() == DialogResult.OK) @@ -506,5 +509,10 @@ namespace FPJ0000 dtSD.Text = sd.ToShortDateString(); dtED.Text = ed.ToShortDateString(); } - } + + private void btConfAll_CheckStateChanged(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx index f7f2d28..44861be 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx @@ -1,17 +1,17 @@  - @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 259, 17 - 122, 17 @@ -181,20 +178,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZJZTxNRGIZ7pT/BoBdekhiFCEaNXigIWMAE - NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgQKWrZRCK8WIlJal7EvCUoEuM9CZ8npmWgETEr/kybk4 - 8z6Z750RcBP4UBl3pVijCCvR/A6Saihy0jyl3Kmlw4r76JBnav15iar8WPj7A3xo7wQ/6VEtW+hVvd7I - mm2bMFt3WbVw0DAuWpD3ZRZRJSN2Ybr8oDvqmtBC9bJ+eJTtm3ZAO8NAO8tAM81APbUF5fgmWgw2bDJA - 4wiFvE8zSHyhp/6RBElbqA37FgbmWPyYY8jJoJ+XbKHbtIlvBjsRODGwyEK74ECBfBb+Dzre8eHIUr/J - W9LwbXHVDSRW3kRlax3y60vhL/WCH0FYcA6BstMoayzjV7HSDJbW7AiM7WZ4QUSx/8eOoSY0jb1GpSaH - l8RWhCDnbQwy6qIgqr6KhOoENA4uoUlvxddfG1gnPQXJemheICwXHvSRZrKa0S68GZKhSJnOS+KqQkn4 - GlJeJkNlsvGrtI9RUJAe1mwOBOX3ugTcBBd201k18dCZ1KjW3sfTtmxEll5CXEU4dNN26EixXMGqCVcn - ZiIIlO0RXHgkdZzJPYqYciEGJvpQ0JUKmTwLUc8DUKf8jJ/zDHSk2L4pB3oJyxYH/B+7BT4SD7Gv5Agy - aqNxuyoY0WWXeUmWPAaS+mTyJgHg7gdmWfRzn5hgIUV6Z6pdAl/JoXlfyWHykAd8czxwvSgAaa/ioTIo - UKDIReqHeIiqIqAjAi35NzREQDucRKDcXeFiZg+9uE5jcJ7l6R5dwL2aFCSRoLg6Ctm1d3fuOOxbLBE0 - 7Ao425x5V/A/bNwKyXsEZ7M67R3f9dv7PbwfxjGT80Rso9UdJ0WmtE3ObNgtnf0G5+QKhcllCiY3K1YH - D9e8lWYxZBx3UhS17nmnedgdFwhOpbSmeYta2k6KFWZvcQO9Q5ILr7+IGmhPUfPa8YTmdq94eaJAIBD8 - Aekrn18k0ej1AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFKEaNXigIWMAE + NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgbKUrS2lbSjKUlbZt4SlAl1moDPl9cy0AiYkfsmTc3Hm + fTLfOyPgxv+xMuZaoU4RUqT7HSDVUeSkeYq5U0+HFGrpoBca40WJuvR46MdDfGj/BD7rUq+Y6TWj0cia + rFswWfZYM3PQGFkyI+fbHCKKRm3CVLmbK+qc4HzNitE4xGpn7NDPMtDPMdDNMNBMb0P5awtNw1ZsMUD9 + KIWcL7OIf2Wk/pEESJuoTds2eudZ/JhnyMmgh5dsQzWxhZZhGxE40LvEQr9oR558Dr6P2j/w4fBin6k7 + 0tAdccUtxJffRnlzDXJri+Er9YQPQZh3Af6ysyipL+FXsdAMltdt8I9WMbwgrND3c/tgAxrG36Jcl8VL + osuCkPU+Cmk1ERBVXkdcZRzq+5fRYLTg+8AmNkhPAbIumhcIS4VuntJ0VjfWiXeDMhQoU3lJTEUwCd9A + 0utEqCes/Cpt4xQUpId1qx0Bud1OATeB+So6oyoWhgkNKvUP8bw1E+HFVxBTFgrDjA0GUixXsHrS2YmJ + CPxl+wSXnkjt57KPIapUiN5JLfI6kyGTZyDipR9qlF/Rt8DAQIrVTtvRTVgx2+H71CU4LXEXe0uOIq06 + EncrAhFZcpWXZMijIKlNJG/iB+6+d45FD/eJCWZSpFe6xinwlhxe8JYcIQ+5wzvLHTcL/JDyJhbqYQXy + FNlI/hQLUUUYDESgJ/+Gjghou4MIlHsrXE7vopc2aPQvsDyqsUU8qEpCAgmKKyOQWX1/947Dts0SQd2e + gLPNm/YE/8PKrZC4T3A+o8PW0t23c9DDBzE4POo4GV1vccVJkUmtU7ObNnOHdsAxtUphaoXChItVi52H + a95Cs/g5OOKgKGrD417jkCsuEJxJak7xEjW1nhIrTF7iOnqXBCeefxHV0R6ixvUTcY1tnrHyeIFAIPgD + q6OfJyXVylwAAAAASUVORK5CYII= @@ -227,50 +224,47 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - - 393, 17 + 261, 17 iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB1aNkXcwDUaExPj - F/BF1BgjglBE2VooLTsIKotK4hoRSncKrVCgPqEmoEaCUSNG2WSV4510mlAf6L1Dgi89yX2+v8zMuf/J - 9XDHHXcE5OHx1xceHLOO3z9qQ8MRsg73ov5QL+oSe1Cb0IN7B7tx90A37uwna58VNXutqI7vwu09XaiK - 60Tl7k5U7HqF8liyYiwoi7agNMqCkkgzisVmFIk6oIwgK7wdirB2FIaaxgtCjEn89q6zzDjIQ0zICzaN - 8du7znLjCoJNyA9qA7+96/wPnCyQBbgEXFmMGcpIA/JFahSK9CgSd1DhZAFGeuBSnpwiSgfb44+YmZxD - d+MHyMK0VDjpTgagUBz35Nor32FhihN0VLi8HQZ6oBBccZQJjy5ZMf9nnqcBP4cmII1QUeFy/RmArLjS - 6A5UnTJiamyGpwGz03OoOdsGeWgbFS7HT08PZMORUsTp8P39KE+z54XEhvxQPTUu25cBSIvjjhK5WIu3 - 2s88y56uhgFy8GqYcFk+LEBKnEJsgKnCuRSDtmHy3bUy47K8dfRAGlxRJCnFRedSjHz5DUW8hnx3Rmbc - re0MQFe4kii+FOOzPM1eiuozbSBDXxDuppeWHrgYjhtf8gg9Bjq+8jR7nqX2QhaiE4zL3MYAXAzHzdaC - cD36252BT1N6IA3WCcbd8NTQAxfDcYNfKTKh/ITB+RVPzaHyNAEFGgThMrYyABfDOQa/PMyAxqQup5L8 - IiWRxbZCGqBnxkm2qOmBrnCO2SoN0cJQ+obn2fOpdxhZgc3MuPTNLEAKnOOcyw5UoU89xPPssdT2I9Ov - hQmXvqmVHkiL4wohCzIiV6TCt4ERnmfPk+RuZPq0UuPSNjIAaXGOtnLfnDJRi8nRBT8LpDSlJwnKW0OF - u76BAciCc7Q121+D+nNmp9L8GByDxLeJCpe6XkUPZMU5CpHpq4JW2cfz7MmJbKHCpaxjAArBOQoh8XmJ - TvI3Mz0xC0tdP9I8m6hw19a20AOF4hyFkHi1INXzOcE1I8NTTYVLXsMCXAKOthD/4pJXN9MD/wfu6ioG - IMGNLzfu8som+qsP7iKHuytZTtyVFU3n+e3dcccd+nh4/AXhRz35FoyUPQAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djXT1NRHAdw/gjj3ogsZUNbhiIucEZjYmL8 + B3wRNcaIIBRRVgulZYOgMlQSZ6xQ6KSUSlk+oSagRoJRI0ZZMuXrueltQn2g51wSfOk3Oc/nk3vv9/xu + joc77rgjIA+Pv77w4Jh1/P7RXtQfIetwD+oO9aA2oRs18d24d7ALdw904c5+svZ1onpvJ6ribLi9x4bK + 2A5U7O5A+a5XKIshK9qK0igrSiKtKJa0o0jcjkKRBaoIssLboAxrQ0GoeTw/xJTIb+86y4yDIsSM3GDz + GL+96yw3Lj/YjLygVvDbu87/wMkDWYBLwJVGt0MlMSJP1IICkQGFYgsVTh5gogcu5ckpI/XoffwRM5Nz + 6Gr4AHmYjgon28kAFIrjnlxbxTssTFG8ngqXu8NIDxSCK4o049GlTsz/medpwM+hCcgiNFS4HH8GICuu + JMqCylMmTI3N8DRgdnoO1WdboQhtpcJl+xnogWw4UopYPb6/H+Vp9ryQ9iIv1ECNy/JlANLiuKNEIdbh + re4zz7LHVj9ADl4tEy7ThwVIiVOKjTCXO5disHeYfHfNzLhMbz09kAZXKCGluOhcipEvv6GM05LvzsSM + u7WdAegKVxzJl2J8lqfZS1F1phVk6AvC3fTS0QMXw3HjSxFhwIDlK0+z51lKD+QhesG4jG0MwMVw3GzN + Dzegv80Z+DS5G7JgvWDcDU8tPXAxHDf4VSIzyk4YnV/x1BwqThNQoFEQLn0rA3AxnGPwK8KMaEi0OZXk + FymJPKYZsgADM066pYUe6ArnmK2yEB2MJW94nj2feoaRGdjIjEvbzAKkwDnOuaxADfpahniePdaafmT4 + NTHh0jY10wNpcVwh5EEm5Ig0+DYwwvPseZLUhQyfZmpc6kYGIC3O0Vbum1Ml6DA5uuBngZSm5CRBeWup + cNc3MABZcI62ZvlrUXeu3ak0PwbHIPVVU+FS1mvogaw4RyEyfDXQqfp4nj3ZkiYqXPI6BqAQnKMQUp+X + 6CB/M9MTs7DW9iPVU02Fu7a2iR4oFOcohNSrCSmezwmuEemeLVS4pDUswCXgaAvxLy5pdSM98H/grq5i + ABLc+HLjLq9U0199cBc53F3JcuKurFCf57d3xx136OPh8Rc0ez3xKe5elAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji - g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6dFSmkBnySQIJAokoiRREpkUY4zzjRKTNp7xwRfepL7fH+Z - O2e+mwkKJJBAJOThwTdn6g+4PQ/2d+H+Pm6ldKIuuRO1eztwb08Hana7cXeXG3d2cmuHC7e3u3BrWzuq - k9pxM9GJqq1O3Ehow/V4bqkcqIxzoCLWgWtbWlG+uRVlMa9RquTWphboo1tQEmX3XI1kT4vb+88c46CL - tEOrsI+J2/vPXOOuKuwoltsgbu8//wNXFEEDJMTdTHKiIsEGvcqMchWLyniHZFxROEsOJH1y5fEsup4M - YOrbd7xpGERpHCMZVxhGASQ+1kMs/kxLVQ/0m62ScNpQKzmQ9J0rS2QwOjQu8oCZHzN4fNYFfYyNGlew - kQJIWogKVStqjrf8OmJvJj3TqDrCQq+0U+HyQ5rJgSQ4b1vLYm14nt4l8oR8HhyDLsGEkmg7MS5PRgEk - xXkLoVM2w1X/TuQJ6WWHoY00EuM0wTRACpy3EEUxRgy4RkSeEGtFNwrkFiKcZgNDDqTF8YXQK7l3LdGE - 0Q9/lGYGeHTGifxwi19c7noKIC3O21ZdlA3Vx1hMT/wuzcTYFMpSLNCGNfvEqddZyIFScN62FioYPEvr - EHlCem3DUIcYfOJy1lIApeL4QmjlDBpSZwN7rB85oNEnLnuNmRwoFVckZ3HjqPWvI9bvNSMvhPGJy1pN - AZSCK1bYUKgy4Mt7j0gTSlJ/sg1qmdEvLnOViRxIi+O/cxp5E/pdn0SaEKb0LXJkBiJcxkoaICUuL9yE - tro+kSWkmxlCdshLYlzGCiM5kAZXEGHB0wtukSVkpP8rNNFN0MgYYtyV5RRAUlxhhBWVh62zLgsT3GWh - NNlMjUtfRgEkwfHjK0/xanYpuOtW7YlWqINN1LjLSw3kQBIcP1t1SSaRJoQvRXawQRLu0hIKIAmOn625 - Gw1of9CHyfFpOO/3IUv2UjIubfErciAJjh/8BaHNvyZEZvCLf3pyPC51EQ2QAOdv8NPiUhc2kQP/B+7i - Agogh/PMNe7c/EbyXx/8jxz+X8lc4s7Pazwlbh9IIIGQJyjoJ38CPp5C2VW3AAAAAElFTkSuQmCC + g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6etQCnbkwQSBBJFEjGSSIksynGGmUaJSXvvmOBLT3Kf7y9z + 58x3MwH++OOPhDw+3HWu9lCL+9HBTjw8wK2kDtQkdqB6fzse7GtH1d423N/Thnu7ubXLhbs7XbizoxWV + Ca24He9ExXYnbsW14GYst1TNKI9pRll0M25sa0Lp1iaURL1FsZJbWxzQRzpQFGF3Xw9nz4rb+84846AL + t0OrsI+J2/vOfOOuK+wolNsgbu87/wNXEEYDJMTdTnCiLM4GvcqMUhWL8thmybiCUJYcSPrkSmNZdD4b + wNT3H+iqG0RxDCMZlx9CASQ+1iMs/oyjogf6rVZJOG2wlRxI+s6VxDMYHRoXecDMzxk8Pe+CPspGjcvb + TAEkLUSZqglVJx2zR+zJpHsaFcdY6JV2KlxuUCM5kATnaWtJtA0vUztFnpAvg2PQxZlQFGknxuXIKICk + OE8hdMpGuGrfizwhvewwtOFGYpwmkAZIgfMUoiDKiAHXiMgTYi3rRp7cQoTTbGLIgbQ4vhB6JfeuxZsw + +vGP0swAT845kRtq8YnL3kgBpMV52qqLsKHyBIvpid+lmRibQkmSBdqQRq849QYLOVAKztPWfAWDFynt + Ik9Ir20Y6iCDV1zWegqgVBxfCK2cQV3yXGCP9RMHNHrFZa4zkwOl4grkLG4dt/51xPr9ZuQEMV5xGWsp + gFJwhQob8lUGfP3gFmlCSWpPt0AtM/rEpa8xkQNpcfx3TiNvQL/rs0gTwhS/Q5bMQIRLW00DpMTlhJrQ + UtMnsoR0M0PIDHpNjEtbZSQH0uDywix4fqlNZAkZ6f8GTWQDNDKGGHdtJQWQFJcfZkX5Ueucy8IEd1ko + TjRT41JXUABJcPz4ylG8mVsK7rpVfaoJ6kATNe7qcgM5kATHz1ZdgkmkCeFLkRlokIS7sowCSILjZ2v2 + ZgNaH/Vhcnwazod9yJC9loxLWfqGHEiC4wd/XnDj7IRID3z1T0+OxyUvoQES4HwNflpc8uIGcuD/wF1e + RAHkcO75xl1YWE/+64P/kcP/K5lP3MUF9WfE7f3xxx/yBAT8AtInPpbTa5zAAAAAAElFTkSuQmCC @@ -313,13 +307,7 @@ True - - True - - - True - - + True @@ -329,6 +317,6 @@ 186, 17 - 499, 17 + 368, 17 \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs index 7e153ce..7cf892f 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs @@ -30,7 +30,7 @@ namespace FPJ0000.OtConfirm private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -40,11 +40,16 @@ namespace FPJ0000.OtConfirm System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); this.dsMSSQL = new FPJ0000.dsPRJ(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dv1 = new arCtl.arDatagridView(); + this.label1 = new System.Windows.Forms.Label(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btInputAll = new System.Windows.Forms.Button(); this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.WeekName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -56,14 +61,12 @@ namespace FPJ0000.OtConfirm this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ot2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otPMS = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.otReasonDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.label1 = new System.Windows.Forms.Label(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); @@ -87,6 +90,7 @@ namespace FPJ0000.OtConfirm // dsMSSQL // this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.Namespace = "http://tempuri.org/dsPRJ.xsd"; this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // // bs @@ -122,21 +126,22 @@ namespace FPJ0000.OtConfirm this.svalueDataGridViewTextBoxColumn, this.otDataGridViewTextBoxColumn, this.ot2DataGridViewTextBoxColumn, + this.otPMS, this.otReasonDataGridViewTextBoxColumn, this.otStartDataGridViewTextBoxColumn, this.otEnd, this.projectNameDataGridViewTextBoxColumn, this.descriptionDataGridViewTextBoxColumn}); this.dv1.DataSource = this.bs; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(5); - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv1.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(5); + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle11; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(3, 41); this.dv1.Name = "dv1"; @@ -144,6 +149,53 @@ namespace FPJ0000.OtConfirm this.dv1.Size = new System.Drawing.Size(1505, 419); this.dv1.TabIndex = 4; // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Top; + this.label1.Location = new System.Drawing.Point(3, 3); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1505, 38); + this.label1.TabIndex = 5; + this.label1.Text = "승인시간 및 사유를 입력하세요."; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.WhiteSmoke; + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.richTextBox1.Location = new System.Drawing.Point(3, 495); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(1505, 100); + this.richTextBox1.TabIndex = 6; + this.richTextBox1.Text = ""; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label2.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.Location = new System.Drawing.Point(3, 460); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.label2.Size = new System.Drawing.Size(1505, 35); + this.label2.TabIndex = 7; + this.label2.Text = "담당자 비고"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // btInputAll + // + this.btInputAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btInputAll.Location = new System.Drawing.Point(1362, 3); + this.btInputAll.Name = "btInputAll"; + this.btInputAll.Size = new System.Drawing.Size(146, 35); + this.btInputAll.TabIndex = 8; + this.btInputAll.Text = "값 일괄 입력"; + this.btInputAll.UseVisualStyleBackColor = true; + this.btInputAll.Click += new System.EventHandler(this.btInputAll_Click); + // // wwDataGridViewTextBoxColumn // this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; @@ -245,15 +297,26 @@ namespace FPJ0000.OtConfirm dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); dataGridViewCellStyle6.Format = "N1"; this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; - this.ot2DataGridViewTextBoxColumn.HeaderText = "승인"; + this.ot2DataGridViewTextBoxColumn.HeaderText = "승인(대체)"; this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; - this.ot2DataGridViewTextBoxColumn.Width = 75; + this.ot2DataGridViewTextBoxColumn.Width = 119; + // + // otPMS + // + this.otPMS.DataPropertyName = "otPMS"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle7.Format = "N1"; + this.otPMS.DefaultCellStyle = dataGridViewCellStyle7; + this.otPMS.HeaderText = "승인(PMS)"; + this.otPMS.Name = "otPMS"; + this.otPMS.Width = 120; // // otReasonDataGridViewTextBoxColumn // this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; this.otReasonDataGridViewTextBoxColumn.Width = 75; @@ -261,28 +324,28 @@ namespace FPJ0000.OtConfirm // otStartDataGridViewTextBoxColumn // this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dataGridViewCellStyle8.Format = "HH:mm:ss"; - this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle9.Format = "HH:mm:ss"; + this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; this.otStartDataGridViewTextBoxColumn.ReadOnly = true; this.otStartDataGridViewTextBoxColumn.Visible = false; - this.otStartDataGridViewTextBoxColumn.Width = 65; + this.otStartDataGridViewTextBoxColumn.Width = 75; // // otEnd // this.otEnd.DataPropertyName = "otEnd"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dataGridViewCellStyle9.Format = "HH:mm:ss"; - this.otEnd.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle10.Format = "HH:mm:ss"; + this.otEnd.DefaultCellStyle = dataGridViewCellStyle10; this.otEnd.HeaderText = "종료"; this.otEnd.Name = "otEnd"; this.otEnd.ReadOnly = true; this.otEnd.Visible = false; - this.otEnd.Width = 65; + this.otEnd.Width = 75; // // projectNameDataGridViewTextBoxColumn // @@ -300,46 +363,11 @@ namespace FPJ0000.OtConfirm this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Top; - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1505, 38); - this.label1.TabIndex = 5; - this.label1.Text = "승인시간 및 사유를 입력하세요."; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // richTextBox1 - // - this.richTextBox1.BackColor = System.Drawing.Color.WhiteSmoke; - this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); - this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.richTextBox1.Location = new System.Drawing.Point(3, 495); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1505, 100); - this.richTextBox1.TabIndex = 6; - this.richTextBox1.Text = ""; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label2.Location = new System.Drawing.Point(3, 460); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); - this.label2.Size = new System.Drawing.Size(1505, 35); - this.label2.TabIndex = 7; - this.label2.Text = "담당자 비고"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // fOTConfirmOK // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1511, 648); + this.Controls.Add(this.btInputAll); this.Controls.Add(this.dv1); this.Controls.Add(this.label2); this.Controls.Add(this.richTextBox1); @@ -350,7 +378,6 @@ namespace FPJ0000.OtConfirm this.MinimizeBox = false; this.Name = "fOTConfirmOK"; this.Padding = new System.Windows.Forms.Padding(3); - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "OT 승인/취소 작업"; this.Load += new System.EventHandler(this.fHolyRequestAdd_Load); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); @@ -366,6 +393,10 @@ namespace FPJ0000.OtConfirm private dsPRJ dsMSSQL; private System.Windows.Forms.BindingSource bs; private arCtl.arDatagridView dv1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button btInputAll; private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn WeekName; @@ -377,13 +408,11 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn otDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn ot2DataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otPMS; private System.Windows.Forms.DataGridViewTextBoxColumn otReasonDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn otEnd; private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.RichTextBox richTextBox1; - private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs index aa79c4d..b59f287 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs @@ -13,14 +13,14 @@ namespace FPJ0000.OtConfirm { public partial class fOTConfirmOK : fBase { - dsPRJ.JobReportRow[] dr; + dsPRJ.JobReportRow[] drows; //Boolean binit = false; public fOTConfirmOK(dsPRJ.JobReportRow[] dr_) { InitializeComponent(); - dr = dr_; - this.bs.DataSource = dr_; + drows = dr_; + this.bs.DataSource = drows; //this.dv1.DataSource = dr_; } @@ -36,14 +36,14 @@ namespace FPJ0000.OtConfirm private void button1_Click(object sender, EventArgs e) { //초과시간이 입력된 데이터만 확인한다. - var cnt = dr.Where(t => t.RowState == DataRowState.Modified).Count(); + var cnt = drows.Where(t => t.RowState == DataRowState.Modified).Count(); var dlg = FCOMMON.Util.MsgQ($"{cnt}건의 자료를 저장할까요?\n" + "승인시간이 입력된 자료는 근태현황에 자동 입력됩니다\n" + "승인시간이 0으로 초기화된 자료는 근태현황이 자동 삭제됩니다"); if (dlg != DialogResult.Yes) return; this.Validate(); - foreach (var row in this.dr) + foreach (var row in this.drows) { row.otwuid = FCOMMON.info.Login.no; //220501 row.ottime = DateTime.Now; @@ -53,6 +53,43 @@ namespace FPJ0000.OtConfirm DialogResult = DialogResult.OK; } + private void btInputAll_Click(object sender, EventArgs e) + { + using (var f = new fOTConfirmValue()) + { + if (f.ShowDialog() != DialogResult.OK) return; + foreach (var dr in drows) + { + if (f.radAll.Checked) + { + dr.ot2 = dr.ot; + dr.otPMS = 0; + } + else if (f.radAllPMS.Checked) + { + dr.ot2 = 0; + dr.otPMS = dr.ot; + } + else if (f.radInput.Checked) + { + var ot = (float)f.nudValue.Value; + var otPMS = (float)f.nudValuePMS.Value; + var multi = f.checkBox1.Checked; + var multiPMS = f.checkBox2.Checked; + if (multi) dr.ot2 = Math.Round( dr.ot * ot,1); //입력값 배수 ㅊㅓ리 + else dr.ot2 = ot; + + if (multiPMS) dr.otPMS = Math.Round( dr.ot * otPMS,1); //입력값 배수 ㅊㅓ리 + else dr.otPMS = otPMS; + } + dr.otReason = f.tbRemark.Text.Trim(); + dr.EndEdit(); + } + this.bs.DataSource = drows; + this.Invalidate(); + this.dv1.Refresh(); + } + } } } diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx index e32e3bd..b141828 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx @@ -1,17 +1,17 @@  - @@ -132,6 +132,9 @@ True + + True + True diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs index 1116b40..71d5bb4 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs @@ -29,33 +29,73 @@ namespace FPJ0000.OtConfirm /// private void InitializeComponent() { + System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; + System.Windows.Forms.Label label3; this.radAll = new System.Windows.Forms.RadioButton(); this.radInput = new System.Windows.Forms.RadioButton(); this.tbRemark = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); this.nudValue = new System.Windows.Forms.NumericUpDown(); this.btOK = new System.Windows.Forms.Button(); + this.nudValuePMS = new System.Windows.Forms.NumericUpDown(); + this.radAllPMS = new System.Windows.Forms.RadioButton(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.nudValue)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudValuePMS)).BeginInit(); this.SuspendLayout(); // + // label1 + // + label1.AutoSize = true; + label1.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label1.Location = new System.Drawing.Point(21, 143); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(44, 18); + label1.TabIndex = 2; + label1.Text = "비고"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label2.Location = new System.Drawing.Point(163, 103); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(44, 18); + label2.TabIndex = 7; + label2.Text = "대체"; + // + // label3 + // + label3.AutoSize = true; + label3.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + label3.Location = new System.Drawing.Point(321, 103); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(45, 18); + label3.TabIndex = 7; + label3.Text = "PMS"; + // // radAll // this.radAll.AutoSize = true; this.radAll.Checked = true; this.radAll.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.radAll.Location = new System.Drawing.Point(21, 21); + this.radAll.Location = new System.Drawing.Point(20, 21); this.radAll.Name = "radAll"; - this.radAll.Size = new System.Drawing.Size(164, 22); + this.radAll.Size = new System.Drawing.Size(212, 22); this.radAll.TabIndex = 0; this.radAll.TabStop = true; - this.radAll.Text = "입력값 전체 승인"; + this.radAll.Text = "입력값 전체 승인(대체)"; this.radAll.UseVisualStyleBackColor = true; // // radInput // this.radInput.AutoSize = true; this.radInput.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.radInput.Location = new System.Drawing.Point(21, 58); + this.radInput.Location = new System.Drawing.Point(20, 101); this.radInput.Name = "radInput"; this.radInput.Size = new System.Drawing.Size(128, 22); this.radInput.TabIndex = 0; @@ -66,68 +106,117 @@ namespace FPJ0000.OtConfirm // tbRemark // this.tbRemark.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbRemark.Location = new System.Drawing.Point(22, 96); + this.tbRemark.Location = new System.Drawing.Point(20, 176); this.tbRemark.Name = "tbRemark"; this.tbRemark.Size = new System.Drawing.Size(498, 27); this.tbRemark.TabIndex = 1; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(474, 72); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(44, 18); - this.label1.TabIndex = 2; - this.label1.Text = "비고"; - // // nudValue // + this.nudValue.DecimalPlaces = 1; this.nudValue.Enabled = false; this.nudValue.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.nudValue.Location = new System.Drawing.Point(155, 54); + this.nudValue.Location = new System.Drawing.Point(213, 97); this.nudValue.Name = "nudValue"; - this.nudValue.Size = new System.Drawing.Size(140, 30); + this.nudValue.Size = new System.Drawing.Size(95, 30); this.nudValue.TabIndex = 3; this.nudValue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // btOK // this.btOK.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btOK.Location = new System.Drawing.Point(21, 139); + this.btOK.Location = new System.Drawing.Point(19, 219); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(499, 49); + this.btOK.Size = new System.Drawing.Size(499, 61); this.btOK.TabIndex = 4; this.btOK.Text = "확인"; this.btOK.UseVisualStyleBackColor = true; this.btOK.Click += new System.EventHandler(this.btOK_Click); // + // nudValuePMS + // + this.nudValuePMS.DecimalPlaces = 1; + this.nudValuePMS.Enabled = false; + this.nudValuePMS.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.nudValuePMS.Location = new System.Drawing.Point(372, 97); + this.nudValuePMS.Name = "nudValuePMS"; + this.nudValuePMS.Size = new System.Drawing.Size(95, 30); + this.nudValuePMS.TabIndex = 5; + this.nudValuePMS.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // radAllPMS + // + this.radAllPMS.AutoSize = true; + this.radAllPMS.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radAllPMS.Location = new System.Drawing.Point(20, 59); + this.radAllPMS.Name = "radAllPMS"; + this.radAllPMS.Size = new System.Drawing.Size(213, 22); + this.radAllPMS.TabIndex = 6; + this.radAllPMS.Text = "입력값 전체 승인(PMS)"; + this.radAllPMS.UseVisualStyleBackColor = true; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(213, 133); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(72, 16); + this.checkBox1.TabIndex = 8; + this.checkBox1.Text = "배수입력"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(372, 133); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(72, 16); + this.checkBox2.TabIndex = 9; + this.checkBox2.Text = "배수입력"; + this.checkBox2.UseVisualStyleBackColor = true; + this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged); + // // fOTConfirmValue // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(540, 201); + this.ClientSize = new System.Drawing.Size(540, 293); + this.Controls.Add(this.checkBox2); + this.Controls.Add(this.checkBox1); + this.Controls.Add(label3); + this.Controls.Add(label2); + this.Controls.Add(this.radAllPMS); + this.Controls.Add(this.nudValuePMS); this.Controls.Add(this.btOK); this.Controls.Add(this.nudValue); - this.Controls.Add(this.label1); + this.Controls.Add(label1); this.Controls.Add(this.tbRemark); this.Controls.Add(this.radInput); this.Controls.Add(this.radAll); + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "fOTConfirmValue"; this.Text = "fOTConfirmValue"; this.Load += new System.EventHandler(this.fOTConfirmValue_Load); ((System.ComponentModel.ISupportInitialize)(this.nudValue)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudValuePMS)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); } #endregion - - private System.Windows.Forms.RadioButton radAll; - private System.Windows.Forms.RadioButton radInput; - private System.Windows.Forms.TextBox tbRemark; private System.Windows.Forms.Label label1; - private System.Windows.Forms.NumericUpDown nudValue; private System.Windows.Forms.Button btOK; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + public System.Windows.Forms.NumericUpDown nudValuePMS; + public System.Windows.Forms.RadioButton radAllPMS; + public System.Windows.Forms.RadioButton radAll; + public System.Windows.Forms.RadioButton radInput; + public System.Windows.Forms.TextBox tbRemark; + public System.Windows.Forms.NumericUpDown nudValue; + public System.Windows.Forms.CheckBox checkBox1; + public System.Windows.Forms.CheckBox checkBox2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs index 75bc53b..d36d5ad 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs @@ -1,4 +1,5 @@ -using FCOMMON; +using AR; +using FCOMMON; using System; using System.Collections.Generic; using System.ComponentModel; @@ -25,12 +26,66 @@ namespace FPJ0000.OtConfirm private void btOK_Click(object sender, EventArgs e) { + if (radInput.Checked) + { + if (checkBox1.Checked) + { + var mv = (float)nudValue.Value; + if (mv == 0) + { + nudValue.Focus(); + UTIL.MsgE("배수입력 상태입니다 0은 허용되지 않습니다"); + return; + } + } + if (checkBox2.Checked) + { + var mv = (float)nudValuePMS.Value; + if (mv == 0) + { + nudValuePMS.Focus(); + UTIL.MsgE("배수입력 상태입니다 0은 허용되지 않습니다"); + return; + } + } + } + + this.DialogResult = DialogResult.OK; } private void radInput_CheckedChanged(object sender, EventArgs e) { nudValue.Enabled = radInput.Checked; + nudValuePMS.Enabled = nudValue.Enabled; + } + + bool warnmulti = false; + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + if (checkBox1.Checked) + { + if (warnmulti == false) + { + AR.UTIL.MsgI("요청시간에 입려한 값이 곱셈 처리 됩니다\n1.5를 입력하면 요청값*1.5가 됩니다"); + warnmulti = true; + } + + + } + + } + + private void checkBox2_CheckedChanged(object sender, EventArgs e) + { + if (checkBox2.Checked) + { + if (warnmulti == false) + { + AR.UTIL.MsgI("요청시간에 입려한 값이 곱셈 처리 됩니다\n1.5를 입력하면 요청값*1.5가 됩니다"); + warnmulti = true; + } + } } } } diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx index 29dcb1b..2d62660 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx @@ -1,17 +1,17 @@  - @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + False + + + False + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 19adddf..5617b2f 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -11255,6 +11255,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnjobgrp; + private global::System.Data.DataColumn columnotPMS; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public JobReportDataTable() { @@ -11576,6 +11578,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn otPMSColumn { + get { + return this.columnotPMS; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -11648,7 +11658,8 @@ namespace FPJ0000 { string otwuid, System.DateTime ottime, string WeekName, - string jobgrp) { + string jobgrp, + double otPMS) { JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); object[] columnValuesArray = new object[] { gcode, @@ -11686,7 +11697,8 @@ namespace FPJ0000 { otwuid, ottime, WeekName, - jobgrp}; + jobgrp, + otPMS}; rowJobReportRow.ItemArray = columnValuesArray; this.Rows.Add(rowJobReportRow); return rowJobReportRow; @@ -11753,6 +11765,7 @@ namespace FPJ0000 { this.columnottime = base.Columns["ottime"]; this.columnWeekName = base.Columns["WeekName"]; this.columnjobgrp = base.Columns["jobgrp"]; + this.columnotPMS = base.Columns["otPMS"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11830,6 +11843,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnWeekName); this.columnjobgrp = new global::System.Data.DataColumn("jobgrp", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnjobgrp); + this.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnotPMS); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columngcode, this.columnidx}, true)); @@ -24600,6 +24615,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double otPMS { + get { + if (this.IsotPMSNull()) { + return 0D; + } + else { + return ((double)(this[this.tableJobReport.otPMSColumn])); + } + } + set { + this[this.tableJobReport.otPMSColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspidxNull() { @@ -24983,6 +25014,18 @@ namespace FPJ0000 { public void SetjobgrpNull() { this[this.tableJobReport.jobgrpColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsotPMSNull() { + return this.IsNull(this.tableJobReport.otPMSColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetotPMSNull() { + this[this.tableJobReport.otPMSColumn] = global::System.Convert.DBNull; + } } /// @@ -42018,18 +42061,100 @@ SELECT idx, gcode, pidx, pseq, pdate, remark, remark2, wuid, wdate, no FROM EETG tableMapping.ColumnMappings.Add("ottime", "ottime"); tableMapping.ColumnMappings.Add("WeekName", "WeekName"); tableMapping.ColumnMappings.Add("jobgrp", "jobgrp"); + tableMapping.ColumnMappings.Add("otPMS", "otPMS"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM JobReport\r\nWHERE (gcode = @Original_gcode) AND (idx = @Original_idx)" + - ""; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [JobReport] WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original" + + "_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) A" + + "ND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND " + + "((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_r" + + "equestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestp" + + "art)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original" + + "_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Origin" + + "al_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_ty" + + "pe)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_rem" + + "ark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND (" + + "(@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND " + + "([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectN" + + "ame = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) A" + + "ND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_pr" + + "ocess = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNu" + + "ll_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart " + + "= 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otE" + + "nd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoin" + + "put = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@" + + "IsNull_kisullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AN" + + "D ((@IsNull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisu" + + "ldiv)) AND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Orig" + + "inal_kisulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_o" + + "t2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Origin" + + "al_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Ori" + + "ginal_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Or" + + "iginal_ottime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @O" + + "riginal_jobgrp)) AND ((@IsNull_otPMS = 1 AND [otPMS] IS NULL) OR ([otPMS] = @Ori" + + "ginal_otPMS)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisullv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisullv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisuldiv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisuldiv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisulamt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisulamt", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisulamt", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot2", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otReason", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otReason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otwuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ottime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobgrp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otPMS", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otPMS", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otPMS", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otPMS", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime], [jobgrp]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime, @jobgrp); -SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime], [jobgrp], [otPMS]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime, @jobgrp, @otPMS); +SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp, otPMS FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -42061,49 +42186,141 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otPMS", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otPMS", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE JobReport -SET gcode = @gcode, pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, - remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag, - otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt, ot2 = @ot2, otReason = @otReason, otwuid = @otwuid, - ottime = @ottime, jobgrp = @jobgrp -WHERE (gcode = @Original_gcode) AND (idx = @Original_idx); -SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = @idx) ORDER BY pdate DESC"; + this._adapter.UpdateCommand.CommandText = "UPDATE [JobReport] SET [gcode] = @gcode, [pidx] = @pidx, [pdate] = @pdate, [uid] " + + "= @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, " + + "[type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, " + + "[import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectNa" + + "me, [ot] = @ot, [process] = @process, [description2] = @description2, [tag] = @t" + + "ag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput, [kisullv] " + + "= @kisullv, [kisuldiv] = @kisuldiv, [kisulamt] = @kisulamt, [ot2] = @ot2, [otRea" + + "son] = @otReason, [otwuid] = @otwuid, [ottime] = @ottime, [jobgrp] = @jobgrp, [o" + + "tPMS] = @otPMS WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AN" + + "D ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@Is" + + "Null_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNul" + + "l_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpa" + + "rt = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AN" + + "D ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package" + + ")) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_statu" + + "s)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND" + + " ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AN" + + "D ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull" + + "_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] " + + "= @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 " + + "AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@Is" + + "Null_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = " + + "1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag =" + + " 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND " + + "[otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 A" + + "ND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 " + + "AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_k" + + "isullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsN" + + "ull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) A" + + "ND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kis" + + "ulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND" + + " ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otRea" + + "son)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_ot" + + "wuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_o" + + "ttime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_" + + "jobgrp)) AND ((@IsNull_otPMS = 1 AND [otPMS] IS NULL) OR ([otPMS] = @Original_ot" + + "PMS)));\r\nSELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type" + + ", description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS usernam" + + "e, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, db" + + "o.getCodeSValue(gcode, \'15\', type) AS svalue, otStart, otEnd, autoinput, kisullv" + + ", kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ot" + + "time, dbo.GetWeekName(pdate) AS WeekName, jobgrp, otPMS FROM JobReport WHERE (gc" + + "ode = @gcode) AND (idx = @idx) ORDER BY pdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot2", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otwuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ottime", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobgrp", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot2", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otPMS", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otPMS", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisullv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisullv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisuldiv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisuldiv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisulamt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisulamt", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisulamt", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot2", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otReason", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otReason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otwuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ottime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobgrp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otPMS", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otPMS", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otPMS", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otPMS", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -42121,7 +42338,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, - otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp + otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp, otPMS FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -42261,7 +42478,37 @@ ORDER BY pdate DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(string Original_gcode, int Original_idx) { + public virtual int Delete( + string Original_gcode, + int Original_idx, + global::System.Nullable Original_pidx, + string Original_pdate, + string Original_uid, + string Original_requestpart, + string Original_package, + string Original_status, + string Original_type, + string Original_remark, + global::System.Nullable Original_hrs, + global::System.Nullable Original_import, + string Original_wuid, + System.DateTime Original_wdate, + string Original_projectName, + global::System.Nullable Original_ot, + string Original_process, + string Original_tag, + global::System.Nullable Original_otStart, + global::System.Nullable Original_otEnd, + global::System.Nullable Original_autoinput, + string Original_kisullv, + string Original_kisuldiv, + global::System.Nullable Original_kisulamt, + global::System.Nullable Original_ot2, + string Original_otReason, + string Original_otwuid, + global::System.Nullable Original_ottime, + string Original_jobgrp, + global::System.Nullable Original_otPMS) { if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } @@ -42269,6 +42516,221 @@ ORDER BY pdate DESC"; this.Adapter.DeleteCommand.Parameters[0].Value = ((string)(Original_gcode)); } this.Adapter.DeleteCommand.Parameters[1].Value = ((int)(Original_idx)); + if ((Original_pidx.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((Original_pdate == null)) { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_pdate)); + } + if ((Original_uid == null)) { + this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[7].Value = ((string)(Original_uid)); + } + if ((Original_requestpart == null)) { + this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[9].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[8].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[9].Value = ((string)(Original_requestpart)); + } + if ((Original_package == null)) { + this.Adapter.DeleteCommand.Parameters[10].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[11].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[10].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[11].Value = ((string)(Original_package)); + } + if ((Original_status == null)) { + this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[13].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[13].Value = ((string)(Original_status)); + } + if ((Original_type == null)) { + this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[15].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[15].Value = ((string)(Original_type)); + } + if ((Original_remark == null)) { + this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[17].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[17].Value = ((string)(Original_remark)); + } + if ((Original_hrs.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[19].Value = ((double)(Original_hrs.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[19].Value = global::System.DBNull.Value; + } + if ((Original_import.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[21].Value = ((bool)(Original_import.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[21].Value = global::System.DBNull.Value; + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_wuid)); + } + this.Adapter.DeleteCommand.Parameters[23].Value = ((System.DateTime)(Original_wdate)); + if ((Original_projectName == null)) { + this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[25].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[25].Value = ((string)(Original_projectName)); + } + if ((Original_ot.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[27].Value = ((double)(Original_ot.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[27].Value = global::System.DBNull.Value; + } + if ((Original_process == null)) { + this.Adapter.DeleteCommand.Parameters[28].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[29].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[29].Value = ((string)(Original_process)); + } + if ((Original_tag == null)) { + this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[31].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[31].Value = ((string)(Original_tag)); + } + if ((Original_otStart.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[33].Value = ((System.DateTime)(Original_otStart.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[33].Value = global::System.DBNull.Value; + } + if ((Original_otEnd.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[35].Value = ((System.DateTime)(Original_otEnd.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[35].Value = global::System.DBNull.Value; + } + if ((Original_autoinput.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[37].Value = ((bool)(Original_autoinput.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[37].Value = global::System.DBNull.Value; + } + if ((Original_kisullv == null)) { + this.Adapter.DeleteCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[39].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[39].Value = ((string)(Original_kisullv)); + } + if ((Original_kisuldiv == null)) { + this.Adapter.DeleteCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[41].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[41].Value = ((string)(Original_kisuldiv)); + } + if ((Original_kisulamt.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[43].Value = ((decimal)(Original_kisulamt.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[43].Value = global::System.DBNull.Value; + } + if ((Original_ot2.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[45].Value = ((double)(Original_ot2.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[44].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[45].Value = global::System.DBNull.Value; + } + if ((Original_otReason == null)) { + this.Adapter.DeleteCommand.Parameters[46].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[47].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[47].Value = ((string)(Original_otReason)); + } + if ((Original_otwuid == null)) { + this.Adapter.DeleteCommand.Parameters[48].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[49].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[49].Value = ((string)(Original_otwuid)); + } + if ((Original_ottime.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[51].Value = ((System.DateTime)(Original_ottime.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[50].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[51].Value = global::System.DBNull.Value; + } + if ((Original_jobgrp == null)) { + this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[53].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[53].Value = ((string)(Original_jobgrp)); + } + if ((Original_otPMS.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[55].Value = ((double)(Original_otPMS.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[55].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -42319,7 +42781,8 @@ ORDER BY pdate DESC"; string otReason, string otwuid, global::System.Nullable ottime, - string jobgrp) { + string jobgrp, + global::System.Nullable otPMS) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -42495,6 +42958,12 @@ ORDER BY pdate DESC"; else { this.Adapter.InsertCommand.Parameters[29].Value = ((string)(jobgrp)); } + if ((otPMS.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[30].Value = ((double)(otPMS.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[30].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -42546,8 +43015,37 @@ ORDER BY pdate DESC"; string otwuid, global::System.Nullable ottime, string jobgrp, + global::System.Nullable otPMS, string Original_gcode, int Original_idx, + global::System.Nullable Original_pidx, + string Original_pdate, + string Original_uid, + string Original_requestpart, + string Original_package, + string Original_status, + string Original_type, + string Original_remark, + global::System.Nullable Original_hrs, + global::System.Nullable Original_import, + string Original_wuid, + System.DateTime Original_wdate, + string Original_projectName, + global::System.Nullable Original_ot, + string Original_process, + string Original_tag, + global::System.Nullable Original_otStart, + global::System.Nullable Original_otEnd, + global::System.Nullable Original_autoinput, + string Original_kisullv, + string Original_kisuldiv, + global::System.Nullable Original_kisulamt, + global::System.Nullable Original_ot2, + string Original_otReason, + string Original_otwuid, + global::System.Nullable Original_ottime, + string Original_jobgrp, + global::System.Nullable Original_otPMS, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -42724,14 +43222,235 @@ ORDER BY pdate DESC"; else { this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(jobgrp)); } + if ((otPMS.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[30].Value = ((double)(otPMS.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_gcode)); } - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); + if ((Original_pidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((int)(Original_pidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + } + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_pdate)); + } + if ((Original_uid == null)) { + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_uid)); + } + if ((Original_requestpart == null)) { + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_requestpart)); + } + if ((Original_package == null)) { + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_package)); + } + if ((Original_status == null)) { + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_status)); + } + if ((Original_type == null)) { + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_type)); + } + if ((Original_remark == null)) { + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_remark)); + } + if ((Original_hrs.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((double)(Original_hrs.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; + } + if ((Original_import.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((bool)(Original_import.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_wuid)); + } + this.Adapter.UpdateCommand.Parameters[54].Value = ((System.DateTime)(Original_wdate)); + if ((Original_projectName == null)) { + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_projectName)); + } + if ((Original_ot.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((double)(Original_ot.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + } + if ((Original_process == null)) { + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_process)); + } + if ((Original_tag == null)) { + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_tag)); + } + if ((Original_otStart.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((System.DateTime)(Original_otStart.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + } + if ((Original_otEnd.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((System.DateTime)(Original_otEnd.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; + } + if ((Original_autoinput.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((bool)(Original_autoinput.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; + } + if ((Original_kisullv == null)) { + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_kisullv)); + } + if ((Original_kisuldiv == null)) { + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((string)(Original_kisuldiv)); + } + if ((Original_kisulamt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((decimal)(Original_kisulamt.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; + } + if ((Original_ot2.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((double)(Original_ot2.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; + } + if ((Original_otReason == null)) { + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_otReason)); + } + if ((Original_otwuid == null)) { + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_otwuid)); + } + if ((Original_ottime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((System.DateTime)(Original_ottime.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; + } + if ((Original_jobgrp == null)) { + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((string)(Original_jobgrp)); + } + if ((Original_otPMS.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((double)(Original_otPMS.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[86].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[87].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -42782,10 +43501,38 @@ ORDER BY pdate DESC"; string otwuid, global::System.Nullable ottime, string jobgrp, + global::System.Nullable otPMS, string Original_gcode, int Original_idx, - int idx) { - return this.Update(Original_gcode, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, description2, tag, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, otwuid, ottime, jobgrp, Original_gcode, Original_idx, idx); + global::System.Nullable Original_pidx, + string Original_pdate, + string Original_uid, + string Original_requestpart, + string Original_package, + string Original_status, + string Original_type, + string Original_remark, + global::System.Nullable Original_hrs, + global::System.Nullable Original_import, + string Original_wuid, + System.DateTime Original_wdate, + string Original_projectName, + global::System.Nullable Original_ot, + string Original_process, + string Original_tag, + global::System.Nullable Original_otStart, + global::System.Nullable Original_otEnd, + global::System.Nullable Original_autoinput, + string Original_kisullv, + string Original_kisuldiv, + global::System.Nullable Original_kisulamt, + global::System.Nullable Original_ot2, + string Original_otReason, + string Original_otwuid, + global::System.Nullable Original_ottime, + string Original_jobgrp, + global::System.Nullable Original_otPMS) { + return this.Update(Original_gcode, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, description2, tag, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, otwuid, ottime, jobgrp, otPMS, Original_gcode, Original_idx, Original_pidx, Original_pdate, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_remark, Original_hrs, Original_import, Original_wuid, Original_wdate, Original_projectName, Original_ot, Original_process, Original_tag, Original_otStart, Original_otEnd, Original_autoinput, Original_kisullv, Original_kisuldiv, Original_kisulamt, Original_ot2, Original_otReason, Original_otwuid, Original_ottime, Original_jobgrp, Original_otPMS, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index b8efdd9..351baad 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -2759,19 +2759,72 @@ ORDER BY name - - DELETE FROM JobReport -WHERE (gcode = @Original_gcode) AND (idx = @Original_idx) + + DELETE FROM [JobReport] WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_kisullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsNull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) AND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kisulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_ottime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)) AND ((@IsNull_otPMS = 1 AND [otPMS] IS NULL) OR ([otPMS] = @Original_otPMS))) - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime], [jobgrp]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime, @jobgrp); -SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC + INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime], [jobgrp], [otPMS]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime, @jobgrp, @otPMS); +SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp, otPMS FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC @@ -2803,6 +2856,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip + @@ -2810,7 +2864,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, - otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp + otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp, otPMS FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC @@ -2823,48 +2877,98 @@ ORDER BY pdate DESC - - UPDATE JobReport -SET gcode = @gcode, pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, - remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag, - otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt, ot2 = @ot2, otReason = @otReason, otwuid = @otwuid, - ottime = @ottime, jobgrp = @jobgrp -WHERE (gcode = @Original_gcode) AND (idx = @Original_idx); -SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = @idx) ORDER BY pdate DESC + + UPDATE [JobReport] SET [gcode] = @gcode, [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName, [ot] = @ot, [process] = @process, [description2] = @description2, [tag] = @tag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput, [kisullv] = @kisullv, [kisuldiv] = @kisuldiv, [kisulamt] = @kisulamt, [ot2] = @ot2, [otReason] = @otReason, [otwuid] = @otwuid, [ottime] = @ottime, [jobgrp] = @jobgrp, [otPMS] = @otPMS WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_kisullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsNull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) AND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kisulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_ottime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)) AND ((@IsNull_otPMS = 1 AND [otPMS] IS NULL) OR ([otPMS] = @Original_otPMS))); +SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp, otPMS FROM JobReport WHERE (gcode = @gcode) AND (idx = @idx) ORDER BY pdate DESC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2907,6 +3011,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip + @@ -3910,7 +4015,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) - + @@ -5491,6 +5596,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt) + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 2e75685..8ab5619 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,30 +4,30 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - + - + diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index 320fb2c..279c527 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -579,6 +579,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnholyot2; + private global::System.Data.DataColumn columnotPMS; + + private global::System.Data.DataColumn columnholyotPMS; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public jobReportDataTable() { @@ -692,6 +696,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn otPMSColumn { + get { + return this.columnotPMS; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn holyotPMSColumn { + get { + return this.columnholyotPMS; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -729,7 +749,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2) { + public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2, double otPMS, double holyotPMS) { jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow())); object[] columnValuesArray = new object[] { yymm, @@ -741,7 +761,9 @@ namespace FPJ0000 { UserProcess, holyot, ot2, - holyot2}; + holyot2, + otPMS, + holyotPMS}; rowjobReportRow.ItemArray = columnValuesArray; this.Rows.Add(rowjobReportRow); return rowjobReportRow; @@ -782,6 +804,8 @@ namespace FPJ0000 { this.columnholyot = base.Columns["holyot"]; this.columnot2 = base.Columns["ot2"]; this.columnholyot2 = base.Columns["holyot2"]; + this.columnotPMS = base.Columns["otPMS"]; + this.columnholyotPMS = base.Columns["holyotPMS"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -807,6 +831,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnot2); this.columnholyot2 = new global::System.Data.DataColumn("holyot2", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnholyot2); + this.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnotPMS); + this.columnholyotPMS = new global::System.Data.DataColumn("holyotPMS", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnholyotPMS); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnyymm, this.columnuid}, true)); @@ -1996,6 +2024,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnotReason; + private global::System.Data.DataColumn columnotPMS; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public vJobReportForUserDataTable() { @@ -2197,6 +2227,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn otPMSColumn { + get { + return this.columnotPMS; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2255,7 +2293,8 @@ namespace FPJ0000 { System.DateTime otStart, System.DateTime otEnd, double ot2, - string otReason) { + string otReason, + double otPMS) { vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow())); object[] columnValuesArray = new object[] { idx, @@ -2278,7 +2317,8 @@ namespace FPJ0000 { otStart, otEnd, ot2, - otReason}; + otReason, + otPMS}; rowvJobReportForUserRow.ItemArray = columnValuesArray; this.Rows.Add(rowvJobReportForUserRow); return rowvJobReportForUserRow; @@ -2329,6 +2369,7 @@ namespace FPJ0000 { this.columnotEnd = base.Columns["otEnd"]; this.columnot2 = base.Columns["ot2"]; this.columnotReason = base.Columns["otReason"]; + this.columnotPMS = base.Columns["otPMS"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2376,6 +2417,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnot2); this.columnotReason = new global::System.Data.DataColumn("otReason", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnotReason); + this.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnotPMS); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AllowDBNull = false; @@ -4291,6 +4334,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double otPMS { + get { + if (this.IsotPMSNull()) { + return 0D; + } + else { + return ((double)(this[this.tablejobReport.otPMSColumn])); + } + } + set { + this[this.tablejobReport.otPMSColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double holyotPMS { + get { + if (this.IsholyotPMSNull()) { + return 0D; + } + else { + return ((double)(this[this.tablejobReport.holyotPMSColumn])); + } + } + set { + this[this.tablejobReport.holyotPMSColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IstotalNull() { @@ -4386,6 +4461,30 @@ namespace FPJ0000 { public void Setholyot2Null() { this[this.tablejobReport.holyot2Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsotPMSNull() { + return this.IsNull(this.tablejobReport.otPMSColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetotPMSNull() { + this[this.tablejobReport.otPMSColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsholyotPMSNull() { + return this.IsNull(this.tablejobReport.holyotPMSColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetholyotPMSNull() { + this[this.tablejobReport.holyotPMSColumn] = global::System.Convert.DBNull; + } } /// @@ -5175,6 +5274,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double otPMS { + get { + try { + return ((double)(this[this.tablevJobReportForUser.otPMSColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otPMS\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablevJobReportForUser.otPMSColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -5402,6 +5517,18 @@ namespace FPJ0000 { public void SetotReasonNull() { this[this.tablevJobReportForUser.otReasonColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsotPMSNull() { + return this.IsNull(this.tablevJobReportForUser.otPMSColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetotPMSNull() { + this[this.tablevJobReportForUser.otPMSColumn] = global::System.Convert.DBNull; + } } /// @@ -6917,6 +7044,8 @@ namespace FPJ0000.dsReportTableAdapters { tableMapping.ColumnMappings.Add("holyot", "holyot"); tableMapping.ColumnMappings.Add("ot2", "ot2"); tableMapping.ColumnMappings.Add("holyot2", "holyot2"); + tableMapping.ColumnMappings.Add("otPMS", "otPMS"); + tableMapping.ColumnMappings.Add("holyotPMS", "holyotPMS"); this._adapter.TableMappings.Add(tableMapping); } @@ -6930,28 +7059,33 @@ namespace FPJ0000.dsReportTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2\r\nFROM" + - " vUserWorkTimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gco" + - "de) AND (ISNULL(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY yymm"; + this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPM" + + "S, holyotPMS\r\nFROM vUserWorkTimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy)" + + " AND (gcode = @gcode) AND (ISNULL(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY " + + "yymm"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2 -FROM vUserWorkTimeList -WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR - ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) -ORDER BY yymm"; + this._commandCollection[1].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7085,6 +7219,78 @@ ORDER BY yymm"; this.Adapter.Fill(dataTable); return dataTable; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByOtPMS(dsReport.jobReportDataTable dataTable, string gcode, string userprocess, string startM, string endM) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((userprocess == null)) { + throw new global::System.ArgumentNullException("userprocess"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess)); + } + if ((startM == null)) { + throw new global::System.ArgumentNullException("startM"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM)); + } + if ((endM == null)) { + throw new global::System.ArgumentNullException("endM"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsReport.jobReportDataTable GetByOtPMS(string gcode, string userprocess, string startM, string endM) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((userprocess == null)) { + throw new global::System.ArgumentNullException("userprocess"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess)); + } + if ((startM == null)) { + throw new global::System.ArgumentNullException("startM"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM)); + } + if ((endM == null)) { + throw new global::System.ArgumentNullException("endM"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM)); + } + dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// @@ -8259,6 +8465,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O tableMapping.ColumnMappings.Add("otEnd", "otEnd"); tableMapping.ColumnMappings.Add("ot2", "ot2"); tableMapping.ColumnMappings.Add("otReason", "otReason"); + tableMapping.ColumnMappings.Add("otPMS", "otPMS"); this._adapter.TableMappings.Add(tableMapping); } @@ -8275,7 +8482,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS FROM vJobReportForUser WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid) ORDER BY pdate"; @@ -8286,8 +8493,8 @@ ORDER BY pdate"; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason -FROM vJobReportForUser with(nolock) + this._commandCollection[1].CommandText = @"SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww +FROM vJobReportForUser WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) ORDER BY pdate"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; @@ -8296,7 +8503,7 @@ ORDER BY pdate"; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + this._commandCollection[2].CommandText = @"SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww FROM vJobReportForUser WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess) ORDER BY pdate"; @@ -8307,7 +8514,7 @@ ORDER BY pdate"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userProcess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + this._commandCollection[3].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS FROM vJobReportForUser_New WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess) ORDER BY pdate"; @@ -8318,7 +8525,7 @@ ORDER BY pdate"; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userProcess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + this._commandCollection[4].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS FROM vJobReportForUser_New WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid) ORDER BY pdate"; diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index 3a36917..bd812c3 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -12,7 +12,7 @@ - SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2 + SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPMS, holyotPMS FROM vUserWorkTimeList WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) ORDER BY yymm @@ -36,16 +36,27 @@ ORDER BY yymm + + - SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2 -FROM vUserWorkTimeList -WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR - ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) -ORDER BY yymm + SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm + + + + + + + + + + + + + SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm @@ -233,7 +244,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS FROM vJobReportForUser WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid) ORDER BY pdate @@ -269,13 +280,14 @@ ORDER BY pdate + - SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason -FROM vJobReportForUser with(nolock) + SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww +FROM vJobReportForUser WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) ORDER BY pdate @@ -289,7 +301,7 @@ ORDER BY pdate - SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww FROM vJobReportForUser WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess) ORDER BY pdate @@ -305,7 +317,7 @@ ORDER BY pdate - SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS FROM vJobReportForUser_New WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess) ORDER BY pdate @@ -321,7 +333,7 @@ ORDER BY pdate - SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason + SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS FROM vJobReportForUser_New WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid) ORDER BY pdate @@ -429,7 +441,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -437,7 +449,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -463,6 +475,8 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch + + @@ -706,6 +720,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch + diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index 813269e..44bba27 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/SubProject/FPJ0000/dsReport.xss @@ -4,15 +4,15 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - - - + + +