otPMS추가(테스트버젼)

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

View File

@@ -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")]

View File

@@ -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":[]}

View File

@@ -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":[]}

View File

@@ -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":[]}

View File

@@ -305,6 +305,7 @@
<None Include="dsReport.xsd">
<Generator>MSDataSetGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>dsReport1.Designer.cs</LastGenOutput>
</None>
<None Include="dsReport.xss">
<DependentUpon>dsReport.xsd</DependentUpon>

View File

@@ -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();

View File

@@ -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;

View File

@@ -123,9 +123,6 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
</metadata>

View File

@@ -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";

View File

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

View File

@@ -123,6 +123,9 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
</metadata>

View File

@@ -748,6 +748,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -786,6 +787,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -801,6 +803,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -839,6 +842,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -854,6 +858,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -892,6 +897,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -946,6 +952,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -1173,6 +1180,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -1212,6 +1220,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -1227,6 +1236,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -1266,6 +1276,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -1321,6 +1332,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>

View File

@@ -81,7 +81,9 @@
<TextRuns>
<TextRun>
<Value>=Sum(Fields!Dr.Value)</Value>
<Style />
<Style>
<Format>N1</Format>
</Style>
</TextRun>
</TextRuns>
<Style />
@@ -112,7 +114,9 @@
<TextRuns>
<TextRun>
<Value>=Sum(Fields!Cr.Value)</Value>
<Style />
<Style>
<Format>N1</Format>
</Style>
</TextRun>
</TextRuns>
<Style />
@@ -229,7 +233,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -262,7 +265,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
</TablixCells>
@@ -661,7 +663,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixHeader>
<TablixMembers>

View File

@@ -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;
}
}
/// <summary>
@@ -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";

View File

@@ -708,7 +708,8 @@ WHERE (gcode = @gcode) AND (empno = @empno)</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<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
<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</CommandText>
@@ -746,6 +747,7 @@ ORDER BY pdate</CommandText>
<Mapping SourceColumn="grade" DataSetColumn="grade" />
<Mapping SourceColumn="indate" DataSetColumn="indate" />
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
</Mappings>
<Sources />
</TableAdapter>
@@ -1120,7 +1122,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
</xs:element>
<xs:element name="extidx" msprop:Generator_ColumnPropNameInTable="extidxColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="extidx" msprop:Generator_UserColumnName="extidx" msprop:Generator_ColumnVarNameInTable="columnextidx" type="xs:int" minOccurs="0" />
<xs:element name="lock" msprop:Generator_ColumnPropNameInTable="lockColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="_lock" msprop:Generator_UserColumnName="lock" msprop:Generator_ColumnVarNameInTable="columnlock" type="xs:boolean" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnVarNameInTable="columniwol" msprop:Generator_UserColumnName="iwol" type="xs:boolean" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -1382,6 +1384,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="otPMS" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="otPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnVarNameInTable="columnotPMS" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="114" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:minutes" ZOrder="10" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Board" ZOrder="9" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />

File diff suppressed because it is too large Load Diff

View File

@@ -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) &lt;&gt; 0) AND
(EETGW_GroupUser.useUserState = 1)
(EETGW_GroupUser.useUserState = 1) AND (Holyday.cate &lt;&gt; 'PMS')
ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -167,6 +167,45 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Holydata_TimePMSTableAdapter" GeneratorDataComponentClassName="Holydata_TimePMSTableAdapter" Name="Holydata_TimePMS" UserDataComponentName="Holydata_TimePMSTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<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) &lt;&gt; 0)
ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="sdate" DataSetColumn="sdate" />
<Mapping SourceColumn="uid" DataSetColumn="uid" />
<Mapping SourceColumn="cate" DataSetColumn="cate" />
<Mapping SourceColumn="jun" DataSetColumn="jun" />
<Mapping SourceColumn="Dr" DataSetColumn="Dr" />
<Mapping SourceColumn="Cr" DataSetColumn="Cr" />
<Mapping SourceColumn="contents" DataSetColumn="contents" />
<Mapping SourceColumn="name" DataSetColumn="name" />
<Mapping SourceColumn="Process" DataSetColumn="Process" />
<Mapping SourceColumn="iwol" DataSetColumn="iwol" />
</Mappings>
<Sources />
</TableAdapter>
</Tables>
<Sources />
</DataSource>
@@ -344,7 +383,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<xs:element name="jan" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
<xs:element name="add" msprop:Generator_ColumnPropNameInTable="addColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="add" msprop:Generator_UserColumnName="add" msprop:Generator_ColumnVarNameInTable="columnadd" type="xs:double" minOccurs="0" />
<xs:element name="rate" msprop:Generator_ColumnPropNameInTable="rateColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rate" msprop:Generator_UserColumnName="rate" msprop:Generator_ColumnVarNameInTable="columnrate" type="xs:double" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:double" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:double" minOccurs="0" />
<xs:element name="drday" msprop:Generator_ColumnPropNameInTable="drdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="drday" msprop:Generator_UserColumnName="drday" msprop:Generator_ColumnVarNameInTable="columndrday" type="xs:double" minOccurs="0" />
<xs:element name="crday" msprop:Generator_ColumnPropNameInTable="crdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="crday" msprop:Generator_UserColumnName="crday" msprop:Generator_ColumnVarNameInTable="columncrday" type="xs:double" minOccurs="0" />
<xs:element name="janday" msprop:Generator_ColumnPropNameInTable="jandayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="janday" msprop:Generator_UserColumnName="janday" msprop:Generator_ColumnVarNameInTable="columnjanday" type="xs:double" minOccurs="0" />
@@ -355,6 +394,60 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Holydata_TimePMS" msprop:Generator_RowClassName="Holydata_TimePMSRow" msprop:Generator_RowEvHandlerName="Holydata_TimePMSRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimePMSRowDeleted" msprop:Generator_RowDeletingName="Holydata_TimePMSRowDeleting" msprop:Generator_RowEvArgName="Holydata_TimePMSRowChangeEvent" msprop:Generator_TablePropName="Holydata_TimePMS" msprop:Generator_RowChangedName="Holydata_TimePMSRowChanged" msprop:Generator_UserTableName="Holydata_TimePMS" msprop:Generator_RowChangingName="Holydata_TimePMSRowChanging" msprop:Generator_TableClassName="Holydata_TimePMSDataTable" msprop:Generator_TableVarName="tableHolydata_TimePMS">
<xs:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
<xs:element name="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnVarNameInTable="columncate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="jun" msdata:ReadOnly="true" msprop:Generator_UserColumnName="jun" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_ColumnVarNameInTable="columnjun" type="xs:double" minOccurs="0" />
<xs:element name="Dr" msprop:Generator_UserColumnName="Dr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" type="xs:double" minOccurs="0" />
<xs:element name="Cr" msprop:Generator_UserColumnName="Cr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" type="xs:double" minOccurs="0" />
<xs:element name="contents" msprop:Generator_UserColumnName="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_ColumnVarNameInTable="columncontents" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -370,5 +463,9 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<xs:field xpath="mstns:uid" />
<xs:field xpath="mstns:cate" />
</xs:unique>
<xs:unique name="Holydata_TimePMS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Holydata_TimePMS" />
<xs:field xpath="mstns:idx" />
</xs:unique>
</xs:element>
</xs:schema>

View File

@@ -6,10 +6,11 @@
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:holydata" ZOrder="1" X="807" Y="56" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:Holydata_Day" ZOrder="4" X="535" Y="46" Height="514" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="446" />
<Shape ID="DesignTable:Holydata_Time" ZOrder="3" X="213" Y="50" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:holydatasum" ZOrder="2" X="0" Y="0" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
<Shape ID="DesignTable:holydata" ZOrder="3" X="1148" Y="73" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:Holydata_Day" ZOrder="1" X="732" Y="58" Height="474" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
<Shape ID="DesignTable:Holydata_Time" ZOrder="5" X="213" Y="50" Height="647" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="579" />
<Shape ID="DesignTable:Holydata_TimePMS" ZOrder="2" X="445" Y="98" Height="628" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:holydatasum" ZOrder="4" X="36" Y="35" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
</Shapes>
<Connectors />
</DiagramLayout>

View File

@@ -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<int> HolyDays,
global::System.Nullable<double> HolyDays,
global::System.Nullable<double> HolyTimes,
global::System.Nullable<bool> 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<int> HolyDays,
global::System.Nullable<double> HolyDays,
global::System.Nullable<double> HolyTimes,
global::System.Nullable<bool> 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;

View File

@@ -39,7 +39,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
<Parameter AllowDbNull="true" AutogeneratedName="HolyReason" ColumnName="HolyReason" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyReason" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyReason" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyBackup" ColumnName="HolyBackup" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyBackup" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyBackup" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyLocation" ColumnName="HolyLocation" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyLocation" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyLocation" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Double" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyTimes" ColumnName="HolyTimes" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@HolyTimes" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyTimes" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sendmail" ColumnName="sendmail" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@sendmail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="sendmail" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="stime" ColumnName="stime" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@stime" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="stime" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -89,7 +89,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
<Parameter AllowDbNull="true" AutogeneratedName="HolyReason" ColumnName="HolyReason" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyReason" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyReason" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyBackup" ColumnName="HolyBackup" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyBackup" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyBackup" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyLocation" ColumnName="HolyLocation" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyLocation" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyLocation" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Double" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyTimes" ColumnName="HolyTimes" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@HolyTimes" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyTimes" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sendmail" ColumnName="sendmail" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@sendmail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="sendmail" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="stime" ColumnName="stime" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@stime" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="stime" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -144,7 +144,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
<xs:element name="EETGW_HolydayRequest" msprop:Generator_RowEvHandlerName="EETGW_HolydayRequestRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_HolydayRequestRowDeleted" msprop:Generator_RowDeletingName="EETGW_HolydayRequestRowDeleting" msprop:Generator_RowEvArgName="EETGW_HolydayRequestRowChangeEvent" msprop:Generator_TablePropName="EETGW_HolydayRequest" msprop:Generator_RowChangedName="EETGW_HolydayRequestRowChanged" msprop:Generator_UserTableName="EETGW_HolydayRequest" msprop:Generator_RowChangingName="EETGW_HolydayRequestRowChanging" msprop:Generator_RowClassName="EETGW_HolydayRequestRow" msprop:Generator_TableClassName="EETGW_HolydayRequestDataTable" msprop:Generator_TableVarName="tableEETGW_HolydayRequest">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -187,14 +187,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
<xs:element name="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
<xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
<xs:element name="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_UserColumnName="dept" msprop:Generator_ColumnVarNameInTable="columndept" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -259,7 +259,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="HolyDays" msprop:Generator_ColumnPropNameInTable="HolyDaysColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyDays" msprop:Generator_UserColumnName="HolyDays" msprop:Generator_ColumnVarNameInTable="columnHolyDays" type="xs:int" minOccurs="0" />
<xs:element name="HolyDays" msprop:Generator_ColumnPropNameInTable="HolyDaysColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyDays" msprop:Generator_UserColumnName="HolyDays" msprop:Generator_ColumnVarNameInTable="columnHolyDays" type="xs:double" minOccurs="0" />
<xs:element name="HolyTimes" msprop:Generator_ColumnPropNameInTable="HolyTimesColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyTimes" msprop:Generator_UserColumnName="HolyTimes" msprop:Generator_ColumnVarNameInTable="columnHolyTimes" type="xs:double" minOccurs="0" />
<xs:element name="sendmail" msprop:Generator_ColumnPropNameInTable="sendmailColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sendmail" msprop:Generator_UserColumnName="sendmail" msprop:Generator_ColumnVarNameInTable="columnsendmail" type="xs:boolean" minOccurs="0" />
<xs:element name="stime" msprop:Generator_ColumnPropNameInTable="stimeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="stime" msprop:Generator_UserColumnName="stime" msprop:Generator_ColumnVarNameInTable="columnstime" minOccurs="0">
@@ -276,14 +276,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="conf_id" msprop:Generator_ColumnPropNameInRow="conf_id" msprop:Generator_ColumnPropNameInTable="conf_idColumn" msprop:Generator_ColumnVarNameInTable="columnconf_id" msprop:Generator_UserColumnName="conf_id" minOccurs="0">
<xs:element name="conf_id" msprop:Generator_ColumnPropNameInTable="conf_idColumn" msprop:Generator_ColumnPropNameInRow="conf_id" msprop:Generator_UserColumnName="conf_id" msprop:Generator_ColumnVarNameInTable="columnconf_id" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="conf_time" msprop:Generator_ColumnPropNameInRow="conf_time" msprop:Generator_ColumnPropNameInTable="conf_timeColumn" msprop:Generator_ColumnVarNameInTable="columnconf_time" msprop:Generator_UserColumnName="conf_time" type="xs:dateTime" minOccurs="0" />
<xs:element name="conf_time" msprop:Generator_ColumnPropNameInTable="conf_timeColumn" msprop:Generator_ColumnPropNameInRow="conf_time" msprop:Generator_UserColumnName="conf_time" msprop:Generator_ColumnVarNameInTable="columnconf_time" type="xs:dateTime" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -28,160 +28,186 @@
/// </summary>
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;
}
}

View File

@@ -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<string> rowdata = new List<string>();
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<string> rowdata = new List<string>();
rowdata.Add(drName.UserProcess);
rowdata.Add(drName.uname);
rowdata.Add(drName.uid);
List<Boolean> high = new List<bool>();
List<Boolean> low = new List<bool>();
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<Boolean> high = new List<bool>();
List<Boolean> low = new List<bool>();
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<object> rowdata2 = new List<object>();
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<object> rowdata2 = new List<object>();
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);
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->

View File

@@ -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);

View File

@@ -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)
{
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->

File diff suppressed because it is too large Load Diff

View File

@@ -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<dsPRJ.JobReportRow> rows = new List<dsPRJ.JobReportRow>();
List<int> rowindex = new List<int>();
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)
{
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
@@ -181,20 +178,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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=
</value>
</data>
<data name="btConf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -227,50 +224,47 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>393, 17</value>
<value>261, 17</value>
</metadata>
<data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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==
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -313,13 +307,7 @@
<metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="WeekName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="otPMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -329,6 +317,6 @@
<value>186, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>499, 17</value>
<value>368, 17</value>
</metadata>
</root>

View File

@@ -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;
}
}

View File

@@ -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();
}
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -132,6 +132,9 @@
<metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otPMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

View File

@@ -29,33 +29,73 @@ namespace FPJ0000.OtConfirm
/// </summary>
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;
}
}

View File

@@ -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;
}
}
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -117,4 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>

View File

@@ -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;
}
}
/// <summary>
@@ -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<int> 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<double> Original_hrs,
global::System.Nullable<bool> Original_import,
string Original_wuid,
System.DateTime Original_wdate,
string Original_projectName,
global::System.Nullable<double> Original_ot,
string Original_process,
string Original_tag,
global::System.Nullable<global::System.DateTime> Original_otStart,
global::System.Nullable<global::System.DateTime> Original_otEnd,
global::System.Nullable<bool> Original_autoinput,
string Original_kisullv,
string Original_kisuldiv,
global::System.Nullable<decimal> Original_kisulamt,
global::System.Nullable<double> Original_ot2,
string Original_otReason,
string Original_otwuid,
global::System.Nullable<global::System.DateTime> Original_ottime,
string Original_jobgrp,
global::System.Nullable<double> 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<global::System.DateTime> ottime,
string jobgrp) {
string jobgrp,
global::System.Nullable<double> 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<global::System.DateTime> ottime,
string jobgrp,
global::System.Nullable<double> otPMS,
string Original_gcode,
int Original_idx,
global::System.Nullable<int> 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<double> Original_hrs,
global::System.Nullable<bool> Original_import,
string Original_wuid,
System.DateTime Original_wdate,
string Original_projectName,
global::System.Nullable<double> Original_ot,
string Original_process,
string Original_tag,
global::System.Nullable<global::System.DateTime> Original_otStart,
global::System.Nullable<global::System.DateTime> Original_otEnd,
global::System.Nullable<bool> Original_autoinput,
string Original_kisullv,
string Original_kisuldiv,
global::System.Nullable<decimal> Original_kisulamt,
global::System.Nullable<double> Original_ot2,
string Original_otReason,
string Original_otwuid,
global::System.Nullable<global::System.DateTime> Original_ottime,
string Original_jobgrp,
global::System.Nullable<double> 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<global::System.DateTime> ottime,
string jobgrp,
global::System.Nullable<double> 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<int> 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<double> Original_hrs,
global::System.Nullable<bool> Original_import,
string Original_wuid,
System.DateTime Original_wdate,
string Original_projectName,
global::System.Nullable<double> Original_ot,
string Original_process,
string Original_tag,
global::System.Nullable<global::System.DateTime> Original_otStart,
global::System.Nullable<global::System.DateTime> Original_otEnd,
global::System.Nullable<bool> Original_autoinput,
string Original_kisullv,
string Original_kisuldiv,
global::System.Nullable<decimal> Original_kisulamt,
global::System.Nullable<double> Original_ot2,
string Original_otReason,
string Original_otwuid,
global::System.Nullable<global::System.DateTime> Original_ottime,
string Original_jobgrp,
global::System.Nullable<double> 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()]

View File

@@ -2759,19 +2759,72 @@ ORDER BY name</CommandText>
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>DELETE FROM JobReport
WHERE (gcode = @Original_gcode) AND (idx = @Original_idx)</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>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)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_requestpart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_package" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_status" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_hrs" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_tag" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otStart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otEnd" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_autoinput" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisullv" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisuldiv" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisulamt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot2" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otReason" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otwuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ottime" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobgrp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otPMS" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otPMS" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_otPMS" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="otPMS" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<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</CommandText>
<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</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2803,6 +2856,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@otPMS" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="otPMS" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
@@ -2810,7 +2864,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
<DbCommand CommandType="Text" ModifiedByUser="false">
<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</CommandText>
@@ -2823,48 +2877,98 @@ ORDER BY pdate DESC</CommandText>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<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</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="false">
<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, [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</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="tag" ColumnName="tag" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="otStart" ColumnName="otStart" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="otEnd" ColumnName="otEnd" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="autoinput" ColumnName="autoinput" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="kisullv" ColumnName="kisullv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="kisuldiv" ColumnName="kisuldiv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="kisulamt" ColumnName="kisulamt" DataSourceName="EE.dbo.JobReport" DataTypeServer="decimal(18, 3)" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="9" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ot2" ColumnName="ot2" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="otReason" ColumnName="otReason" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="otwuid" ColumnName="otwuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ottime" ColumnName="ottime" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="jobgrp" ColumnName="jobgrp" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@otPMS" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="otPMS" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_requestpart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_package" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_status" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_hrs" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_tag" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otStart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otEnd" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_autoinput" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisullv" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisuldiv" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisulamt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot2" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otReason" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otwuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ottime" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobgrp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otPMS" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otPMS" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_otPMS" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="otPMS" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</UpdateCommand>
@@ -2907,6 +3011,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
<Mapping SourceColumn="ottime" DataSetColumn="ottime" />
<Mapping SourceColumn="WeekName" DataSetColumn="WeekName" />
<Mapping SourceColumn="jobgrp" DataSetColumn="jobgrp" />
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckOt2Input" Modifier="Public" Name="CheckOt2Input" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CheckOt2Input">
@@ -3910,7 +4015,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt)
<xs:element name="bmajoritem" msprop:Generator_ColumnPropNameInTable="bmajoritemColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bmajoritem" msprop:Generator_UserColumnName="bmajoritem" msprop:Generator_ColumnVarNameInTable="columnbmajoritem" type="xs:boolean" minOccurs="0" />
<xs:element name="lastSchNo" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="lastSchNoColumn" msprop:Generator_ColumnPropNameInRow="lastSchNo" msprop:Generator_UserColumnName="lastSchNo" msprop:Generator_ColumnVarNameInTable="columnlastSchNo" type="xs:int" minOccurs="0" />
<xs:element name="cramount" msprop:Generator_ColumnPropNameInTable="cramountColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="cramount" msprop:Generator_UserColumnName="cramount" msprop:Generator_ColumnVarNameInTable="columncramount" type="xs:decimal" minOccurs="0" />
<xs:element name="panelimage" msprop:Generator_ColumnPropNameInRow="panelimage" msprop:Generator_ColumnPropNameInTable="panelimageColumn" msprop:Generator_ColumnVarNameInTable="columnpanelimage" msprop:Generator_UserColumnName="panelimage" type="xs:base64Binary" minOccurs="0" />
<xs:element name="panelimage" msprop:Generator_UserColumnName="panelimage" msprop:Generator_ColumnPropNameInTable="panelimageColumn" msprop:Generator_ColumnPropNameInRow="panelimage" msprop:Generator_ColumnVarNameInTable="columnpanelimage" type="xs:base64Binary" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -5491,6 +5596,7 @@ WHERE (gcode = @gcode) AND (cate = @cate) AND (uid = @uit) AND (sdate = @chkdt)
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="otPMS" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:Generator_ColumnVarNameInTable="columnotPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnPropNameInRow="otPMS" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -4,30 +4,30 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="166" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="794" ViewPortY="177" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Projects" ZOrder="1" X="386" Y="651" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Projects" ZOrder="2" X="386" Y="651" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ProjectsIOMap" ZOrder="18" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:ProjectsMailList" ZOrder="24" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ProjectsPart" ZOrder="12" X="973" Y="68" Height="381" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:ProjectsHistory" ZOrder="23" X="1881" Y="31" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:SPMaster" ZOrder="19" X="365" Y="305" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_Note" ZOrder="21" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:EETGW_SaveCost" ZOrder="4" X="75" Y="490" Height="324" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_SaveCost" ZOrder="5" X="75" Y="490" Height="324" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ProjectPartStatus" ZOrder="13" X="1081" Y="466" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_ProjecthistoryD" ZOrder="20" X="680" Y="203" Height="248" Width="283" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="16" X="89" Y="808" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="15" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="8" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="3" X="1574" Y="32" Height="324" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="4" X="1574" Y="32" Height="324" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_ProjectReson" ZOrder="17" X="1561" Y="590" Height="267" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:vJobReportForUserList" ZOrder="14" X="590" Y="464" Height="115" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:JobReport" ZOrder="5" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:vEETGW_Project_LayoutList" ZOrder="11" X="1257" Y="353" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
<Shape ID="DesignTable:EETGW_Project_Layout" ZOrder="10" X="1200" Y="77" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
<Shape ID="DesignTable:EETGW_DocuForm" ZOrder="7" X="358" Y="649" Height="229" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:Auth" ZOrder="6" X="1552" Y="450" Height="324" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_ProjectsSchedule_NoList" ZOrder="2" X="1362" Y="121" Height="96" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:EETGW_ProjectsSchedule_NoList" ZOrder="3" X="1362" Y="121" Height="96" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:SCTable" ZOrder="9" X="76" Y="362" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="22" X="2138" Y="50" Height="105" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
</Shapes>

View File

@@ -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;
}
}
/// <summary>
@@ -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;
}
}
/// <summary>
@@ -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;
}
}
/// <summary>
@@ -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";

View File

@@ -12,7 +12,7 @@
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
<CommandText>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</CommandText>
@@ -36,16 +36,27 @@ ORDER BY yymm</CommandText>
<Mapping SourceColumn="holyot" DataSetColumn="holyot" />
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
<Mapping SourceColumn="holyot2" DataSetColumn="holyot2" />
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
<Mapping SourceColumn="holyotPMS" DataSetColumn="holyotPMS" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByOt2" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByOt2" GeneratorSourceName="FillByOt2" GetMethodModifier="Public" GetMethodName="GetByOt2" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByOt2" UserSourceName="FillByOt2">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<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) &gt; 0 OR
ISNULL(holyot2, 0) &gt; 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
ORDER BY yymm</CommandText>
<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) &gt; 0 OR ISNULL(holyot2, 0) &gt; 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="startM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@startM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="endM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@endM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByOtPMS" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByOtPMS" GeneratorSourceName="FillByOtPMS" GetMethodModifier="Public" GetMethodName="GetByOtPMS" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByOtPMS" UserSourceName="FillByOtPMS">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<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) &gt; 0 OR ISNULL(holyotPMS, 0) &gt; 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -233,7 +244,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
<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</CommandText>
@@ -269,13 +280,14 @@ ORDER BY pdate</CommandText>
<Mapping SourceColumn="otEnd" DataSetColumn="otEnd" />
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByDate" GeneratorSourceName="FillByDate" GetMethodModifier="Public" GetMethodName="GetByDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByDate" UserSourceName="FillByDate">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<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)
<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</CommandText>
<Parameters>
@@ -289,7 +301,7 @@ ORDER BY pdate</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByProcess" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByProcess" GeneratorSourceName="FillByProcess" GetMethodModifier="Public" GetMethodName="GetByProcess" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByProcess" UserSourceName="FillByProcess">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
<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</CommandText>
@@ -305,7 +317,7 @@ ORDER BY pdate</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser_New" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByProcess_New" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByProcess_New" GeneratorSourceName="FillByProcess_New" GetMethodModifier="Public" GetMethodName="GetByProcess_New" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByProcess_New" UserSourceName="FillByProcess_New">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
<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</CommandText>
@@ -321,7 +333,7 @@ ORDER BY pdate</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser_New" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillNew" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataNew" GeneratorSourceName="FillNew" GetMethodModifier="Public" GetMethodName="GetDataNew" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataNew" UserSourceName="FillNew">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
<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</CommandText>
@@ -429,7 +441,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
<xs:element name="jobReport" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport">
<xs:complexType>
<xs:sequence>
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_UserColumnName="yymm" msprop:Generator_ColumnVarNameInTable="columnyymm">
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_UserColumnName="yymm" msprop:Generator_ColumnVarNameInTable="columnyymm" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="22" />
@@ -437,7 +449,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
</xs:simpleType>
</xs:element>
<xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_UserColumnName="total" msprop:Generator_ColumnVarNameInTable="columntotal" type="xs:int" minOccurs="0" />
<xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid">
<xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
@@ -463,6 +475,8 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
<xs:element name="holyot" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot" msprop:Generator_UserColumnName="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" type="xs:double" minOccurs="0" />
<xs:element name="ot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_UserColumnName="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" type="xs:double" minOccurs="0" />
<xs:element name="holyot2" msprop:Generator_ColumnPropNameInTable="holyot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot2" msprop:Generator_UserColumnName="holyot2" msprop:Generator_ColumnVarNameInTable="columnholyot2" type="xs:double" minOccurs="0" />
<xs:element name="otPMS" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:Generator_ColumnVarNameInTable="columnotPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnPropNameInRow="otPMS" type="xs:double" minOccurs="0" />
<xs:element name="holyotPMS" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="holyotPMSColumn" msprop:Generator_ColumnVarNameInTable="columnholyotPMS" msprop:Generator_UserColumnName="holyotPMS" msprop:Generator_ColumnPropNameInRow="holyotPMS" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -706,6 +720,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="otPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:Generator_ColumnPropNameInRow="otPMS" msprop:Generator_ColumnVarNameInTable="columnotPMS" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -4,15 +4,15 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="118" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="5" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:jobReport" ZOrder="1" X="384" Y="301" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="9" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="7" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="118" Y="436" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobProjectTimes" ZOrder="4" X="624" Y="600" Height="267" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="199" />
<Shape ID="DesignTable:UserScheduleTable" ZOrder="3" X="0" Y="0" Height="305" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="118" Y="436" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobProjectTimes" ZOrder="5" X="624" Y="600" Height="267" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="199" />
<Shape ID="DesignTable:UserScheduleTable" ZOrder="4" X="0" Y="0" Height="305" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PartSummary" ZOrder="8" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:K5DailyForm" ZOrder="6" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
</Shapes>