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

..

Browse Source
This commit is contained in:
chi
2022-02-02 17:26:11 +09:00
parent 6bf9641682
commit e5df085788
9 changed files with 182 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -929,6 +929,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnprocesss;
private global::System.Data.DataColumn columnjobtype;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobReportDayDataTable() {
@@ -1010,6 +1012,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 jobtypeColumn {
get {
return this.columnjobtype;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1047,7 +1057,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs) {
public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs, string jobtype) {
JobReportDayRow rowJobReportDayRow = ((JobReportDayRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
uid,
@@ -1055,7 +1065,8 @@ namespace FPJ0000 {
pdate,
hrs,
ot,
processs};
processs,
jobtype};
rowJobReportDayRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportDayRow);
return rowJobReportDayRow;
@@ -1092,6 +1103,7 @@ namespace FPJ0000 {
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnprocesss = base.Columns["processs"];
this.columnjobtype = base.Columns["jobtype"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1109,6 +1121,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnot);
this.columnprocesss = new global::System.Data.DataColumn("processs", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprocesss);
this.columnjobtype = new global::System.Data.DataColumn("jobtype", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnjobtype);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnuid,
this.columnpdate}, true));
@@ -1121,6 +1135,8 @@ namespace FPJ0000 {
this.columnhrs.ReadOnly = true;
this.columnot.ReadOnly = true;
this.columnprocesss.MaxLength = 100;
this.columnjobtype.ReadOnly = true;
this.columnjobtype.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3778,6 +3794,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string jobtype {
get {
if (this.IsjobtypeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReportDay.jobtypeColumn]));
}
}
set {
this[this.tableJobReportDay.jobtypeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsunameNull() {
@@ -3825,6 +3857,18 @@ namespace FPJ0000 {
public void SetprocesssNull() {
this[this.tableJobReportDay.processsColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsjobtypeNull() {
return this.IsNull(this.tableJobReportDay.jobtypeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetjobtypeNull() {
this[this.tableJobReportDay.jobtypeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -5737,6 +5781,7 @@ ORDER BY yymm";
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("processs", "processs");
tableMapping.ColumnMappings.Add("jobtype", "jobtype");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -5753,7 +5798,8 @@ ORDER BY yymm";
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 ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
this._commandCollection[0].CommandText = @"SELECT ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, MAX(JobReport.type)
AS jobtype
FROM JobReport INNER JOIN
EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id