project 데이터 변경시 메일 발송 오류 수정

This commit is contained in:
chi
2025-04-09 11:15:18 +09:00
parent 8e76ee9692
commit a24f9be977
7 changed files with 481 additions and 484 deletions

View File

@@ -2515,19 +2515,27 @@ namespace FPJ0000.dsMailTableAdapters {
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [MailData] ([project], [cate], [pdate], [subject], [tolist], [bcc], [cc], [body], [wuid], [wdate]) VALUES (@project, @cate, @pdate, @subject, @tolist, @bcc, @cc, @body, @wuid, @wdate);
SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate FROM MailData WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate, cate";
this._adapter.InsertCommand.CommandText = @"INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [fromlist], [tolist], [bcc], [cc], [body], [SendOK], [SendMsg], [aidx], [atime], [wuid], [wdate], [suid], [sdate]) VALUES (@project, @gcode, @cate, @pdate, @subject, @fromlist, @tolist, @bcc, @cc, @body, @SendOK, @SendMsg, @aidx, @atime, @wuid, @wdate, @suid, @sdate);
SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate, suid, sdate FROM MailData WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate, cate";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@subject", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "subject", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fromlist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fromlist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bcc", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bcc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cc", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@body", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "body", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendOK", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SendOK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", 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 [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [fromlist] = @fromlist, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [SendOK] = @SendOK, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime, [wuid] = @wuid, [wdate] = @wdate, [suid] = @suid, [sdate] = @sdate WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_suid = 1 AND [suid] IS NULL) OR ([suid] = @Original_suid)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)));
@@ -2591,12 +2599,17 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod" +
"y, SendOK, SendMsg, aidx, atime, wuid, wdate, suid, sdate\r\nFROM MailData WIT" +
"H (nolock)\r\nORDER BY pdate, cate";
"H (nolock)\r\nWHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)\r\nORDER BY pd" +
"ate, cate";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
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("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].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[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate\r\nF" +
"ROM MailData WITH (nolock)\r\nWHERE (project = @project)";
"ROM MailData WITH (nolock)\r\nWHERE (project = @project)\r\nORDER BY pdate, idx" +
"";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -2605,8 +2618,26 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
[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(dsMail.MailDataDataTable dataTable) {
public virtual int Fill(dsMail.MailDataDataTable dataTable, string gcode, string sd, string ed) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd));
}
if ((ed == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -2618,8 +2649,26 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
[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 dsMail.MailDataDataTable GetData() {
public virtual dsMail.MailDataDataTable GetData(string gcode, string sd, string ed) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd));
}
if ((ed == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
}
dsMail.MailDataDataTable dataTable = new dsMail.MailDataDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -2801,62 +2850,128 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
[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.Insert, true)]
public virtual int Insert(global::System.Nullable<int> project, string cate, string pdate, string subject, string tolist, string bcc, string cc, string body, string wuid, System.DateTime wdate) {
public virtual int Insert(
global::System.Nullable<int> project,
string gcode,
string cate,
string pdate,
string subject,
string fromlist,
string tolist,
string bcc,
string cc,
string body,
global::System.Nullable<bool> SendOK,
string SendMsg,
global::System.Nullable<int> aidx,
string atime,
string wuid,
System.DateTime wdate,
string suid,
global::System.Nullable<global::System.DateTime> sdate) {
if ((project.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[0].Value = ((int)(project.Value));
}
else {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
if ((cate == null)) {
this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value;
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.InsertCommand.Parameters[1].Value = ((string)(cate));
this.Adapter.InsertCommand.Parameters[1].Value = ((string)(gcode));
}
if ((pdate == null)) {
if ((cate == null)) {
this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[2].Value = ((string)(pdate));
this.Adapter.InsertCommand.Parameters[2].Value = ((string)(cate));
}
if ((subject == null)) {
if ((pdate == null)) {
this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[3].Value = ((string)(subject));
this.Adapter.InsertCommand.Parameters[3].Value = ((string)(pdate));
}
if ((tolist == null)) {
if ((subject == null)) {
this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[4].Value = ((string)(tolist));
this.Adapter.InsertCommand.Parameters[4].Value = ((string)(subject));
}
if ((bcc == null)) {
if ((fromlist == null)) {
this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[5].Value = ((string)(bcc));
this.Adapter.InsertCommand.Parameters[5].Value = ((string)(fromlist));
}
if ((cc == null)) {
if ((tolist == null)) {
this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[6].Value = ((string)(cc));
this.Adapter.InsertCommand.Parameters[6].Value = ((string)(tolist));
}
if ((body == null)) {
if ((bcc == null)) {
this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[7].Value = ((string)(body));
this.Adapter.InsertCommand.Parameters[7].Value = ((string)(bcc));
}
if ((cc == null)) {
this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[8].Value = ((string)(cc));
}
if ((body == null)) {
this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[9].Value = ((string)(body));
}
if ((SendOK.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[10].Value = ((bool)(SendOK.Value));
}
else {
this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value;
}
if ((SendMsg == null)) {
this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[11].Value = ((string)(SendMsg));
}
if ((aidx.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[12].Value = ((int)(aidx.Value));
}
else {
this.Adapter.InsertCommand.Parameters[12].Value = global::System.DBNull.Value;
}
if ((atime == null)) {
this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[13].Value = ((string)(atime));
}
if ((wuid == null)) {
throw new global::System.ArgumentNullException("wuid");
}
else {
this.Adapter.InsertCommand.Parameters[8].Value = ((string)(wuid));
this.Adapter.InsertCommand.Parameters[14].Value = ((string)(wuid));
}
this.Adapter.InsertCommand.Parameters[15].Value = ((System.DateTime)(wdate));
if ((suid == null)) {
this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[16].Value = ((string)(suid));
}
if ((sdate.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[17].Value = ((System.DateTime)(sdate.Value));
}
else {
this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value;
}
this.Adapter.InsertCommand.Parameters[9].Value = ((System.DateTime)(wdate));
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)) {