.....

SubProject/FPJ0000/DSKuntae.Designer.cs

@@ -311,6 +311,16 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnconf;
             
+            private global::System.Data.DataColumn columnHolyReason;
+            
+            private global::System.Data.DataColumn columnHolyBackup;
+            
+            private global::System.Data.DataColumn columnHolyLocation;
+            
+            private global::System.Data.DataColumn columnHolyDays;
+            
+            private global::System.Data.DataColumn columnHolyTimes;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public EETGW_HolydayRequestDataTable() {
@@ -472,6 +482,46 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn HolyReasonColumn {
+                get {
+                    return this.columnHolyReason;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn HolyBackupColumn {
+                get {
+                    return this.columnHolyBackup;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn HolyLocationColumn {
+                get {
+                    return this.columnHolyLocation;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn HolyDaysColumn {
+                get {
+                    return this.columnHolyDays;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn HolyTimesColumn {
+                get {
+                    return this.columnHolyTimes;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -509,7 +559,27 @@ namespace FPJ0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public EETGW_HolydayRequestRow AddEETGW_HolydayRequestRow(string gcode, string uid, string cate, string sdate, string edate, string Remark, string wuid, System.DateTime wdate, string dept, string name, string grade, string tel, string processs, string Response, int conf) {
+            public EETGW_HolydayRequestRow AddEETGW_HolydayRequestRow(
+                        string gcode, 
+                        string uid, 
+                        string cate, 
+                        string sdate, 
+                        string edate, 
+                        string Remark, 
+                        string wuid, 
+                        System.DateTime wdate, 
+                        string dept, 
+                        string name, 
+                        string grade, 
+                        string tel, 
+                        string processs, 
+                        string Response, 
+                        int conf, 
+                        string HolyReason, 
+                        string HolyBackup, 
+                        string HolyLocation, 
+                        int HolyDays, 
+                        double HolyTimes) {
                 EETGW_HolydayRequestRow rowEETGW_HolydayRequestRow = ((EETGW_HolydayRequestRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -527,7 +597,12 @@ namespace FPJ0000 {
                         tel,
                         processs,
                         Response,
-                        conf};
+                        conf,
+                        HolyReason,
+                        HolyBackup,
+                        HolyLocation,
+                        HolyDays,
+                        HolyTimes};
                 rowEETGW_HolydayRequestRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEETGW_HolydayRequestRow);
                 return rowEETGW_HolydayRequestRow;
@@ -573,6 +648,11 @@ namespace FPJ0000 {
                 this.columnprocesss = base.Columns["processs"];
                 this.columnResponse = base.Columns["Response"];
                 this.columnconf = base.Columns["conf"];
+                this.columnHolyReason = base.Columns["HolyReason"];
+                this.columnHolyBackup = base.Columns["HolyBackup"];
+                this.columnHolyLocation = base.Columns["HolyLocation"];
+                this.columnHolyDays = base.Columns["HolyDays"];
+                this.columnHolyTimes = base.Columns["HolyTimes"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -610,6 +690,16 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnResponse);
                 this.columnconf = new global::System.Data.DataColumn("conf", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnconf);
+                this.columnHolyReason = new global::System.Data.DataColumn("HolyReason", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnHolyReason);
+                this.columnHolyBackup = new global::System.Data.DataColumn("HolyBackup", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnHolyBackup);
+                this.columnHolyLocation = new global::System.Data.DataColumn("HolyLocation", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnHolyLocation);
+                this.columnHolyDays = new global::System.Data.DataColumn("HolyDays", typeof(int), null, global::System.Data.MappingType.Element);
+                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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -635,6 +725,9 @@ namespace FPJ0000 {
                 this.columnprocesss.ReadOnly = true;
                 this.columnprocesss.MaxLength = 50;
                 this.columnResponse.MaxLength = 255;
+                this.columnHolyReason.MaxLength = 100;
+                this.columnHolyBackup.MaxLength = 100;
+                this.columnHolyLocation.MaxLength = 100;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1011,6 +1104,86 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string HolyReason {
+                get {
+                    if (this.IsHolyReasonNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableEETGW_HolydayRequest.HolyReasonColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_HolydayRequest.HolyReasonColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string HolyBackup {
+                get {
+                    if (this.IsHolyBackupNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableEETGW_HolydayRequest.HolyBackupColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_HolydayRequest.HolyBackupColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string HolyLocation {
+                get {
+                    if (this.IsHolyLocationNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableEETGW_HolydayRequest.HolyLocationColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_HolydayRequest.HolyLocationColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int HolyDays {
+                get {
+                    if (this.IsHolyDaysNull()) {
+                        return 0;
+                    }
+                    else {
+                        return ((int)(this[this.tableEETGW_HolydayRequest.HolyDaysColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_HolydayRequest.HolyDaysColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public double HolyTimes {
+                get {
+                    if (this.IsHolyTimesNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableEETGW_HolydayRequest.HolyTimesColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_HolydayRequest.HolyTimesColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsuidNull() {
@@ -1154,6 +1327,66 @@ namespace FPJ0000 {
             public void SetconfNull() {
                 this[this.tableEETGW_HolydayRequest.confColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsHolyReasonNull() {
+                return this.IsNull(this.tableEETGW_HolydayRequest.HolyReasonColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetHolyReasonNull() {
+                this[this.tableEETGW_HolydayRequest.HolyReasonColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsHolyBackupNull() {
+                return this.IsNull(this.tableEETGW_HolydayRequest.HolyBackupColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetHolyBackupNull() {
+                this[this.tableEETGW_HolydayRequest.HolyBackupColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsHolyLocationNull() {
+                return this.IsNull(this.tableEETGW_HolydayRequest.HolyLocationColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetHolyLocationNull() {
+                this[this.tableEETGW_HolydayRequest.HolyLocationColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsHolyDaysNull() {
+                return this.IsNull(this.tableEETGW_HolydayRequest.HolyDaysColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetHolyDaysNull() {
+                this[this.tableEETGW_HolydayRequest.HolyDaysColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsHolyTimesNull() {
+                return this.IsNull(this.tableEETGW_HolydayRequest.HolyTimesColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetHolyTimesNull() {
+                this[this.tableEETGW_HolydayRequest.HolyTimesColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -1331,6 +1564,11 @@ namespace FPJ0000.DSKuntaeTableAdapters {
             tableMapping.ColumnMappings.Add("processs", "processs");
             tableMapping.ColumnMappings.Add("Response", "Response");
             tableMapping.ColumnMappings.Add("conf", "conf");
+            tableMapping.ColumnMappings.Add("HolyReason", "HolyReason");
+            tableMapping.ColumnMappings.Add("HolyBackup", "HolyBackup");
+            tableMapping.ColumnMappings.Add("HolyLocation", "HolyLocation");
+            tableMapping.ColumnMappings.Add("HolyDays", "HolyDays");
+            tableMapping.ColumnMappings.Add("HolyTimes", "HolyTimes");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -1340,8 +1578,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)
+               (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); 
+VALUES  (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes);   
 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, "", "", ""));
@@ -1349,22 +1587,22 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
             this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf", global::System.Data.SqlDbType.Int, 1, global::System.Data.ParameterDirection.Input, 0, 0, "conf", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conf", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, 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.SmallDateTime, 4, 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("@Response", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "Response", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.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.InsertCommand.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.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.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
+SET        gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response, 
-WHERE  (idx = @Original_idx) AND (gcode = @Original_gcode) AND (@IsNull_uid = 1 AND uid IS NULL OR
+               HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyReason, HolyDays = @HolyDays, HolyTimes = @HolyTimes
-               uid = @Original_uid) AND (@IsNull_cate = 1 AND cate IS NULL OR
+WHERE  (idx = @Original_idx);   
-               cate = @Original_cate) AND (@IsNull_sdate = 1 AND sdate IS NULL OR
-               sdate = @Original_sdate) AND (@IsNull_edate = 1 AND edate IS NULL OR
-               edate = @Original_edate) AND (@IsNull_conf = 1 AND conf IS NULL OR
-               conf = @Original_conf) AND (@IsNull_Remark = 1 AND Remark IS NULL OR
-               Remark = @Original_Remark) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate); 
 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, "", "", ""));
@@ -1372,27 +1610,16 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
             this._adapter.UpdateCommand.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._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf", global::System.Data.SqlDbType.Int, 1, global::System.Data.ParameterDirection.Input, 0, 0, "conf", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "conf", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Remark", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             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("@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("@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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_conf", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "conf", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_conf", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "conf", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Remark", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "Remark", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", 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, "", "", ""));
         }
         
@@ -1411,7 +1638,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
             this._commandCollection[0].Connection = this.Connection;
             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
+               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
 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)
@@ -1537,7 +1765,7 @@ 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) {
+        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) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
             }
@@ -1593,6 +1821,36 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
             else {
                 this.Adapter.InsertCommand.Parameters[9].Value = ((string)(Response));
             }
+            if ((HolyReason == null)) {
+                this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[10].Value = ((string)(HolyReason));
+            }
+            if ((HolyBackup == null)) {
+                this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[11].Value = ((string)(HolyBackup));
+            }
+            if ((HolyLocation == null)) {
+                this.Adapter.InsertCommand.Parameters[12].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[12].Value = ((string)(HolyLocation));
+            }
+            if ((HolyDays.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[13].Value = ((int)(HolyDays.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            if ((HolyTimes.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[14].Value = ((double)(HolyTimes.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[14].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)) {
@@ -1624,16 +1882,11 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
                     string wuid, 
                     System.DateTime wdate, 
                     string Response, 
+                    string HolyReason, 
+                    string HolyBackup, 
+                    global::System.Nullable<int> HolyDays, 
+                    global::System.Nullable<double> HolyTimes, 
                     int Original_idx, 
-                    string Original_gcode, 
-                    string Original_uid, 
-                    string Original_cate, 
-                    string Original_sdate, 
-                    string Original_edate, 
-                    global::System.Nullable<bool> Original_conf, 
-                    string Original_Remark, 
-                    string Original_wuid, 
-                    System.DateTime Original_wdate, 
                     int idx) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
@@ -1690,69 +1943,32 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
             else {
                 this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Response));
             }
-            this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx));
+            if ((HolyReason == null)) {
-            if ((Original_gcode == null)) {
+                this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
-                throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(HolyReason));
             }
-            if ((Original_uid == null)) {
+            if ((HolyBackup == null)) {
-                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(HolyBackup));
+            }
+            if ((HolyDays.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(HolyDays.Value));
+            }
+            else {
+                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[13].Value = global::System.DBNull.Value;
             }
-            else {
+            this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_idx));
-                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
+            this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(idx));
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_uid));
-            }
-            if ((Original_cate == null)) {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_cate));
-            }
-            if ((Original_sdate == null)) {
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_sdate));
-            }
-            if ((Original_edate == null)) {
-                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_edate));
-            }
-            if ((Original_conf.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((bool)(Original_conf.Value));
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
-            }
-            if ((Original_Remark == null)) {
-                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_Remark));
-            }
-            if ((Original_wuid == null)) {
-                throw new global::System.ArgumentNullException("Original_wuid");
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_wuid));
-            }
-            this.Adapter.UpdateCommand.Parameters[25].Value = ((System.DateTime)(Original_wdate));
-            this.Adapter.UpdateCommand.Parameters[26].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)) {

SubProject/FPJ0000/DSKuntae.xsc

@@ -9,18 +9,14 @@
     <TableUISetting Name="EETGW_HolydayRequest">
       <ColumnUISettings>
         <ColumnUISetting Name="idx">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
         <ColumnUISetting Name="cate">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
               <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
-          </ControlSettings>
         </ColumnUISetting>
       </ColumnUISettings>
     </TableUISetting>

SubProject/FPJ0000/DSKuntae.xsd

@@ -22,20 +22,25 @@ 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)
+               (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); 
+VALUES  (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes);   
 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="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <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" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="conf" ColumnName="conf" DataSourceName="" DataTypeServer="bit" DbType="Int32" Direction="Input" ParameterName="@conf" Precision="0" ProviderType="Int" Scale="0" Size="1" SourceColumn="conf" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="conf" ColumnName="conf" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@conf" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="conf" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Remark" ColumnName="Remark" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Remark" ColumnName="Remark" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Response" ColumnName="Response" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Response" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Response" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Response" ColumnName="Response" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Response" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Response" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="HolyReason" ColumnName="HolyReason" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyReason" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyReason" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <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="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" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -43,7 +48,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <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
+               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
 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)
@@ -58,43 +64,27 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC</CommandText
                 <UpdateCommand>
                   <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
+SET        gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response, 
-WHERE  (idx = @Original_idx) AND (gcode = @Original_gcode) AND (@IsNull_uid = 1 AND uid IS NULL OR
+               HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyReason, HolyDays = @HolyDays, HolyTimes = @HolyTimes
-               uid = @Original_uid) AND (@IsNull_cate = 1 AND cate IS NULL OR
+WHERE  (idx = @Original_idx);   
-               cate = @Original_cate) AND (@IsNull_sdate = 1 AND sdate IS NULL OR
-               sdate = @Original_sdate) AND (@IsNull_edate = 1 AND edate IS NULL OR
-               edate = @Original_edate) AND (@IsNull_conf = 1 AND conf IS NULL OR
-               conf = @Original_conf) AND (@IsNull_Remark = 1 AND Remark IS NULL OR
-               Remark = @Original_Remark) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate); 
 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="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <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" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="conf" ColumnName="conf" DataSourceName="" DataTypeServer="bit" DbType="Int32" Direction="Input" ParameterName="@conf" Precision="0" ProviderType="Int" Scale="0" Size="1" SourceColumn="conf" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="conf" ColumnName="conf" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@conf" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="conf" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Remark" ColumnName="Remark" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Remark" ColumnName="Remark" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Response" ColumnName="Response" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Response" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Response" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="Response" ColumnName="Response" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Response" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Response" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" 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="true" AutogeneratedName="HolyReason" ColumnName="HolyReason" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyReason" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyReason" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <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="IsNull_uid" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <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="Original_uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <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="IsNull_cate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <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="true" AutogeneratedName="Original_cate" ColumnName="cate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" 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" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_sdate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Original_sdate" ColumnName="sdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_edate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Original_edate" ColumnName="edate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_conf" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_conf" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="conf" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Original_conf" ColumnName="conf" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Original_conf" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="conf" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="IsNull_Remark" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_Remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Remark" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="Original_Remark" ColumnName="Remark" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Original_Remark" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="Remark" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -117,6 +107,11 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
               <Mapping SourceColumn="processs" DataSetColumn="processs" />
               <Mapping SourceColumn="Response" DataSetColumn="Response" />
               <Mapping SourceColumn="conf" DataSetColumn="conf" />
+              <Mapping SourceColumn="HolyReason" DataSetColumn="HolyReason" />
+              <Mapping SourceColumn="HolyBackup" DataSetColumn="HolyBackup" />
+              <Mapping SourceColumn="HolyLocation" DataSetColumn="HolyLocation" />
+              <Mapping SourceColumn="HolyDays" DataSetColumn="HolyDays" />
+              <Mapping SourceColumn="HolyTimes" DataSetColumn="HolyTimes" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -225,6 +220,29 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
                 </xs:simpleType>
               </xs:element>
               <xs:element name="conf" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="conf" msprop:Generator_ColumnVarNameInTable="columnconf" msprop:Generator_ColumnPropNameInTable="confColumn" msprop:Generator_UserColumnName="conf" type="xs:int" minOccurs="0" />
+              <xs:element name="HolyReason" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="HolyReason" msprop:Generator_ColumnVarNameInTable="columnHolyReason" msprop:Generator_ColumnPropNameInTable="HolyReasonColumn" msprop:Generator_UserColumnName="HolyReason" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="HolyBackup" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="HolyBackup" msprop:Generator_ColumnVarNameInTable="columnHolyBackup" msprop:Generator_ColumnPropNameInTable="HolyBackupColumn" msprop:Generator_UserColumnName="HolyBackup" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="HolyLocation" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="HolyLocation" msprop:Generator_ColumnVarNameInTable="columnHolyLocation" msprop:Generator_ColumnPropNameInTable="HolyLocationColumn" msprop:Generator_UserColumnName="HolyLocation" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </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:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/DSKuntae.xss

@@ -6,7 +6,7 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="385" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:EETGW_HolydayRequest" ZOrder="1" X="543" Y="75" Height="476" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="425" />
+    <Shape ID="DesignTable:EETGW_HolydayRequest" ZOrder="1" X="543" Y="76" Height="476" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="425" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs

@@ -31,12 +31,12 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyRequest));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.dSKuntae = new FPJ0000.DSKuntae();
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
@@ -66,27 +66,34 @@
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.dv1 = new arCtl.arDatagridView();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.dSKuntae = new FPJ0000.DSKuntae();
             this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
             this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.edateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HolyReason = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HolyLocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.processsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HolyDays = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HolyTimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -125,17 +132,6 @@
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
-            // bs
-            // 
-            this.bs.DataMember = "EETGW_HolydayRequest";
-            this.bs.DataSource = this.dSKuntae;
-            this.bs.Sort = "";
-            // 
-            // dSKuntae
-            // 
-            this.dSKuntae.DataSetName = "DSKuntae";
-            this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -170,7 +166,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -213,7 +208,6 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 25);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -300,7 +294,6 @@
             // dtSD
             // 
             this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtSD.Name = "dtSD";
             this.dtSD.Size = new System.Drawing.Size(90, 37);
             this.dtSD.Text = "1982-11-23";
@@ -324,7 +317,6 @@
             // dtED
             // 
             this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtED.Name = "dtED";
             this.dtED.Size = new System.Drawing.Size(90, 37);
             this.dtED.Text = "1982-11-23";
@@ -414,21 +406,26 @@
             this.cateDataGridViewTextBoxColumn,
             this.sdateDataGridViewTextBoxColumn,
             this.edateDataGridViewTextBoxColumn,
-            this.remarkDataGridViewTextBoxColumn,
+            this.HolyReason,
+            this.HolyLocation,
             this.telDataGridViewTextBoxColumn,
             this.processsDataGridViewTextBoxColumn,
             this.cmbCf,
-            this.Response});
+            this.Response,
+            this.HolyDays,
+            this.HolyTimes,
+            this.HolyBackup,
+            this.remarkDataGridViewTextBoxColumn});
             this.dv1.DataSource = this.bs;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(3);
+            dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(3);
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dv1.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dv1.DefaultCellStyle = dataGridViewCellStyle6;
             this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dv1.Location = new System.Drawing.Point(0, 0);
             this.dv1.Name = "dv1";
@@ -438,6 +435,17 @@
             this.dv1.TabIndex = 3;
             this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError);
             // 
+            // bs
+            // 
+            this.bs.DataMember = "EETGW_HolydayRequest";
+            this.bs.DataSource = this.dSKuntae;
+            this.bs.Sort = "";
+            // 
+            // dSKuntae
+            // 
+            this.dSKuntae.DataSetName = "DSKuntae";
+            this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
@@ -477,12 +485,19 @@
             this.edateDataGridViewTextBoxColumn.Name = "edateDataGridViewTextBoxColumn";
             this.edateDataGridViewTextBoxColumn.Width = 76;
             // 
-            // remarkDataGridViewTextBoxColumn
+            // HolyReason
             // 
-            this.remarkDataGridViewTextBoxColumn.DataPropertyName = "Remark";
+            this.HolyReason.DataPropertyName = "HolyReason";
-            this.remarkDataGridViewTextBoxColumn.HeaderText = "비고";
+            this.HolyReason.HeaderText = "사유";
-            this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
+            this.HolyReason.Name = "HolyReason";
-            this.remarkDataGridViewTextBoxColumn.Width = 64;
+            this.HolyReason.Width = 64;
+            // 
+            // HolyLocation
+            // 
+            this.HolyLocation.DataPropertyName = "HolyLocation";
+            this.HolyLocation.HeaderText = "행선지";
+            this.HolyLocation.Name = "HolyLocation";
+            this.HolyLocation.Width = 76;
             // 
             // telDataGridViewTextBoxColumn
             // 
@@ -522,6 +537,40 @@
             this.Response.Name = "Response";
             this.Response.Width = 104;
             // 
+            // HolyDays
+            // 
+            this.HolyDays.DataPropertyName = "HolyDays";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.HolyDays.DefaultCellStyle = dataGridViewCellStyle4;
+            this.HolyDays.HeaderText = "일";
+            this.HolyDays.Name = "HolyDays";
+            this.HolyDays.Width = 52;
+            // 
+            // HolyTimes
+            // 
+            this.HolyTimes.DataPropertyName = "HolyTimes";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle5;
+            this.HolyTimes.HeaderText = "시간";
+            this.HolyTimes.Name = "HolyTimes";
+            this.HolyTimes.Width = 64;
+            // 
+            // HolyBackup
+            // 
+            this.HolyBackup.DataPropertyName = "HolyBackup";
+            this.HolyBackup.HeaderText = "백업";
+            this.HolyBackup.Name = "HolyBackup";
+            this.HolyBackup.Width = 64;
+            // 
+            // remarkDataGridViewTextBoxColumn
+            // 
+            this.remarkDataGridViewTextBoxColumn.DataPropertyName = "Remark";
+            this.remarkDataGridViewTextBoxColumn.HeaderText = "비고";
+            this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
+            this.remarkDataGridViewTextBoxColumn.Width = 64;
+            // 
             // fHolyRequest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -537,8 +586,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             this.splitContainer1.Panel1.ResumeLayout(false);
@@ -546,6 +593,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -590,10 +639,15 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn sdateDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn edateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HolyReason;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HolyLocation;
         private System.Windows.Forms.DataGridViewTextBoxColumn telDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn processsDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewComboBoxColumn cmbCf;
         private System.Windows.Forms.DataGridViewTextBoxColumn Response;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HolyDays;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HolyTimes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup;
+        private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
     }
 }

SubProject/FPJ0000/OtConfirm/fHolyRequest.cs

@@ -48,8 +48,8 @@ namespace FPJ0000
         {
             curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
 
-            this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
+            this.dtED.Text = DateTime.Now.AddMonths(1).ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
-            this.dtSD.Text = DateTime.Now.AddMonths(-2).ToShortDateString();
+            this.dtSD.Text = DateTime.Now.AddMonths(-3).ToShortDateString();
 
             btSave.Visible = curLevel >= 5;
             btEdit.Text = curLevel >= 5 ? "승인(&E)" : "편집(&E)";
@@ -140,6 +140,7 @@ namespace FPJ0000
             e.Row["name"] = FCOMMON.info.Login.nameK;
             e.Row["dept"] = FCOMMON.info.Login.dept;
             e.Row["conf"] = 0;
+            e.Row["remark"] = "사유:\r\n행선지:\r\n업무백업:";
 
         }
 
@@ -237,6 +238,8 @@ namespace FPJ0000
             var newdr = this.dSKuntae.EETGW_HolydayRequest.NewEETGW_HolydayRequestRow();
             newdr.sdate = DateTime.Now.ToShortDateString();
             newdr.edate = DateTime.Now.ToShortDateString();
+            newdr.HolyDays = 1;
+            newdr.HolyTimes = 0f;
             newdr.cate = "연차";
             var f = new OtConfirm.fHolyRequestAdd(newdr);
             if (f.ShowDialog() == DialogResult.OK)

SubProject/FPJ0000/OtConfirm/fHolyRequest.resx

@@ -258,9 +258,24 @@
         UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="HolyReason.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="HolyLocation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Response.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="HolyDays.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="HolyTimes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="HolyBackup.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>358, 17</value>
   </metadata>

SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs

@@ -40,6 +40,15 @@ namespace FPJ0000.OtConfirm
             this.tbED = new System.Windows.Forms.DateTimePicker();
             this.tbRemark = new System.Windows.Forms.RichTextBox();
             this.grpUser = new System.Windows.Forms.GroupBox();
+            this.tbTimes = new System.Windows.Forms.TextBox();
+            this.tbDays = new System.Windows.Forms.TextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label10 = new System.Windows.Forms.Label();
+            this.tbBackup = new System.Windows.Forms.ComboBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.tbLocation = new System.Windows.Forms.ComboBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.tbReason = new System.Windows.Forms.ComboBox();
             this.tbTel = new System.Windows.Forms.TextBox();
             this.label7 = new System.Windows.Forms.Label();
             this.tbProcess = new System.Windows.Forms.TextBox();
@@ -48,12 +57,12 @@ 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.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.rad0 = new System.Windows.Forms.RadioButton();
-            this.rad1 = new System.Windows.Forms.RadioButton();
-            this.rad2 = new System.Windows.Forms.RadioButton();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit();
             this.grpUser.SuspendLayout();
@@ -75,7 +84,7 @@ namespace FPJ0000.OtConfirm
             this.label2.Location = new System.Drawing.Point(35, 90);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(93, 27);
-            this.label2.TabIndex = 0;
+            this.label2.TabIndex = 2;
             this.label2.Text = "종료일";
             // 
             // label3
@@ -84,7 +93,7 @@ namespace FPJ0000.OtConfirm
             this.label3.Location = new System.Drawing.Point(62, 136);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(66, 27);
-            this.label3.TabIndex = 0;
+            this.label3.TabIndex = 4;
             this.label3.Text = "구분";
             // 
             // tbCate
@@ -93,11 +102,12 @@ namespace FPJ0000.OtConfirm
             this.tbCate.FormattingEnabled = true;
             this.tbCate.Items.AddRange(new object[] {
             "연차",
-            "하기"});
+            "하기",
+            "대체"});
             this.tbCate.Location = new System.Drawing.Point(140, 133);
             this.tbCate.Name = "tbCate";
             this.tbCate.Size = new System.Drawing.Size(358, 35);
-            this.tbCate.TabIndex = 1;
+            this.tbCate.TabIndex = 5;
             // 
             // bs
             // 
@@ -115,7 +125,7 @@ namespace FPJ0000.OtConfirm
             this.tbSD.Location = new System.Drawing.Point(140, 39);
             this.tbSD.Name = "tbSD";
             this.tbSD.Size = new System.Drawing.Size(358, 38);
-            this.tbSD.TabIndex = 2;
+            this.tbSD.TabIndex = 1;
             // 
             // tbED
             // 
@@ -123,19 +133,28 @@ namespace FPJ0000.OtConfirm
             this.tbED.Location = new System.Drawing.Point(140, 86);
             this.tbED.Name = "tbED";
             this.tbED.Size = new System.Drawing.Size(358, 38);
-            this.tbED.TabIndex = 2;
+            this.tbED.TabIndex = 3;
             // 
             // tbRemark
             // 
             this.tbRemark.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Remark", true));
-            this.tbRemark.Location = new System.Drawing.Point(140, 174);
+            this.tbRemark.Location = new System.Drawing.Point(140, 297);
             this.tbRemark.Name = "tbRemark";
-            this.tbRemark.Size = new System.Drawing.Size(358, 116);
+            this.tbRemark.Size = new System.Drawing.Size(358, 169);
-            this.tbRemark.TabIndex = 3;
+            this.tbRemark.TabIndex = 13;
             this.tbRemark.Text = "";
             // 
             // grpUser
             // 
+            this.grpUser.Controls.Add(this.tbTimes);
+            this.grpUser.Controls.Add(this.tbDays);
+            this.grpUser.Controls.Add(this.label11);
+            this.grpUser.Controls.Add(this.label10);
+            this.grpUser.Controls.Add(this.tbBackup);
+            this.grpUser.Controls.Add(this.label9);
+            this.grpUser.Controls.Add(this.tbLocation);
+            this.grpUser.Controls.Add(this.label8);
+            this.grpUser.Controls.Add(this.tbReason);
             this.grpUser.Controls.Add(this.tbTel);
             this.grpUser.Controls.Add(this.label7);
             this.grpUser.Controls.Add(this.tbProcess);
@@ -152,18 +171,111 @@ namespace FPJ0000.OtConfirm
             this.grpUser.Controls.Add(this.tbCate);
             this.grpUser.Location = new System.Drawing.Point(12, 12);
             this.grpUser.Name = "grpUser";
-            this.grpUser.Size = new System.Drawing.Size(788, 311);
+            this.grpUser.Size = new System.Drawing.Size(788, 487);
-            this.grpUser.TabIndex = 4;
+            this.grpUser.TabIndex = 0;
             this.grpUser.TabStop = false;
             this.grpUser.Text = "신청자";
             // 
+            // tbTimes
+            // 
+            this.tbTimes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbTimes.Location = new System.Drawing.Point(653, 428);
+            this.tbTimes.Name = "tbTimes";
+            this.tbTimes.Size = new System.Drawing.Size(116, 38);
+            this.tbTimes.TabIndex = 23;
+            this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // tbDays
+            // 
+            this.tbDays.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbDays.Location = new System.Drawing.Point(518, 428);
+            this.tbDays.Name = "tbDays";
+            this.tbDays.Size = new System.Drawing.Size(116, 38);
+            this.tbDays.TabIndex = 21;
+            this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(513, 394);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(167, 27);
+            this.label11.TabIndex = 20;
+            this.label11.Text = "사용 일/시간";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(8, 260);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(120, 27);
+            this.label10.TabIndex = 10;
+            this.label10.Text = "백업인원";
+            // 
+            // tbBackup
+            // 
+            this.tbBackup.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
+            this.tbBackup.FormattingEnabled = true;
+            this.tbBackup.Items.AddRange(new object[] {
+            "연차",
+            "하기",
+            "대체"});
+            this.tbBackup.Location = new System.Drawing.Point(140, 256);
+            this.tbBackup.Name = "tbBackup";
+            this.tbBackup.Size = new System.Drawing.Size(358, 35);
+            this.tbBackup.TabIndex = 11;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(35, 218);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(93, 27);
+            this.label9.TabIndex = 8;
+            this.label9.Text = "행선지";
+            // 
+            // tbLocation
+            // 
+            this.tbLocation.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
+            this.tbLocation.FormattingEnabled = true;
+            this.tbLocation.Items.AddRange(new object[] {
+            "연차",
+            "하기",
+            "대체"});
+            this.tbLocation.Location = new System.Drawing.Point(140, 215);
+            this.tbLocation.Name = "tbLocation";
+            this.tbLocation.Size = new System.Drawing.Size(358, 35);
+            this.tbLocation.TabIndex = 9;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(62, 177);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(66, 27);
+            this.label8.TabIndex = 6;
+            this.label8.Text = "사유";
+            // 
+            // tbReason
+            // 
+            this.tbReason.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
+            this.tbReason.FormattingEnabled = true;
+            this.tbReason.Items.AddRange(new object[] {
+            "연차",
+            "하기",
+            "대체"});
+            this.tbReason.Location = new System.Drawing.Point(140, 174);
+            this.tbReason.Name = "tbReason";
+            this.tbReason.Size = new System.Drawing.Size(358, 35);
+            this.tbReason.TabIndex = 7;
+            // 
             // tbTel
             // 
             this.tbTel.Location = new System.Drawing.Point(518, 247);
             this.tbTel.Name = "tbTel";
             this.tbTel.ReadOnly = true;
             this.tbTel.Size = new System.Drawing.Size(251, 38);
-            this.tbTel.TabIndex = 9;
+            this.tbTel.TabIndex = 19;
             // 
             // label7
             // 
@@ -171,24 +283,24 @@ namespace FPJ0000.OtConfirm
             this.label7.Location = new System.Drawing.Point(513, 214);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(66, 27);
-            this.label7.TabIndex = 8;
+            this.label7.TabIndex = 18;
             this.label7.Text = "전화";
             // 
             // tbProcess
             // 
-            this.tbProcess.Location = new System.Drawing.Point(518, 157);
+            this.tbProcess.Location = new System.Drawing.Point(518, 154);
             this.tbProcess.Name = "tbProcess";
             this.tbProcess.ReadOnly = true;
             this.tbProcess.Size = new System.Drawing.Size(251, 38);
-            this.tbProcess.TabIndex = 7;
+            this.tbProcess.TabIndex = 17;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(513, 124);
+            this.label6.Location = new System.Drawing.Point(513, 121);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(66, 27);
-            this.label6.TabIndex = 6;
+            this.label6.TabIndex = 16;
             this.label6.Text = "공정";
             // 
             // tbName
@@ -197,7 +309,7 @@ namespace FPJ0000.OtConfirm
             this.tbName.Name = "tbName";
             this.tbName.ReadOnly = true;
             this.tbName.Size = new System.Drawing.Size(251, 38);
-            this.tbName.TabIndex = 5;
+            this.tbName.TabIndex = 15;
             // 
             // label5
             // 
@@ -205,16 +317,16 @@ namespace FPJ0000.OtConfirm
             this.label5.Location = new System.Drawing.Point(513, 32);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(66, 27);
-            this.label5.TabIndex = 4;
+            this.label5.TabIndex = 14;
             this.label5.Text = "성명";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(62, 177);
+            this.label4.Location = new System.Drawing.Point(62, 300);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(66, 27);
-            this.label4.TabIndex = 0;
+            this.label4.TabIndex = 12;
             this.label4.Text = "비고";
             // 
             // grpAdmin
@@ -223,13 +335,47 @@ namespace FPJ0000.OtConfirm
             this.grpAdmin.Controls.Add(this.rad1);
             this.grpAdmin.Controls.Add(this.rad0);
             this.grpAdmin.Controls.Add(this.tbResponse);
-            this.grpAdmin.Location = new System.Drawing.Point(12, 338);
+            this.grpAdmin.Location = new System.Drawing.Point(12, 520);
             this.grpAdmin.Name = "grpAdmin";
             this.grpAdmin.Size = new System.Drawing.Size(788, 228);
-            this.grpAdmin.TabIndex = 4;
+            this.grpAdmin.TabIndex = 1;
             this.grpAdmin.TabStop = false;
             this.grpAdmin.Text = "관리자";
             // 
+            // rad2
+            // 
+            this.rad2.AutoSize = true;
+            this.rad2.Location = new System.Drawing.Point(269, 37);
+            this.rad2.Name = "rad2";
+            this.rad2.Size = new System.Drawing.Size(84, 31);
+            this.rad2.TabIndex = 2;
+            this.rad2.TabStop = true;
+            this.rad2.Text = "거절";
+            this.rad2.UseVisualStyleBackColor = true;
+            // 
+            // rad1
+            // 
+            this.rad1.AutoSize = true;
+            this.rad1.Location = new System.Drawing.Point(179, 37);
+            this.rad1.Name = "rad1";
+            this.rad1.Size = new System.Drawing.Size(84, 31);
+            this.rad1.TabIndex = 1;
+            this.rad1.TabStop = true;
+            this.rad1.Text = "승인";
+            this.rad1.UseVisualStyleBackColor = true;
+            // 
+            // rad0
+            // 
+            this.rad0.AutoSize = true;
+            this.rad0.Checked = true;
+            this.rad0.Location = new System.Drawing.Point(26, 37);
+            this.rad0.Name = "rad0";
+            this.rad0.Size = new System.Drawing.Size(147, 31);
+            this.rad0.TabIndex = 0;
+            this.rad0.TabStop = true;
+            this.rad0.Text = "선택 안함";
+            this.rad0.UseVisualStyleBackColor = true;
+            // 
             // tbResponse
             // 
             this.tbResponse.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Response", true));
@@ -241,10 +387,10 @@ namespace FPJ0000.OtConfirm
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(12, 578);
+            this.button1.Location = new System.Drawing.Point(12, 760);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(788, 72);
-            this.button1.TabIndex = 5;
+            this.button1.TabIndex = 2;
             this.button1.Text = "확인";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
@@ -253,44 +399,10 @@ namespace FPJ0000.OtConfirm
             // 
             this.ta.ClearBeforeFill = true;
             // 
-            // rad0
-            // 
-            this.rad0.AutoSize = true;
-            this.rad0.Checked = true;
-            this.rad0.Location = new System.Drawing.Point(26, 37);
-            this.rad0.Name = "rad0";
-            this.rad0.Size = new System.Drawing.Size(147, 31);
-            this.rad0.TabIndex = 5;
-            this.rad0.TabStop = true;
-            this.rad0.Text = "선택 안함";
-            this.rad0.UseVisualStyleBackColor = true;
-            // 
-            // rad1
-            // 
-            this.rad1.AutoSize = true;
-            this.rad1.Location = new System.Drawing.Point(179, 37);
-            this.rad1.Name = "rad1";
-            this.rad1.Size = new System.Drawing.Size(84, 31);
-            this.rad1.TabIndex = 5;
-            this.rad1.TabStop = true;
-            this.rad1.Text = "승인";
-            this.rad1.UseVisualStyleBackColor = true;
-            // 
-            // rad2
-            // 
-            this.rad2.AutoSize = true;
-            this.rad2.Location = new System.Drawing.Point(269, 37);
-            this.rad2.Name = "rad2";
-            this.rad2.Size = new System.Drawing.Size(84, 31);
-            this.rad2.TabIndex = 5;
-            this.rad2.TabStop = true;
-            this.rad2.Text = "거절";
-            this.rad2.UseVisualStyleBackColor = true;
-            // 
             // fHolyRequestAdd
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(812, 664);
+            this.ClientSize = new System.Drawing.Size(812, 851);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.grpAdmin);
             this.Controls.Add(this.grpUser);
@@ -337,5 +449,14 @@ namespace FPJ0000.OtConfirm
         private System.Windows.Forms.RadioButton rad0;
         private System.Windows.Forms.RadioButton rad2;
         private System.Windows.Forms.RadioButton rad1;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.ComboBox tbLocation;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.ComboBox tbReason;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.ComboBox tbBackup;
+        private System.Windows.Forms.TextBox tbTimes;
+        private System.Windows.Forms.TextBox tbDays;
+        private System.Windows.Forms.Label label11;
     }
 }

SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs

@@ -18,6 +18,23 @@ namespace FPJ0000.OtConfirm
             InitializeComponent();
             dr = dr_;
 
+
+            var 구분목록 = FCOMMON.DBM.getCodeList("50");
+            var 사유목록 = FCOMMON.DBM.getCodeList("51");
+            var 위치목록 = FCOMMON.DBM.getCodeList("52");
+            var 백업목록 = FCOMMON.DBM.getCodeList("53");
+
+            tbCate.Items.Clear();
+            tbReason.Items.Clear();
+            tbLocation.Items.Clear();
+            tbBackup.Items.Clear();
+
+            foreach (var item in 구분목록) tbCate.Items.Add(item.Value);
+            foreach (var item in 사유목록) tbReason.Items.Add(item.Value);
+            foreach (var item in 위치목록) tbLocation.Items.Add(item.Value);
+            foreach (var item in 백업목록) tbBackup.Items.Add(item.Value);
+
+
             if (dr.RowState == DataRowState.Detached)
             {
                 this.Text = "휴가신청 추가";
@@ -41,14 +58,21 @@ namespace FPJ0000.OtConfirm
             tbResponse.Text = dr.Response;
             tbSD.Value = DateTime.Parse(dr.sdate);
             tbED.Value = DateTime.Parse(dr.edate);
+            tbReason.Text = dr.HolyReason;
+            tbLocation.Text = dr.HolyLocation;
+            tbBackup.Text = dr.HolyBackup;
+            tbDays.Text = dr.HolyDays.ToString();   //211224
+            tbTimes.Text = dr.HolyTimes.ToString();
+
         }
         int curLevel = 0;
         private void fHolyRequestAdd_Load(object sender, EventArgs e)
         {
             curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq));
 
+
             //관리자라면 관리자패널을 활성해준다.
-            if(dr.RowState == DataRowState.Detached)
+            if (dr.RowState == DataRowState.Detached)
             {
                 grpAdmin.Enabled = false;
             }
@@ -56,7 +80,7 @@ namespace FPJ0000.OtConfirm
             {
                 grpAdmin.Enabled = curLevel >= 5;
             }
-            
+
 
         }
 
@@ -94,11 +118,30 @@ namespace FPJ0000.OtConfirm
                 }
             }
 
+            var vDay = 0;
+            var vTime = 0f;
+
+            if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim());
+            if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim());
+
+            if (vDay < 1 && vTime < 0.1)
+            {
+                FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요");
+                return;
+            }
+
+            dr.HolyReason = tbReason.Text.Trim();
+            dr.HolyLocation = tbLocation.Text.Trim();
+            dr.HolyBackup = tbBackup.Text.Trim();
             dr.cate = tbCate.Text.Trim();
             dr.Remark = tbRemark.Text.Trim();
             dr.Response = tbResponse.Text.Trim();
             dr.sdate = tbSD.Value.ToShortDateString();
             dr.edate = tbED.Value.ToShortDateString();
+
+            dr.HolyDays = vDay;
+            dr.HolyTimes = vTime;//
+
             if (rad0.Checked) dr.conf = 0;
             else if (rad1.Checked) dr.conf = 1;
             else if (rad2.Checked) dr.conf = 2;