This commit is contained in:
chi
2021-12-21 09:52:32 +09:00
parent 4cf24cedaf
commit 7e6f9e4bcb
36 changed files with 5115 additions and 773 deletions

View File

@@ -540,6 +540,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnholyot;
private global::System.Data.DataColumn columnot2;
private global::System.Data.DataColumn columnholyot2;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportDataTable() {
@@ -637,6 +641,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn ot2Column {
get {
return this.columnot2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn holyot2Column {
get {
return this.columnholyot2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -674,7 +694,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, double holyot) {
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2) {
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
yymm,
@@ -684,7 +704,9 @@ namespace FPJ0000 {
hrs,
ot,
UserProcess,
holyot};
holyot,
ot2,
holyot2};
rowjobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowjobReportRow);
return rowjobReportRow;
@@ -723,6 +745,8 @@ namespace FPJ0000 {
this.columnot = base.Columns["ot"];
this.columnUserProcess = base.Columns["UserProcess"];
this.columnholyot = base.Columns["holyot"];
this.columnot2 = base.Columns["ot2"];
this.columnholyot2 = base.Columns["holyot2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -744,6 +768,10 @@ namespace FPJ0000 {
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.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element);
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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnyymm,
this.columnuid}, true));
@@ -1491,6 +1519,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columngcode;
private global::System.Data.DataColumn columnindate;
private global::System.Data.DataColumn columnoutdate;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ProcessUserListDataTable() {
@@ -1548,6 +1580,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn indateColumn {
get {
return this.columnindate;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn outdateColumn {
get {
return this.columnoutdate;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1585,12 +1633,14 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode) {
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode, string indate, string outdate) {
ProcessUserListRow rowProcessUserListRow = ((ProcessUserListRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
id,
name,
gcode};
gcode,
indate,
outdate};
rowProcessUserListRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProcessUserListRow);
return rowProcessUserListRow;
@@ -1616,6 +1666,8 @@ namespace FPJ0000 {
this.columnid = base.Columns["id"];
this.columnname = base.Columns["name"];
this.columngcode = base.Columns["gcode"];
this.columnindate = base.Columns["indate"];
this.columnoutdate = base.Columns["outdate"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1627,6 +1679,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnname);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.columnindate = new global::System.Data.DataColumn("indate", typeof(string), null, global::System.Data.MappingType.Element);
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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnid}, false));
this.columnid.Unique = true;
@@ -1634,6 +1690,8 @@ namespace FPJ0000 {
this.columnname.MaxLength = 100;
this.columngcode.AllowDBNull = false;
this.columngcode.MaxLength = 10;
this.columnindate.MaxLength = 20;
this.columnoutdate.MaxLength = 20;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2138,6 +2196,14 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnww;
private global::System.Data.DataColumn columnotStart;
private global::System.Data.DataColumn columnotEnd;
private global::System.Data.DataColumn columnot2;
private global::System.Data.DataColumn columnotReason;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public vJobReportForUserDataTable() {
@@ -2307,6 +2373,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn otStartColumn {
get {
return this.columnotStart;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn otEndColumn {
get {
return this.columnotEnd;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn ot2Column {
get {
return this.columnot2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn otReasonColumn {
get {
return this.columnotReason;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2361,7 +2459,11 @@ namespace FPJ0000 {
string status,
string projectName,
string description,
string ww) {
string ww,
System.DateTime otStart,
System.DateTime otEnd,
double ot2,
string otReason) {
vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
idx,
@@ -2380,7 +2482,11 @@ namespace FPJ0000 {
status,
projectName,
description,
ww};
ww,
otStart,
otEnd,
ot2,
otReason};
rowvJobReportForUserRow.ItemArray = columnValuesArray;
this.Rows.Add(rowvJobReportForUserRow);
return rowvJobReportForUserRow;
@@ -2427,6 +2533,10 @@ namespace FPJ0000 {
this.columnprojectName = base.Columns["projectName"];
this.columndescription = base.Columns["description"];
this.columnww = base.Columns["ww"];
this.columnotStart = base.Columns["otStart"];
this.columnotEnd = base.Columns["otEnd"];
this.columnot2 = base.Columns["ot2"];
this.columnotReason = base.Columns["otReason"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2466,6 +2576,14 @@ namespace FPJ0000 {
base.Columns.Add(this.columndescription);
this.columnww = new global::System.Data.DataColumn("ww", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnww);
this.columnotStart = new global::System.Data.DataColumn("otStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotStart);
this.columnotEnd = new global::System.Data.DataColumn("otEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotEnd);
this.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element);
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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AllowDBNull = false;
@@ -2487,6 +2605,7 @@ namespace FPJ0000 {
this.columndescription.MaxLength = 2147483647;
this.columnww.ReadOnly = true;
this.columnww.MaxLength = 6;
this.columnotReason.MaxLength = 255;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3430,6 +3549,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double ot2 {
get {
if (this.Isot2Null()) {
return 0D;
}
else {
return ((double)(this[this.tablejobReport.ot2Column]));
}
}
set {
this[this.tablejobReport.ot2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double holyot2 {
get {
if (this.Isholyot2Null()) {
return 0D;
}
else {
return ((double)(this[this.tablejobReport.holyot2Column]));
}
}
set {
this[this.tablejobReport.holyot2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IstotalNull() {
@@ -3501,6 +3652,30 @@ namespace FPJ0000 {
public void SetholyotNull() {
this[this.tablejobReport.holyotColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isot2Null() {
return this.IsNull(this.tablejobReport.ot2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void Setot2Null() {
this[this.tablejobReport.ot2Column] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isholyot2Null() {
return this.IsNull(this.tablejobReport.holyot2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void Setholyot2Null() {
this[this.tablejobReport.holyot2Column] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -3735,6 +3910,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string indate {
get {
if (this.IsindateNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProcessUserList.indateColumn]));
}
}
set {
this[this.tableProcessUserList.indateColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string outdate {
get {
if (this.IsoutdateNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProcessUserList.outdateColumn]));
}
}
set {
this[this.tableProcessUserList.outdateColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsidNull() {
@@ -3758,6 +3965,30 @@ namespace FPJ0000 {
public void SetnameNull() {
this[this.tableProcessUserList.nameColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsindateNull() {
return this.IsNull(this.tableProcessUserList.indateColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetindateNull() {
this[this.tableProcessUserList.indateColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsoutdateNull() {
return this.IsNull(this.tableProcessUserList.outdateColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetoutdateNull() {
this[this.tableProcessUserList.outdateColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -4168,6 +4399,70 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public System.DateTime otStart {
get {
try {
return ((global::System.DateTime)(this[this.tablevJobReportForUser.otStartColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otStart\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tablevJobReportForUser.otStartColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public System.DateTime otEnd {
get {
try {
return ((global::System.DateTime)(this[this.tablevJobReportForUser.otEndColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otEnd\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tablevJobReportForUser.otEndColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double ot2 {
get {
if (this.Isot2Null()) {
return 0D;
}
else {
return ((double)(this[this.tablevJobReportForUser.ot2Column]));
}
}
set {
this[this.tablevJobReportForUser.ot2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string otReason {
get {
if (this.IsotReasonNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tablevJobReportForUser.otReasonColumn]));
}
}
set {
this[this.tablevJobReportForUser.otReasonColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IspdateNull() {
@@ -4347,6 +4642,54 @@ namespace FPJ0000 {
public void SetwwNull() {
this[this.tablevJobReportForUser.wwColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsotStartNull() {
return this.IsNull(this.tablevJobReportForUser.otStartColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetotStartNull() {
this[this.tablevJobReportForUser.otStartColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsotEndNull() {
return this.IsNull(this.tablevJobReportForUser.otEndColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetotEndNull() {
this[this.tablevJobReportForUser.otEndColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isot2Null() {
return this.IsNull(this.tablevJobReportForUser.ot2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void Setot2Null() {
this[this.tablevJobReportForUser.ot2Column] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsotReasonNull() {
return this.IsNull(this.tablevJobReportForUser.otReasonColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetotReasonNull() {
this[this.tablevJobReportForUser.otReasonColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -5108,6 +5451,8 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
tableMapping.ColumnMappings.Add("holyot", "holyot");
tableMapping.ColumnMappings.Add("ot2", "ot2");
tableMapping.ColumnMappings.Add("holyot2", "holyot2");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -5121,16 +5466,27 @@ namespace FPJ0000.dsReportTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
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\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].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].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 (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
ORDER BY yymm";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].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[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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5192,6 +5548,66 @@ namespace FPJ0000.dsReportTableAdapters {
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
}
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 ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
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", "16.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 GetByOt2(string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
}
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 ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
}
/// <summary>
@@ -5716,6 +6132,8 @@ ORDER BY processs, JobReport.pdate, uname";
tableMapping.ColumnMappings.Add("id", "id");
tableMapping.ColumnMappings.Add("name", "name");
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("indate", "indate");
tableMapping.ColumnMappings.Add("outdate", "outdate");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -5759,12 +6177,12 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
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 Users.id, Users.name, JobReport.gcode
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
FROM EETGW_GroupUser INNER JOIN
JobReport ON EETGW_GroupUser.gcode = JobReport.gcode AND EETGW_GroupUser.uid = JobReport.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id
WHERE (Users.id <> 'dev') AND (Users.id <> 'test') AND (EETGW_GroupUser.Process LIKE @process) AND (JobReport.gcode = @gcode)
GROUP BY Users.id, Users.name, JobReport.gcode
GROUP BY Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
ORDER BY Users.name";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].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, "", "", ""));
@@ -6539,6 +6957,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
tableMapping.ColumnMappings.Add("projectName", "projectName");
tableMapping.ColumnMappings.Add("description", "description");
tableMapping.ColumnMappings.Add("ww", "ww");
tableMapping.ColumnMappings.Add("otStart", "otStart");
tableMapping.ColumnMappings.Add("otEnd", "otEnd");
tableMapping.ColumnMappings.Add("ot2", "ot2");
tableMapping.ColumnMappings.Add("otReason", "otReason");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -6555,10 +6977,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
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\r\nFROM vJobReport" +
"ForUser\r\nWHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)\r\nORDER BY pdate" +
"";
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
FROM vJobReportForUser
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
ORDER BY pdate";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));