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-02-16 08:31:01 +09:00
parent 30b06c2d35
commit 1c52445f76
23 changed files with 985 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,6 +431,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnot;
private global::System.Data.DataColumn columnUserProcess;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportDataTable() {
@@ -512,6 +514,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 UserProcessColumn {
get {
return this.columnUserProcess;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -549,7 +559,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) {
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess) {
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
yymm,
@@ -557,7 +567,8 @@ namespace FPJ0000 {
uid,
uname,
hrs,
ot};
ot,
UserProcess};
rowjobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowjobReportRow);
return rowjobReportRow;
@@ -594,6 +605,7 @@ namespace FPJ0000 {
this.columnuname = base.Columns["uname"];
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnUserProcess = base.Columns["UserProcess"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -611,6 +623,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnhrs);
this.columnot = new global::System.Data.DataColumn("ot", typeof(double), null, global::System.Data.MappingType.Element);
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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnyymm,
this.columnuid}, true));
@@ -622,6 +636,7 @@ namespace FPJ0000 {
this.columnuid.MaxLength = 20;
this.columnuname.ReadOnly = true;
this.columnuname.MaxLength = 200;
this.columnUserProcess.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -767,6 +782,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnprocesss;
private global::System.Data.DataColumn columnUserProcess;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobReportDayDataTable() {
@@ -848,6 +865,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 UserProcessColumn {
get {
return this.columnUserProcess;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -885,7 +910,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 UserProcess) {
JobReportDayRow rowJobReportDayRow = ((JobReportDayRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
uid,
@@ -893,7 +918,8 @@ namespace FPJ0000 {
pdate,
hrs,
ot,
processs};
processs,
UserProcess};
rowJobReportDayRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportDayRow);
return rowJobReportDayRow;
@@ -930,6 +956,7 @@ namespace FPJ0000 {
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnprocesss = base.Columns["processs"];
this.columnUserProcess = base.Columns["UserProcess"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -947,6 +974,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.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserProcess);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnuid,
this.columnpdate}, true));
@@ -959,6 +988,7 @@ namespace FPJ0000 {
this.columnhrs.ReadOnly = true;
this.columnot.ReadOnly = true;
this.columnprocesss.MaxLength = 100;
this.columnUserProcess.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2028,6 +2058,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string UserProcess {
get {
if (this.IsUserProcessNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tablejobReport.UserProcessColumn]));
}
}
set {
this[this.tablejobReport.UserProcessColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IstotalNull() {
@@ -2075,6 +2121,18 @@ namespace FPJ0000 {
public void SetotNull() {
this[this.tablejobReport.otColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsUserProcessNull() {
return this.IsNull(this.tablejobReport.UserProcessColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetUserProcessNull() {
this[this.tablejobReport.UserProcessColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -2177,6 +2235,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string UserProcess {
get {
if (this.IsUserProcessNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReportDay.UserProcessColumn]));
}
}
set {
this[this.tableJobReportDay.UserProcessColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsunameNull() {
@@ -2224,6 +2298,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 IsUserProcessNull() {
return this.IsNull(this.tableJobReportDay.UserProcessColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetUserProcessNull() {
this[this.tableJobReportDay.UserProcessColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -2807,6 +2893,7 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("uname", "uname");
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -2823,18 +2910,20 @@ 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\r\nFROM vUserWorkTimeList\r\nWHERE (SUB" +
"STRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)\r\nORDER BY yymm";
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].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, "", "", ""));
}
[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, true)]
public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode) {
public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
@@ -2848,6 +2937,12 @@ namespace FPJ0000.dsReportTableAdapters {
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();
}
@@ -2859,7 +2954,7 @@ namespace FPJ0000.dsReportTableAdapters {
[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, true)]
public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode) {
public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
@@ -2873,6 +2968,12 @@ namespace FPJ0000.dsReportTableAdapters {
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;
@@ -3006,6 +3107,7 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("processs", "processs");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -3022,22 +3124,25 @@ 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 ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
FROM JobReport LEFT OUTER JOIN
this._commandCollection[0].CommandText = @"SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot,
EETGW_GroupUser.Process AS UserProcess
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
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process
ORDER BY processs, JobReport.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, "", "", ""));
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, "", "", ""));
}
[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, true)]
public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode) {
public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yymm == null)) {
throw new global::System.ArgumentNullException("yymm");
@@ -3051,6 +3156,12 @@ ORDER BY processs, JobReport.pdate, uname";
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();
}
@@ -3062,7 +3173,7 @@ ORDER BY processs, JobReport.pdate, uname";
[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, true)]
public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode) {
public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yymm == null)) {
throw new global::System.ArgumentNullException("yymm");
@@ -3076,6 +3187,12 @@ ORDER BY processs, JobReport.pdate, uname";
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.JobReportDayDataTable dataTable = new dsReport.JobReportDayDataTable();
this.Adapter.Fill(dataTable);
return dataTable;