otPMS추가(테스트버젼)
This commit is contained in:
245
SubProject/FPJ0000/dsReport.Designer.cs
generated
245
SubProject/FPJ0000/dsReport.Designer.cs
generated
@@ -579,6 +579,10 @@ namespace FPJ0000 {
|
||||
|
||||
private global::System.Data.DataColumn columnholyot2;
|
||||
|
||||
private global::System.Data.DataColumn columnotPMS;
|
||||
|
||||
private global::System.Data.DataColumn columnholyotPMS;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public jobReportDataTable() {
|
||||
@@ -692,6 +696,22 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public global::System.Data.DataColumn otPMSColumn {
|
||||
get {
|
||||
return this.columnotPMS;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public global::System.Data.DataColumn holyotPMSColumn {
|
||||
get {
|
||||
return this.columnholyotPMS;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
[global::System.ComponentModel.Browsable(false)]
|
||||
@@ -729,7 +749,7 @@ namespace FPJ0000 {
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2) {
|
||||
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2, double otPMS, double holyotPMS) {
|
||||
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
yymm,
|
||||
@@ -741,7 +761,9 @@ namespace FPJ0000 {
|
||||
UserProcess,
|
||||
holyot,
|
||||
ot2,
|
||||
holyot2};
|
||||
holyot2,
|
||||
otPMS,
|
||||
holyotPMS};
|
||||
rowjobReportRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowjobReportRow);
|
||||
return rowjobReportRow;
|
||||
@@ -782,6 +804,8 @@ namespace FPJ0000 {
|
||||
this.columnholyot = base.Columns["holyot"];
|
||||
this.columnot2 = base.Columns["ot2"];
|
||||
this.columnholyot2 = base.Columns["holyot2"];
|
||||
this.columnotPMS = base.Columns["otPMS"];
|
||||
this.columnholyotPMS = base.Columns["holyotPMS"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -807,6 +831,10 @@ namespace FPJ0000 {
|
||||
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.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnotPMS);
|
||||
this.columnholyotPMS = new global::System.Data.DataColumn("holyotPMS", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnholyotPMS);
|
||||
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
|
||||
this.columnyymm,
|
||||
this.columnuid}, true));
|
||||
@@ -1996,6 +2024,8 @@ namespace FPJ0000 {
|
||||
|
||||
private global::System.Data.DataColumn columnotReason;
|
||||
|
||||
private global::System.Data.DataColumn columnotPMS;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public vJobReportForUserDataTable() {
|
||||
@@ -2197,6 +2227,14 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public global::System.Data.DataColumn otPMSColumn {
|
||||
get {
|
||||
return this.columnotPMS;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
[global::System.ComponentModel.Browsable(false)]
|
||||
@@ -2255,7 +2293,8 @@ namespace FPJ0000 {
|
||||
System.DateTime otStart,
|
||||
System.DateTime otEnd,
|
||||
double ot2,
|
||||
string otReason) {
|
||||
string otReason,
|
||||
double otPMS) {
|
||||
vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
idx,
|
||||
@@ -2278,7 +2317,8 @@ namespace FPJ0000 {
|
||||
otStart,
|
||||
otEnd,
|
||||
ot2,
|
||||
otReason};
|
||||
otReason,
|
||||
otPMS};
|
||||
rowvJobReportForUserRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowvJobReportForUserRow);
|
||||
return rowvJobReportForUserRow;
|
||||
@@ -2329,6 +2369,7 @@ namespace FPJ0000 {
|
||||
this.columnotEnd = base.Columns["otEnd"];
|
||||
this.columnot2 = base.Columns["ot2"];
|
||||
this.columnotReason = base.Columns["otReason"];
|
||||
this.columnotPMS = base.Columns["otPMS"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -2376,6 +2417,8 @@ 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.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnotPMS);
|
||||
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
|
||||
this.columnidx}, true));
|
||||
this.columnidx.AllowDBNull = false;
|
||||
@@ -4291,6 +4334,38 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public double otPMS {
|
||||
get {
|
||||
if (this.IsotPMSNull()) {
|
||||
return 0D;
|
||||
}
|
||||
else {
|
||||
return ((double)(this[this.tablejobReport.otPMSColumn]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablejobReport.otPMSColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public double holyotPMS {
|
||||
get {
|
||||
if (this.IsholyotPMSNull()) {
|
||||
return 0D;
|
||||
}
|
||||
else {
|
||||
return ((double)(this[this.tablejobReport.holyotPMSColumn]));
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablejobReport.holyotPMSColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public bool IstotalNull() {
|
||||
@@ -4386,6 +4461,30 @@ namespace FPJ0000 {
|
||||
public void Setholyot2Null() {
|
||||
this[this.tablejobReport.holyot2Column] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public bool IsotPMSNull() {
|
||||
return this.IsNull(this.tablejobReport.otPMSColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public void SetotPMSNull() {
|
||||
this[this.tablejobReport.otPMSColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public bool IsholyotPMSNull() {
|
||||
return this.IsNull(this.tablejobReport.holyotPMSColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public void SetholyotPMSNull() {
|
||||
this[this.tablejobReport.holyotPMSColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -5175,6 +5274,22 @@ namespace FPJ0000 {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public double otPMS {
|
||||
get {
|
||||
try {
|
||||
return ((double)(this[this.tablevJobReportForUser.otPMSColumn]));
|
||||
}
|
||||
catch (global::System.InvalidCastException e) {
|
||||
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otPMS\' 열의 값이 DBNull입니다.", e);
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tablevJobReportForUser.otPMSColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public bool IspdateNull() {
|
||||
@@ -5402,6 +5517,18 @@ namespace FPJ0000 {
|
||||
public void SetotReasonNull() {
|
||||
this[this.tablevJobReportForUser.otReasonColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public bool IsotPMSNull() {
|
||||
return this.IsNull(this.tablevJobReportForUser.otPMSColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
public void SetotPMSNull() {
|
||||
this[this.tablevJobReportForUser.otPMSColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -6917,6 +7044,8 @@ namespace FPJ0000.dsReportTableAdapters {
|
||||
tableMapping.ColumnMappings.Add("holyot", "holyot");
|
||||
tableMapping.ColumnMappings.Add("ot2", "ot2");
|
||||
tableMapping.ColumnMappings.Add("holyot2", "holyot2");
|
||||
tableMapping.ColumnMappings.Add("otPMS", "otPMS");
|
||||
tableMapping.ColumnMappings.Add("holyotPMS", "holyotPMS");
|
||||
this._adapter.TableMappings.Add(tableMapping);
|
||||
}
|
||||
|
||||
@@ -6930,28 +7059,33 @@ namespace FPJ0000.dsReportTableAdapters {
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
private void InitCommandCollection() {
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
|
||||
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, 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].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2, otPM" +
|
||||
"S, holyotPMS\r\nFROM vUserWorkTimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy)" +
|
||||
" AND (gcode = @gcode) 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 (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR
|
||||
ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
|
||||
ORDER BY yymm";
|
||||
this._commandCollection[1].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm";
|
||||
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
|
||||
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, "", "", ""));
|
||||
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startM", 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("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[2].Connection = this.Connection;
|
||||
this._commandCollection[2].CommandText = @"SELECT UserProcess, holyot, holyot2, holyotPMS, hrs, ot, ot2, otPMS, total, uid, uname, yymm FROM vUserWorkTimeList WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(otPMS, 0) > 0 OR ISNULL(holyotPMS, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM) ORDER BY yymm";
|
||||
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[2].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[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
@@ -7085,6 +7219,78 @@ ORDER BY yymm";
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
|
||||
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
|
||||
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
|
||||
public virtual int FillByOtPMS(dsReport.jobReportDataTable dataTable, string gcode, string userprocess, string startM, string endM) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[2];
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
|
||||
}
|
||||
if ((userprocess == null)) {
|
||||
throw new global::System.ArgumentNullException("userprocess");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess));
|
||||
}
|
||||
if ((startM == null)) {
|
||||
throw new global::System.ArgumentNullException("startM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM));
|
||||
}
|
||||
if ((endM == null)) {
|
||||
throw new global::System.ArgumentNullException("endM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM));
|
||||
}
|
||||
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", "17.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 GetByOtPMS(string gcode, string userprocess, string startM, string endM) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[2];
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
|
||||
}
|
||||
if ((userprocess == null)) {
|
||||
throw new global::System.ArgumentNullException("userprocess");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess));
|
||||
}
|
||||
if ((startM == null)) {
|
||||
throw new global::System.ArgumentNullException("startM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM));
|
||||
}
|
||||
if ((endM == null)) {
|
||||
throw new global::System.ArgumentNullException("endM");
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM));
|
||||
}
|
||||
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -8259,6 +8465,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
tableMapping.ColumnMappings.Add("otEnd", "otEnd");
|
||||
tableMapping.ColumnMappings.Add("ot2", "ot2");
|
||||
tableMapping.ColumnMappings.Add("otReason", "otReason");
|
||||
tableMapping.ColumnMappings.Add("otPMS", "otPMS");
|
||||
this._adapter.TableMappings.Add(tableMapping);
|
||||
}
|
||||
|
||||
@@ -8275,7 +8482,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
|
||||
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, otStart, otEnd, ot2, otReason
|
||||
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, otPMS
|
||||
FROM vJobReportForUser WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid)
|
||||
ORDER BY pdate";
|
||||
@@ -8286,8 +8493,8 @@ ORDER BY pdate";
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", 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 idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
FROM vJobReportForUser with(nolock)
|
||||
this._commandCollection[1].CommandText = @"SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww
|
||||
FROM vJobReportForUser WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
|
||||
ORDER BY pdate";
|
||||
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
|
||||
@@ -8296,7 +8503,7 @@ ORDER BY pdate";
|
||||
this._commandCollection[1].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, "", "", ""));
|
||||
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[2].Connection = this.Connection;
|
||||
this._commandCollection[2].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
this._commandCollection[2].CommandText = @"SELECT description, gcode, hrs, id, idx, name, ot, ot2, otEnd, otPMS, otReason, otStart, package, pdate, process, projectName, requestpart, status, svalue, type, userProcess, ww
|
||||
FROM vJobReportForUser WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess)
|
||||
ORDER BY pdate";
|
||||
@@ -8307,7 +8514,7 @@ ORDER BY pdate";
|
||||
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userProcess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[3].Connection = this.Connection;
|
||||
this._commandCollection[3].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
this._commandCollection[3].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS
|
||||
FROM vJobReportForUser_New WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess)
|
||||
ORDER BY pdate";
|
||||
@@ -8318,7 +8525,7 @@ ORDER BY pdate";
|
||||
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userProcess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
|
||||
this._commandCollection[4].Connection = this.Connection;
|
||||
this._commandCollection[4].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
|
||||
this._commandCollection[4].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, otPMS
|
||||
FROM vJobReportForUser_New WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (id LIKE @uid)
|
||||
ORDER BY pdate";
|
||||
|
||||
Reference in New Issue
Block a user