연차현황추가
This commit is contained in:
36
SubProject/FBS0000/dsMSSQL.Designer.cs
generated
36
SubProject/FBS0000/dsMSSQL.Designer.cs
generated
@@ -8665,13 +8665,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
|
||||
this._commandCollection[0].CommandText = @"SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag, extcate, extidx,
|
||||
lock
|
||||
FROM Holyday
|
||||
WHERE (sdate >= @sd) AND (gcode = @gcode) AND (uid LIKE @uid) AND (sdate <= @ed)
|
||||
WHERE (sdate >= @sd) AND (gcode = @gcode) AND (uid LIKE @uid) AND (sdate <= @ed) AND (cate LIKE @cate)
|
||||
ORDER BY sdate, edate, uid, idx";
|
||||
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", 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("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", 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 CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate,
|
||||
@@ -8725,7 +8726,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
|
||||
[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, true)]
|
||||
public virtual int Fill(dsMSSQL.HolydayDataTable dataTable, string sd, string gcode, string uid, string ed) {
|
||||
public virtual int Fill(dsMSSQL.HolydayDataTable dataTable, string sd, string gcode, string uid, string ed, string cate) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[0];
|
||||
if ((sd == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
|
||||
@@ -8751,6 +8752,12 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed));
|
||||
}
|
||||
if ((cate == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(cate));
|
||||
}
|
||||
if ((this.ClearBeforeFill == true)) {
|
||||
dataTable.Clear();
|
||||
}
|
||||
@@ -8762,7 +8769,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
|
||||
[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, true)]
|
||||
public virtual dsMSSQL.HolydayDataTable GetData(string sd, string gcode, string uid, string ed) {
|
||||
public virtual dsMSSQL.HolydayDataTable GetData(string sd, string gcode, string uid, string ed, string cate) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[0];
|
||||
if ((sd == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
|
||||
@@ -8788,6 +8795,12 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(ed));
|
||||
}
|
||||
if ((cate == null)) {
|
||||
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(cate));
|
||||
}
|
||||
dsMSSQL.HolydayDataTable dataTable = new dsMSSQL.HolydayDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
@@ -11581,16 +11594,17 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@empno", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "empno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FBS0000.Properties.Settings.Default.gwcs);
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = "SELECT ISNULL(SUM(termDr), 0) - ISNULL(SUM(term), 0) AS jan\r\nFROM Holyday\r\nW" +
|
||||
"HERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= @fi" +
|
||||
"rstdate) AND (CONVERT(CHAR(10), sdate, 23) + dbo.PadLeft(idx, \'0\', 6) < @pdate +" +
|
||||
" @idxlen6)";
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = @"SELECT ISNULL(SUM(termDr), 0) - ISNULL(SUM(term), 0) AS jan
|
||||
FROM Holyday
|
||||
WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= @firstdate) AND (CONVERT(CHAR(10), sdate, 23) + dbo.PadLeft(idx, '0', 6) < @pdate + @idxlen6) AND
|
||||
(cate LIKE @cate)";
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandType = global::System.Data.CommandType.Text;
|
||||
((global::System.Data.SqlClient.SqlCommand)(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, "", "", ""));
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@firstdate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxlen6", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
|
||||
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FBS0000.Properties.Settings.Default.gwcs);
|
||||
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandText = "SELECT ISNULL(SUM(DrTime), 0) - ISNULL(SUM(CrTime), 0) AS jan\r\nFROM Holyday\r" +
|
||||
@@ -11648,7 +11662,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
[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")]
|
||||
public virtual global::System.Nullable<double> WorkUserJan_Yesterday_Day(string gcode, string uid, string firstdate, string pdate, string idxlen6) {
|
||||
public virtual global::System.Nullable<double> WorkUserJan_Yesterday_Day(string gcode, string uid, string firstdate, string pdate, string idxlen6, string cate) {
|
||||
global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[1]));
|
||||
if ((gcode == null)) {
|
||||
throw new global::System.ArgumentNullException("gcode");
|
||||
@@ -11680,6 +11694,12 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
|
||||
else {
|
||||
command.Parameters[4].Value = ((string)(idxlen6));
|
||||
}
|
||||
if ((cate == null)) {
|
||||
command.Parameters[5].Value = global::System.DBNull.Value;
|
||||
}
|
||||
else {
|
||||
command.Parameters[5].Value = ((string)(cate));
|
||||
}
|
||||
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
|
||||
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
|
||||
!= global::System.Data.ConnectionState.Open)) {
|
||||
|
||||
Reference in New Issue
Block a user