Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

업무일지 시간 요약화면에 휴일 데이터를 추가 함.

Browse Source
This commit is contained in:
chi
2021-06-25 14:18:23 +09:00
parent 139c48721f
commit acc368d065
24 changed files with 712 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -538,6 +538,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnUserProcess;
private global::System.Data.DataColumn columnholyot;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportDataTable() {
@@ -627,6 +629,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn holyotColumn {
get {
return this.columnholyot;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -664,7 +674,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess) {
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot) {
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
yymm,
@@ -673,7 +683,8 @@ namespace FPJ0000 {
uname,
hrs,
ot,
UserProcess};
UserProcess,
holyot};
rowjobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowjobReportRow);
return rowjobReportRow;
@@ -711,6 +722,7 @@ namespace FPJ0000 {
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnUserProcess = base.Columns["UserProcess"];
this.columnholyot = base.Columns["holyot"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -730,6 +742,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnot);
this.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserProcess);
this.columnholyot = new global::System.Data.DataColumn("holyot", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnholyot);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnyymm,
this.columnuid}, true));
@@ -3400,6 +3414,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double holyot {
get {
if (this.IsholyotNull()) {
return 0D;
}
else {
return ((double)(this[this.tablejobReport.holyotColumn]));
}
}
set {
this[this.tablejobReport.holyotColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IstotalNull() {
@@ -3459,6 +3489,18 @@ namespace FPJ0000 {
public void SetUserProcessNull() {
this[this.tablejobReport.UserProcessColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsholyotNull() {
return this.IsNull(this.tablejobReport.holyotColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetholyotNull() {
this[this.tablejobReport.holyotColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -5065,6 +5107,7 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
tableMapping.ColumnMappings.Add("holyot", "holyot");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -5081,9 +5124,9 @@ namespace FPJ0000.dsReportTableAdapters {
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 yymm, total, uid, uname, hrs, ot, UserProcess\r\nFROM vUserWorkTimeList" +
"\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserPr" +
"ocess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot\r\nFROM vUserWork" +
"TimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNUL" +
"L(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, "", "", ""));