This commit is contained in:
chikyun.kim
2019-08-23 18:08:04 +09:00
parent 63dffe62ef
commit 6a90be2e6d
26 changed files with 933 additions and 436 deletions

View File

@@ -1451,16 +1451,17 @@ namespace FPJ0000.dsReportTableAdapters {
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\r\nFROM vUserWorkTimeList\r\nWHERE (SUB" +
"STRING(yymm, 1, 4) = @yyyy)\r\nORDER BY yymm";
"STRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)\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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy) {
public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
@@ -1468,6 +1469,12 @@ namespace FPJ0000.dsReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -1479,7 +1486,7 @@ namespace FPJ0000.dsReportTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsReport.jobReportDataTable GetData(string yyyy) {
public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
@@ -1487,6 +1494,12 @@ namespace FPJ0000.dsReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -1636,17 +1649,18 @@ namespace FPJ0000.dsReportTableAdapters {
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT uid, dbo.getUserName(uid) AS uname, pdate, SUM(hrs) AS hrs, SUM(ot) AS ot" +
"\r\nFROM JobReport\r\nWHERE (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid <> \'\')\r\nG" +
"ROUP BY uid, pdate\r\nORDER BY pdate, uname";
"\r\nFROM JobReport\r\nWHERE (SUBSTRING(pdate, 1, 7) = @yymm) AND (uid <> \'\') AN" +
"D (gcode = @gcode)\r\nGROUP BY uid, pdate\r\nORDER BY pdate, uname";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yymm", 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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm) {
public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yymm == null)) {
throw new global::System.ArgumentNullException("yymm");
@@ -1654,6 +1668,12 @@ namespace FPJ0000.dsReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yymm));
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -1665,7 +1685,7 @@ namespace FPJ0000.dsReportTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsReport.JobReportDayDataTable GetData(string yymm) {
public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yymm == null)) {
throw new global::System.ArgumentNullException("yymm");
@@ -1673,6 +1693,12 @@ namespace FPJ0000.dsReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yymm));
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
dsReport.JobReportDayDataTable dataTable = new dsReport.JobReportDayDataTable();
this.Adapter.Fill(dataTable);
return dataTable;