From 5617db1780cc14698cb8e536273f008cf19e7434 Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 8 Feb 2022 11:36:50 +0900 Subject: [PATCH] ..... --- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FPJ0000/DSKuntae.Designer.cs | 32 ++++++++------ SubProject/FPJ0000/DSKuntae.xsd | 43 ++++++++++--------- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 13 +++++- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 2f34b52..d9b786f 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.02.06.1300")] -[assembly: AssemblyFileVersion("22.02.06.1300")] +[assembly: AssemblyVersion("22.02.08.1130")] +[assembly: AssemblyFileVersion("22.02.08.1130")] diff --git a/SubProject/FPJ0000/DSKuntae.Designer.cs b/SubProject/FPJ0000/DSKuntae.Designer.cs index f877efd..d243f03 100644 --- a/SubProject/FPJ0000/DSKuntae.Designer.cs +++ b/SubProject/FPJ0000/DSKuntae.Designer.cs @@ -1646,8 +1646,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW 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 = @HolyReason, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail -WHERE (idx = @Original_idx); + HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail +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, "", "", "")); @@ -1662,6 +1662,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Response", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "Response", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyReason", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyReason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyBackup", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyBackup", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyLocation", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyLocation", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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, "", "", "")); @@ -1952,6 +1953,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; string Response, string HolyReason, string HolyBackup, + string HolyLocation, global::System.Nullable HolyDays, global::System.Nullable HolyTimes, global::System.Nullable sendmail, @@ -2024,26 +2026,32 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; else { this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(HolyBackup)); } - if ((HolyDays.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(HolyDays.Value)); - } - else { + if ((HolyLocation == null)) { this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } - if ((HolyTimes.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((double)(HolyTimes.Value)); + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(HolyLocation)); + } + if ((HolyDays.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(HolyDays.Value)); } else { this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; } - if ((sendmail.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((bool)(sendmail.Value)); + if ((HolyTimes.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((double)(HolyTimes.Value)); } else { this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(idx)); + if ((sendmail.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[15].Value = ((bool)(sendmail.Value)); + } + 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)); 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)) { diff --git a/SubProject/FPJ0000/DSKuntae.xsd b/SubProject/FPJ0000/DSKuntae.xsd index d54a993..e22b768 100644 --- a/SubProject/FPJ0000/DSKuntae.xsd +++ b/SubProject/FPJ0000/DSKuntae.xsd @@ -63,30 +63,31 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC - + 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 = @HolyReason, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail -WHERE (idx = @Original_idx); + HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail +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 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -126,7 +127,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 10e4cdb..9ed298c 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -182,6 +182,12 @@ namespace FPJ0000.OtConfirm return; } + if(tbRemark.Text.StartsWith("테스트") && chkSendMail.Checked) + { + FCOMMON.Util.MsgI("테스트라 메일 체크를 끕니다"); + chkSendMail.Checked = false; + } + if (dr.RowState == DataRowState.Detached) { var dlg = FCOMMON.Util.MsgQ("입력을 완료하시겠습니까?\r\n관리자에게 메일로 알림이 발생 합니다"); @@ -203,7 +209,12 @@ namespace FPJ0000.OtConfirm dr.HolyLocation = tbLocation.Text.Trim(); dr.HolyBackup = tbBackup.Text.Trim(); dr.cate = cate;// tbCate.Text.Trim(); - dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text; + + if (dr.Remark.Contains(richTextBox1.Text) == false) + dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text; + else + dr.Remark = tbRemark.Text.Trim(); + dr.Response = tbResponse.Text.Trim(); dr.sdate = tbSD.Value.ToShortDateString(); dr.edate = tbED.Value.ToShortDateString();