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-01-11 21:03:01 +09:00
parent 0c1f767c8d
commit bf9fd477c5
9 changed files with 375 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
SubProject/FPJ0000/dsPRJ.Designer.cs generated
View File

@@ -3627,6 +3627,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnotReason;
private global::System.Data.DataColumn columnFreeDay;
private global::System.Data.DataColumn columnWeekName;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobReportDataTable() {
@@ -3916,6 +3920,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 FreeDayColumn {
get {
return this.columnFreeDay;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn WeekNameColumn {
get {
return this.columnWeekName;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3984,7 +4004,9 @@ namespace FPJ0000 {
string kisuldiv,
decimal kisulamt,
double ot2,
string otReason) {
string otReason,
bool FreeDay,
string WeekName) {
JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -4018,7 +4040,9 @@ namespace FPJ0000 {
kisuldiv,
kisulamt,
ot2,
otReason};
otReason,
FreeDay,
WeekName};
rowJobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportRow);
return rowJobReportRow;
@@ -4080,6 +4104,8 @@ namespace FPJ0000 {
this.columnkisulamt = base.Columns["kisulamt"];
this.columnot2 = base.Columns["ot2"];
this.columnotReason = base.Columns["otReason"];
this.columnFreeDay = base.Columns["FreeDay"];
this.columnWeekName = base.Columns["WeekName"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4149,6 +4175,10 @@ namespace FPJ0000 {
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.columnFreeDay = new global::System.Data.DataColumn("FreeDay", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnFreeDay);
this.columnWeekName = new global::System.Data.DataColumn("WeekName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnWeekName);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -4183,6 +4213,9 @@ namespace FPJ0000 {
this.columnkisullv.MaxLength = 10;
this.columnkisuldiv.MaxLength = 100;
this.columnotReason.MaxLength = 255;
this.columnFreeDay.ReadOnly = true;
this.columnWeekName.ReadOnly = true;
this.columnWeekName.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -14162,6 +14195,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool FreeDay {
get {
if (this.IsFreeDayNull()) {
return false;
}
else {
return ((bool)(this[this.tableJobReport.FreeDayColumn]));
}
}
set {
this[this.tableJobReport.FreeDayColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string WeekName {
get {
if (this.IsWeekNameNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReport.WeekNameColumn]));
}
}
set {
this[this.tableJobReport.WeekNameColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IspdateNull() {
@@ -14497,6 +14562,30 @@ namespace FPJ0000 {
public void SetotReasonNull() {
this[this.tableJobReport.otReasonColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsFreeDayNull() {
return this.IsNull(this.tableJobReport.FreeDayColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetFreeDayNull() {
this[this.tableJobReport.FreeDayColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsWeekNameNull() {
return this.IsNull(this.tableJobReport.WeekNameColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetWeekNameNull() {
this[this.tableJobReport.WeekNameColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -25248,6 +25337,8 @@ ORDER BY Project, no, ItemGroup, option1, ItemName";
tableMapping.ColumnMappings.Add("kisulamt", "kisulamt");
tableMapping.ColumnMappings.Add("ot2", "ot2");
tableMapping.ColumnMappings.Add("otReason", "otReason");
tableMapping.ColumnMappings.Add("FreeDay", "FreeDay");
tableMapping.ColumnMappings.Add("WeekName", "WeekName");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -25343,7 +25434,8 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,
process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason
process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay,
dbo.GetWeekName(pdate) AS WeekName
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
ORDER BY pdate DESC";
@@ -25378,11 +25470,7 @@ ORDER BY pdate DESC";
this._commandCollection[3].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.Original, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type)
AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt, ot2, otReason
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '')
ORDER BY pdate DESC";
this._commandCollection[4].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, kisulamt, kisuldiv, kisullv, ot, ot2, otEnd, otReason, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC";
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[4].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, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));