This commit is contained in:
chi
2023-01-26 09:16:01 +09:00
parent 3775d2ba91
commit 3a1fd6401c
31 changed files with 1565 additions and 733 deletions

View File

@@ -323,6 +323,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnsendmail;
private global::System.Data.DataColumn columnstime;
private global::System.Data.DataColumn columnetime;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public EETGW_HolydayRequestDataTable() {
@@ -532,6 +536,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 stimeColumn {
get {
return this.columnstime;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn etimeColumn {
get {
return this.columnetime;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -590,7 +610,9 @@ namespace FPJ0000 {
string HolyLocation,
int HolyDays,
double HolyTimes,
bool sendmail) {
bool sendmail,
string stime,
string etime) {
EETGW_HolydayRequestRow rowEETGW_HolydayRequestRow = ((EETGW_HolydayRequestRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -614,7 +636,9 @@ namespace FPJ0000 {
HolyLocation,
HolyDays,
HolyTimes,
sendmail};
sendmail,
stime,
etime};
rowEETGW_HolydayRequestRow.ItemArray = columnValuesArray;
this.Rows.Add(rowEETGW_HolydayRequestRow);
return rowEETGW_HolydayRequestRow;
@@ -666,6 +690,8 @@ namespace FPJ0000 {
this.columnHolyDays = base.Columns["HolyDays"];
this.columnHolyTimes = base.Columns["HolyTimes"];
this.columnsendmail = base.Columns["sendmail"];
this.columnstime = base.Columns["stime"];
this.columnetime = base.Columns["etime"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -715,6 +741,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnHolyTimes);
this.columnsendmail = new global::System.Data.DataColumn("sendmail", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsendmail);
this.columnstime = new global::System.Data.DataColumn("stime", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnstime);
this.columnetime = new global::System.Data.DataColumn("etime", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnetime);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -743,6 +773,8 @@ namespace FPJ0000 {
this.columnHolyReason.MaxLength = 100;
this.columnHolyBackup.MaxLength = 100;
this.columnHolyLocation.MaxLength = 100;
this.columnstime.MaxLength = 10;
this.columnetime.MaxLength = 10;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1215,6 +1247,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string stime {
get {
if (this.IsstimeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableEETGW_HolydayRequest.stimeColumn]));
}
}
set {
this[this.tableEETGW_HolydayRequest.stimeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string etime {
get {
if (this.IsetimeNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableEETGW_HolydayRequest.etimeColumn]));
}
}
set {
this[this.tableEETGW_HolydayRequest.etimeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsuidNull() {
@@ -1430,6 +1494,30 @@ namespace FPJ0000 {
public void SetsendmailNull() {
this[this.tableEETGW_HolydayRequest.sendmailColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsstimeNull() {
return this.IsNull(this.tableEETGW_HolydayRequest.stimeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetstimeNull() {
this[this.tableEETGW_HolydayRequest.stimeColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsetimeNull() {
return this.IsNull(this.tableEETGW_HolydayRequest.etimeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetetimeNull() {
this[this.tableEETGW_HolydayRequest.etimeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -1613,6 +1701,8 @@ namespace FPJ0000.DSKuntaeTableAdapters {
tableMapping.ColumnMappings.Add("HolyDays", "HolyDays");
tableMapping.ColumnMappings.Add("HolyTimes", "HolyTimes");
tableMapping.ColumnMappings.Add("sendmail", "sendmail");
tableMapping.ColumnMappings.Add("stime", "stime");
tableMapping.ColumnMappings.Add("etime", "etime");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -1622,8 +1712,8 @@ namespace FPJ0000.DSKuntaeTableAdapters {
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO EETGW_HolydayRequest
(gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail)
VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail);
(gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime)
VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime);
SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = SCOPE_IDENTITY()) ORDER BY conf, sdate DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.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, "", "", ""));
@@ -1642,12 +1732,15 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@etime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "etime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE EETGW_HolydayRequest
SET gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response,
HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail
WHERE (idx = @Original_idx);
HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail, stime = @stime,
etime = @etime
WHERE (idx = @Original_idx);
SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = @idx) ORDER BY conf, sdate DESC";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.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, "", "", ""));
@@ -1666,6 +1759,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@etime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "etime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
@@ -1686,7 +1781,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
this._commandCollection[0].CommandText = @"SELECT EETGW_HolydayRequest.idx, EETGW_HolydayRequest.gcode, EETGW_HolydayRequest.uid, EETGW_HolydayRequest.cate, EETGW_HolydayRequest.sdate,
EETGW_HolydayRequest.edate, EETGW_HolydayRequest.Remark, EETGW_HolydayRequest.wuid, EETGW_HolydayRequest.wdate, vGroupUser.dept, vGroupUser.name, vGroupUser.grade,
vGroupUser.tel, vGroupUser.processs, EETGW_HolydayRequest.Response, EETGW_HolydayRequest.conf, EETGW_HolydayRequest.HolyReason, EETGW_HolydayRequest.HolyBackup,
EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail
EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail, EETGW_HolydayRequest.stime,
EETGW_HolydayRequest.etime
FROM EETGW_HolydayRequest LEFT OUTER JOIN
vGroupUser ON EETGW_HolydayRequest.uid = vGroupUser.id AND EETGW_HolydayRequest.gcode = vGroupUser.gcode
WHERE (EETGW_HolydayRequest.gcode = @gcode) AND (EETGW_HolydayRequest.sdate >= @sd) AND (EETGW_HolydayRequest.sdate <= @ed)
@@ -1828,7 +1924,9 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
string HolyLocation,
global::System.Nullable<int> HolyDays,
global::System.Nullable<double> HolyTimes,
global::System.Nullable<bool> sendmail) {
global::System.Nullable<bool> sendmail,
string stime,
string etime) {
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
@@ -1920,6 +2018,18 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
else {
this.Adapter.InsertCommand.Parameters[15].Value = global::System.DBNull.Value;
}
if ((stime == null)) {
this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[16].Value = ((string)(stime));
}
if ((etime == null)) {
this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[17].Value = ((string)(etime));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -1957,6 +2067,8 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
global::System.Nullable<int> HolyDays,
global::System.Nullable<double> HolyTimes,
global::System.Nullable<bool> sendmail,
string stime,
string etime,
int Original_idx,
int idx) {
if ((gcode == null)) {
@@ -2050,8 +2162,20 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
else {
this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(idx));
if ((stime == null)) {
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(stime));
}
if ((etime == null)) {
this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(etime));
}
this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx));
this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {