..

2022-01-04 22:49:17 +09:00
parent 76bbb2f298
commit 8530c104f2
5 changed files with 139 additions and 34 deletions
--- 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.01.03.2200")]
-[assembly: AssemblyFileVersion("22.01.03.2200")]
+[assembly: AssemblyVersion("22.01.04.2250")]
+[assembly: AssemblyFileVersion("22.01.04.2250")]
--- a/SubProject/FPJ0000/DSKuntae.Designer.cs
+++ b/SubProject/FPJ0000/DSKuntae.Designer.cs
@@ -321,6 +321,8 @@ namespace FPJ0000 {
            
            private global::System.Data.DataColumn columnHolyTimes;
            
+            private global::System.Data.DataColumn columnsendmail;
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public EETGW_HolydayRequestDataTable() {
@@ -522,6 +524,14 @@ namespace FPJ0000 {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn sendmailColumn {
+                get {
+                    return this.columnsendmail;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            [global::System.ComponentModel.Browsable(false)]
@@ -579,7 +589,8 @@ namespace FPJ0000 {
                        string HolyBackup, 
                        string HolyLocation, 
                        int HolyDays, 
-                        double HolyTimes) {
+                        double HolyTimes, 
+                        bool sendmail) {
                EETGW_HolydayRequestRow rowEETGW_HolydayRequestRow = ((EETGW_HolydayRequestRow)(this.NewRow()));
                object[] columnValuesArray = new object[] {
                        null,
@@ -602,7 +613,8 @@ namespace FPJ0000 {
                        HolyBackup,
                        HolyLocation,
                        HolyDays,
-                        HolyTimes};
+                        HolyTimes,
+                        sendmail};
                rowEETGW_HolydayRequestRow.ItemArray = columnValuesArray;
                this.Rows.Add(rowEETGW_HolydayRequestRow);
                return rowEETGW_HolydayRequestRow;
@@ -653,6 +665,7 @@ namespace FPJ0000 {
                this.columnHolyLocation = base.Columns["HolyLocation"];
                this.columnHolyDays = base.Columns["HolyDays"];
                this.columnHolyTimes = base.Columns["HolyTimes"];
+                this.columnsendmail = base.Columns["sendmail"];
            }
            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -700,6 +713,8 @@ namespace FPJ0000 {
                base.Columns.Add(this.columnHolyDays);
                this.columnHolyTimes = new global::System.Data.DataColumn("HolyTimes", typeof(double), null, global::System.Data.MappingType.Element);
                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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                this.columnidx}, true));
                this.columnidx.AutoIncrement = true;
@@ -1184,6 +1199,22 @@ namespace FPJ0000 {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool sendmail {
+                get {
+                    if (this.IssendmailNull()) {
+                        return false;
+                    }
+                    else {
+                        return ((bool)(this[this.tableEETGW_HolydayRequest.sendmailColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_HolydayRequest.sendmailColumn] = value;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public bool IsuidNull() {
@@ -1387,6 +1418,18 @@ namespace FPJ0000 {
            public void SetHolyTimesNull() {
                this[this.tableEETGW_HolydayRequest.HolyTimesColumn] = global::System.Convert.DBNull;
            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IssendmailNull() {
+                return this.IsNull(this.tableEETGW_HolydayRequest.sendmailColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetsendmailNull() {
+                this[this.tableEETGW_HolydayRequest.sendmailColumn] = global::System.Convert.DBNull;
+            }
        }
        
        /// <summary>
@@ -1569,6 +1612,7 @@ namespace FPJ0000.DSKuntaeTableAdapters {
            tableMapping.ColumnMappings.Add("HolyLocation", "HolyLocation");
            tableMapping.ColumnMappings.Add("HolyDays", "HolyDays");
            tableMapping.ColumnMappings.Add("HolyTimes", "HolyTimes");
+            tableMapping.ColumnMappings.Add("sendmail", "sendmail");
            this._adapter.TableMappings.Add(tableMapping);
            this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
            this._adapter.DeleteCommand.Connection = this.Connection;
@@ -1578,8 +1622,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)
-VALUES  (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes);   
+               (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);    
 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, "", "", ""));
@@ -1597,12 +1641,13 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
            this._adapter.InsertCommand.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.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.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 = @HolyReason, HolyDays = @HolyDays, HolyTimes = @HolyTimes
-WHERE  (idx = @Original_idx);   
+               HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyReason, 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, "", "", ""));
@@ -1619,6 +1664,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("@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("@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("@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, "", "", ""));
        }
@@ -1639,7 +1685,7 @@ 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.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail
 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.edate <= @ed)
@@ -1765,7 +1811,23 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
        [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.Insert, true)]
-        public virtual int Insert(string gcode, string uid, string cate, string sdate, string edate, global::System.Nullable<int> conf, string Remark, string wuid, System.DateTime wdate, string Response, string HolyReason, string HolyBackup, string HolyLocation, global::System.Nullable<int> HolyDays, global::System.Nullable<double> HolyTimes) {
+        public virtual int Insert(
+                    string gcode, 
+                    string uid, 
+                    string cate, 
+                    string sdate, 
+                    string edate, 
+                    global::System.Nullable<int> conf, 
+                    string Remark, 
+                    string wuid, 
+                    System.DateTime wdate, 
+                    string Response, 
+                    string HolyReason, 
+                    string HolyBackup, 
+                    string HolyLocation, 
+                    global::System.Nullable<int> HolyDays, 
+                    global::System.Nullable<double> HolyTimes, 
+                    global::System.Nullable<bool> sendmail) {
            if ((gcode == null)) {
                throw new global::System.ArgumentNullException("gcode");
            }
@@ -1851,6 +1913,12 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
            else {
                this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value;
            }
+            if ((sendmail.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[15].Value = ((bool)(sendmail.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[15].Value = global::System.DBNull.Value;
+            }
            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)) {
@@ -1886,6 +1954,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
                    string HolyBackup, 
                    global::System.Nullable<int> HolyDays, 
                    global::System.Nullable<double> HolyTimes, 
+                    global::System.Nullable<bool> sendmail, 
                    int Original_idx, 
                    int idx) {
            if ((gcode == null)) {
@@ -1967,8 +2036,14 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
            else {
                this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
            }
-            this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_idx));
-            this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(idx));
+            if ((sendmail.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((bool)(sendmail.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));
            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)) {
--- a/SubProject/FPJ0000/DSKuntae.xsd
+++ b/SubProject/FPJ0000/DSKuntae.xsd
@@ -22,8 +22,8 @@ WHERE  (idx = @Original_idx)</CommandText>
                <InsertCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>INSERT INTO EETGW_HolydayRequest
-               (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes)
-VALUES  (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes);   
+               (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);    
 SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = SCOPE_IDENTITY()) ORDER BY conf, sdate DESC</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -41,6 +41,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
                      <Parameter AllowDbNull="true" AutogeneratedName="HolyLocation" ColumnName="HolyLocation" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyLocation" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyLocation" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="HolyTimes" ColumnName="HolyTimes" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@HolyTimes" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyTimes" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sendmail" ColumnName="sendmail" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@sendmail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="sendmail" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
@@ -49,7 +50,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
                    <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.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail
 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 &gt;= @sd) AND (EETGW_HolydayRequest.edate &lt;= @ed)
@@ -65,8 +66,8 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC</CommandText
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <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
-WHERE  (idx = @Original_idx);   
+               HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyReason, 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</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -83,6 +84,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
                      <Parameter AllowDbNull="true" AutogeneratedName="HolyBackup" ColumnName="HolyBackup" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyBackup" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyBackup" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="HolyTimes" ColumnName="HolyTimes" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@HolyTimes" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyTimes" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sendmail" ColumnName="sendmail" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@sendmail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="sendmail" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
@@ -112,6 +114,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
              <Mapping SourceColumn="HolyLocation" DataSetColumn="HolyLocation" />
              <Mapping SourceColumn="HolyDays" DataSetColumn="HolyDays" />
              <Mapping SourceColumn="HolyTimes" DataSetColumn="HolyTimes" />
+              <Mapping SourceColumn="sendmail" DataSetColumn="sendmail" />
            </Mappings>
            <Sources />
          </TableAdapter>
@@ -123,7 +126,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
  <xs:element name="DSKuntae" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSKuntae" msprop:Generator_UserDSName="DSKuntae">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="EETGW_HolydayRequest" msprop:Generator_TableClassName="EETGW_HolydayRequestDataTable" msprop:Generator_TableVarName="tableEETGW_HolydayRequest" msprop:Generator_TablePropName="EETGW_HolydayRequest" msprop:Generator_RowDeletingName="EETGW_HolydayRequestRowDeleting" msprop:Generator_RowChangingName="EETGW_HolydayRequestRowChanging" msprop:Generator_RowEvHandlerName="EETGW_HolydayRequestRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_HolydayRequestRowDeleted" msprop:Generator_UserTableName="EETGW_HolydayRequest" msprop:Generator_RowChangedName="EETGW_HolydayRequestRowChanged" msprop:Generator_RowEvArgName="EETGW_HolydayRequestRowChangeEvent" msprop:Generator_RowClassName="EETGW_HolydayRequestRow">
+        <xs:element name="EETGW_HolydayRequest" msprop:Generator_TableClassName="EETGW_HolydayRequestDataTable" msprop:Generator_TableVarName="tableEETGW_HolydayRequest" msprop:Generator_RowChangedName="EETGW_HolydayRequestRowChanged" msprop:Generator_TablePropName="EETGW_HolydayRequest" msprop:Generator_RowDeletingName="EETGW_HolydayRequestRowDeleting" msprop:Generator_RowChangingName="EETGW_HolydayRequestRowChanging" msprop:Generator_RowEvHandlerName="EETGW_HolydayRequestRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_HolydayRequestRowDeleted" msprop:Generator_RowClassName="EETGW_HolydayRequestRow" msprop:Generator_UserTableName="EETGW_HolydayRequest" msprop:Generator_RowEvArgName="EETGW_HolydayRequestRowChangeEvent">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -241,8 +244,9 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="HolyDays" msprop:Generator_ColumnVarNameInTable="columnHolyDays" msprop:Generator_ColumnPropNameInRow="HolyDays" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="HolyDaysColumn" msprop:Generator_UserColumnName="HolyDays" type="xs:int" minOccurs="0" />
-              <xs:element name="HolyTimes" msprop:Generator_ColumnVarNameInTable="columnHolyTimes" msprop:Generator_ColumnPropNameInRow="HolyTimes" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="HolyTimesColumn" msprop:Generator_UserColumnName="HolyTimes" type="xs:double" minOccurs="0" />
+              <xs:element name="HolyDays" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyDays" msprop:Generator_ColumnVarNameInTable="columnHolyDays" msprop:Generator_ColumnPropNameInTable="HolyDaysColumn" msprop:Generator_UserColumnName="HolyDays" type="xs:int" minOccurs="0" />
+              <xs:element name="HolyTimes" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyTimes" msprop:Generator_ColumnVarNameInTable="columnHolyTimes" msprop:Generator_ColumnPropNameInTable="HolyTimesColumn" msprop:Generator_UserColumnName="HolyTimes" type="xs:double" minOccurs="0" />
+              <xs:element name="sendmail" msprop:Generator_ColumnVarNameInTable="columnsendmail" msprop:Generator_ColumnPropNameInRow="sendmail" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="sendmailColumn" msprop:Generator_UserColumnName="sendmail" type="xs:boolean" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs
@@ -57,13 +57,14 @@ namespace FPJ0000.OtConfirm
            this.label5 = new System.Windows.Forms.Label();
            this.label4 = new System.Windows.Forms.Label();
            this.grpAdmin = new System.Windows.Forms.GroupBox();
+            this.cmbPreset = new System.Windows.Forms.ComboBox();
            this.rad2 = new System.Windows.Forms.RadioButton();
            this.rad1 = new System.Windows.Forms.RadioButton();
            this.rad0 = new System.Windows.Forms.RadioButton();
            this.tbResponse = new System.Windows.Forms.RichTextBox();
            this.button1 = new System.Windows.Forms.Button();
            this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
-            this.cmbPreset = new System.Windows.Forms.ComboBox();
+            this.chkSendMail = new System.Windows.Forms.CheckBox();
            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
            this.grpUser.SuspendLayout();
@@ -135,6 +136,7 @@ namespace FPJ0000.OtConfirm
            this.tbED.Name = "tbED";
            this.tbED.Size = new System.Drawing.Size(358, 38);
            this.tbED.TabIndex = 3;
+            this.tbED.ValueChanged += new System.EventHandler(this.tbED_ValueChanged);
            // 
            // tbRemark
            // 
@@ -332,6 +334,7 @@ namespace FPJ0000.OtConfirm
            // 
            // grpAdmin
            // 
+            this.grpAdmin.Controls.Add(this.chkSendMail);
            this.grpAdmin.Controls.Add(this.cmbPreset);
            this.grpAdmin.Controls.Add(this.rad2);
            this.grpAdmin.Controls.Add(this.rad1);
@@ -344,6 +347,21 @@ namespace FPJ0000.OtConfirm
            this.grpAdmin.TabStop = false;
            this.grpAdmin.Text = "관리자";
            // 
+            // cmbPreset
+            // 
+            this.cmbPreset.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
+            this.cmbPreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbPreset.FormattingEnabled = true;
+            this.cmbPreset.Items.AddRange(new object[] {
+            "연차",
+            "하기",
+            "대체"});
+            this.cmbPreset.Location = new System.Drawing.Point(26, 74);
+            this.cmbPreset.Name = "cmbPreset";
+            this.cmbPreset.Size = new System.Drawing.Size(744, 35);
+            this.cmbPreset.TabIndex = 6;
+            this.cmbPreset.SelectedIndexChanged += new System.EventHandler(this.cmbPreset_SelectedIndexChanged);
+            // 
            // rad2
            // 
            this.rad2.AutoSize = true;
@@ -401,20 +419,15 @@ namespace FPJ0000.OtConfirm
            // 
            this.ta.ClearBeforeFill = true;
            // 
-            // cmbPreset
+            // chkSendMail
            // 
-            this.cmbPreset.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
-            this.cmbPreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbPreset.FormattingEnabled = true;
-            this.cmbPreset.Items.AddRange(new object[] {
-            "연차",
-            "하기",
-            "대체"});
-            this.cmbPreset.Location = new System.Drawing.Point(26, 74);
-            this.cmbPreset.Name = "cmbPreset";
-            this.cmbPreset.Size = new System.Drawing.Size(744, 35);
-            this.cmbPreset.TabIndex = 6;
-            this.cmbPreset.SelectedIndexChanged += new System.EventHandler(this.cmbPreset_SelectedIndexChanged);
+            this.chkSendMail.AutoSize = true;
+            this.chkSendMail.Location = new System.Drawing.Point(631, 37);
+            this.chkSendMail.Name = "chkSendMail";
+            this.chkSendMail.Size = new System.Drawing.Size(139, 31);
+            this.chkSendMail.TabIndex = 7;
+            this.chkSendMail.Text = "메일전송";
+            this.chkSendMail.UseVisualStyleBackColor = true;
            // 
            // fHolyRequestAdd
            // 
@@ -476,5 +489,6 @@ namespace FPJ0000.OtConfirm
        private System.Windows.Forms.TextBox tbDays;
        private System.Windows.Forms.Label label11;
        private System.Windows.Forms.ComboBox cmbPreset;
+        private System.Windows.Forms.CheckBox chkSendMail;
    }
 }
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -149,6 +149,7 @@ namespace FPJ0000.OtConfirm
            dr.Response = tbResponse.Text.Trim();
            dr.sdate = tbSD.Value.ToShortDateString();
            dr.edate = tbED.Value.ToShortDateString();
+            dr.sendmail = chkSendMail.Checked; //220104

            dr.HolyDays = vDay;
            dr.HolyTimes = vTime;//
@@ -172,5 +173,16 @@ namespace FPJ0000.OtConfirm
            if (cmbPreset.SelectedIndex > 0)
                tbResponse.Text = cmbPreset.Text;
        }
+
+        private void tbED_ValueChanged(object sender, EventArgs e)
+        {
+            //해당 값이 오늘보다 이전이라면 메일전송을 자동 해제하낟.
+            var v = tbED.Value.ToShortDateString();
+            var c = DateTime.Now.ToShortDateString();
+            if (v.CompareTo(c) < 0)
+                chkSendMail.Checked = false;
+            else
+                chkSendMail.Checked = true;
+        }
    }
 }