휴가신청구분 입력 불가 하게 함

This commit is contained in:
chi
2022-07-04 09:26:39 +09:00
parent f8c38ae031
commit 38a681000f
11 changed files with 2103 additions and 725 deletions

View File

@@ -6052,13 +6052,14 @@ namespace FPJ0000.dsReportTableAdapters {
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 )
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("@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, "", "", ""));
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, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6125,25 +6126,31 @@ ORDER BY yymm";
[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) {
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string gcode, string userprocess, string startM, string endM) {
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));
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
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();
@@ -6156,25 +6163,31 @@ ORDER BY yymm";
[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) {
public virtual dsReport.jobReportDataTable GetByOt2(string gcode, string userprocess, string startM, string endM) {
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));
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
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);