diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index b80e5d6..7d48bc7 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.02.09.0950")]
-[assembly: AssemblyFileVersion("22.02.09.0950")]
+[assembly: AssemblyVersion("22.02.25.0150")]
+[assembly: AssemblyFileVersion("22.02.25.0150")]
diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs
index 9c7f357..4ca7570 100644
--- a/SubProject/FBS0000/Holiday/WorkTable.cs
+++ b/SubProject/FBS0000/Holiday/WorkTable.cs
@@ -19,7 +19,7 @@ namespace FBS0000
             InitializeComponent();
 
             var sd = DateTime.Now.ToString("yyyy-MM-01");
-            var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
+            var ed = DateTime.Parse(sd).AddMonths(1).AddDays(-1).ToShortDateString();//  DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
 
             tbSD.Text = sd;
             tbED.Text = ed;
@@ -78,7 +78,7 @@ namespace FBS0000
                 fpSpread1_Sheet1.Columns[c].Tag = coltag[c];
                 fpSpread1_Sheet1.Columns[c].Label = cols[c];
                 if (c < 4) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
-                else if (c > cols.Count - 4) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
+                else if (c > cols.Count - 5) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
                 else fpSpread1_Sheet1.Columns[c].BackColor = Color.White;
             }
 
@@ -136,7 +136,7 @@ namespace FBS0000
 
 
                 //이월잔액
-                var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.ToShortDateString(), "999999");
+                var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.AddDays(-1).ToShortDateString(), "999999");
                 var used = 0.0;
 
                 fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
@@ -150,10 +150,12 @@ namespace FBS0000
                     var bholy = false;
                     //이날짜가 휴일인지 체크한다.
                     var drHoly = HolyList.Where(t => t.pdate == curDate.ToShortDateString()).FirstOrDefault();
+
                     if (drHoly != null && drHoly.free)
                     {
                         bholy = true;
                         fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.LightPink;
+                        fpSpread1_Sheet1.Cells[rowindex, c].Tag = drHoly.memo;
                         if (drHoly.memo == "토요일" || drHoly.memo == "일요일")
                         {
                             fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
@@ -165,13 +167,16 @@ namespace FBS0000
                     }
                     else
                     {
-                        if (fpSpread1_Sheet1.Cells[rowindex, c].Tag == null)
-                        {
-                            fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
-                            //fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.FromArgb(240, 240, 240);
-                        }
+                        //휴일은 아님
+
+                        fpSpread1_Sheet1.Cells[rowindex, c].Tag = null;
+                        fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
                     }
 
+                    //기본으로 데이터를 초기화해준다.
+                    fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
+
+
                     //입사일이면 메세지 추가
                     if (item.indate == curDate.ToShortDateString())
                         fpSpread1_Sheet1.Cells[rowindex, c].Note += "입사";
@@ -179,103 +184,129 @@ namespace FBS0000
                         fpSpread1_Sheet1.Cells[rowindex, c].Note += "퇴사";
 
 
-
-                    var dr = dtHoly.Where(t => t.uid == item.empno && t.sdate.ToShortDateString() == curDate.ToShortDateString()).FirstOrDefault();
-                    if (dr != null)
+                    //근태기록에 자료가 있는지 확인한다.
+                    var dr = dtHoly.Where(t => t.uid == item.empno && ( t.sdate.ToShortDateString().CompareTo(curDate.ToShortDateString()) <= 0 && t.edate.ToShortDateString().CompareTo(curDate.ToShortDateString()) >= 0)).FirstOrDefault();
+                    if (dr != null && fpSpread1_Sheet1.Cells[rowindex, c].Tag == null)  //휴일이 아니여야 한다
                     {
                         //휴가내역이 있다.
                         if (dr.term > 0)
-                            used += dr.term;
+                            used += 1;
 
                         //자료가있다.
-                        if (string.IsNullOrEmpty(dr.tag) == false) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.tag;
-                        else if (dr.term > 0)
+                        if (string.IsNullOrEmpty(dr.tag) == false)
                         {
-
-
-                            var timedays = dr.term;// Math.Floor(dr.CrTime / 8f);
-                            var curday = 0;
-                            var accday = 1;
-                            while (accday <= timedays)
-                            {
-                                //var remaintime = dr.CrTime - accday * 8f;
-                                var columnindex = c + curday;
-                                var columnDate = (DateTime)this.fpSpread1_Sheet1.Columns[columnindex].Tag;
-
-
-                                var drHolyChk = HolyList.Where(t => t.pdate == columnDate.ToShortDateString()).FirstOrDefault();
-                                var drholyOK = false;
-                                if (drHolyChk != null && drHolyChk.free) drholyOK = true; //이러면 휴일이었다
-
-                                if (drholyOK == false)
-                                {
-                                    fpSpread1_Sheet1.Cells[rowindex, c + curday].Value = dr.cate.Substring(0, 2);
-
-                                    if (dr.cate == "이월")
-                                        fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.Gold;
-                                    else if (dr.cate == "경조")
-                                        fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.Pink;
-                                    else
-                                        fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.Lime;
-
-                                    fpSpread1_Sheet1.Cells[rowindex, c + curday].Tag = "1";
-                                    accday += 1;
-                                }
-
-                                curday += 1;
-
-                            }
-
-
-
-
-                            //for (int ii = 0; ii < dr.term; ii++)
-                            //{
-
-                            //    if (dr.cate == "이월")
-                            //        fpSpread1_Sheet1.Cells[rowindex, c + ii].BackColor = Color.Gold;
-                            //    else
-                            //        fpSpread1_Sheet1.Cells[rowindex, c + ii].BackColor = Color.Lime;
-                            //    fpSpread1_Sheet1.Cells[rowindex, c + ii].Value = dr.cate.Substring(0, 2);
-                            //    fpSpread1_Sheet1.Cells[rowindex, c + ii].Tag = "1";
-                            //}
+                            fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.tag;
                         }
-                        else if (dr.term != 0)
+                        else
                         {
-                            fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.term.ToString() + "Y";
-                        }
+                            fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.cate.Substring(0, 2);
 
-                        if (dr.CrTime != 0)
+                            if (dr.cate == "이월")
+                                fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.Gold;
+                            else if (dr.cate == "경조")
+                                fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.Pink;
+                            else
+                                fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.Lime;
+
+                            fpSpread1_Sheet1.Cells[rowindex, c].Tag = "1";
+                        }
+                        //else if (dr.term > 0)
+                        //{
+
+
+                        //    var timedays = dr.term;// Math.Floor(dr.CrTime / 8f);
+                        //    var curday = 0;
+                        //    var accday = 1;
+                        //    //while (accday <= timedays)
+                        //    {
+                        //        //var remaintime = dr.CrTime - accday * 8f;
+                        //        var columnindex = c + curday;
+
+                        //        if (columnindex >= fpSpread1_Sheet1.ColumnCount) break;
+
+                        //        var columnDate = (DateTime)this.fpSpread1_Sheet1.Columns[columnindex].Tag;
+
+
+                        //        var drHolyChk = HolyList.Where(t => t.pdate == columnDate.ToShortDateString()).FirstOrDefault();
+                        //        var drholyOK = false;
+                        //        if (drHolyChk != null && drHolyChk.free) drholyOK = true; //이러면 휴일이었다
+
+                        //        if (drholyOK == false)
+                        //        {
+                        //            fpSpread1_Sheet1.Cells[rowindex, c + curday].Value = dr.cate.Substring(0, 2);
+
+                        //            if (dr.cate == "이월")
+                        //                fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.Gold;
+                        //            else if (dr.cate == "경조")
+                        //                fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.Pink;
+                        //            else
+                        //                fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.Lime;
+
+                        //            fpSpread1_Sheet1.Cells[rowindex, c + curday].Tag = "1";
+                        //            accday += 1;
+                        //        }
+
+                        //        curday += 1;
+
+                        //    }
+
+
+
+
+                        //    //for (int ii = 0; ii < dr.term; ii++)
+                        //    //{
+
+                        //    //    if (dr.cate == "이월")
+                        //    //        fpSpread1_Sheet1.Cells[rowindex, c + ii].BackColor = Color.Gold;
+                        //    //    else
+                        //    //        fpSpread1_Sheet1.Cells[rowindex, c + ii].BackColor = Color.Lime;
+                        //    //    fpSpread1_Sheet1.Cells[rowindex, c + ii].Value = dr.cate.Substring(0, 2);
+                        //    //    fpSpread1_Sheet1.Cells[rowindex, c + ii].Tag = "1";
+                        //    //}
+                        //}
+                        //else if (dr.term != 0)
+                        //{
+                        //    fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.term.ToString() + "Y";
+                        //}
+
+                        //if (dr.CrTime != 0)
+                        //{
+                        //    var timedays = Math.Floor(dr.CrTime / 8f);
+                        //    var curday = 0;
+                        //    var accday = 1;
+                        //    while (accday <= timedays)
+                        //    {
+                        //        var remaintime = dr.CrTime - ((accday - 1) * 8f);
+                        //        var columnindex = c + curday;
+                        //        var columnDate = (DateTime)this.fpSpread1_Sheet1.Columns[columnindex].Tag;
+
+
+                        //        var drHolyChk = HolyList.Where(t => t.pdate == columnDate.ToShortDateString()).FirstOrDefault();
+                        //        var drholyOK = false;
+                        //        if (drHolyChk != null && drHolyChk.free) drholyOK = true; //이러면 휴일이었다
+
+                        //        if (drholyOK == false)
+                        //        {
+                        //            if (remaintime > 8) remaintime = 8;
+                        //            fpSpread1_Sheet1.Cells[rowindex, c + curday].Value = remaintime.ToString();
+                        //            fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.DeepSkyBlue;
+                        //            fpSpread1_Sheet1.Cells[rowindex, c + curday].Tag = "1";
+                        //            accday += 1;
+                        //        }
+
+                        //        curday += 1;
+
+                        //    }
+                        //}
+
+                        if (string.IsNullOrEmpty(dr.contents) == false)
                         {
-                            var timedays = Math.Floor(dr.CrTime / 8f);
-                            var curday = 0;
-                            var accday = 1;
-                            while (accday <= timedays)
-                            {
-                                var remaintime = dr.CrTime - ((accday - 1) * 8f);
-                                var columnindex = c + curday;
-                                var columnDate = (DateTime)this.fpSpread1_Sheet1.Columns[columnindex].Tag;
-
-
-                                var drHolyChk = HolyList.Where(t => t.pdate == columnDate.ToShortDateString()).FirstOrDefault();
-                                var drholyOK = false;
-                                if (drHolyChk != null && drHolyChk.free) drholyOK = true; //이러면 휴일이었다
-
-                                if (drholyOK == false)
-                                {
-                                    if (remaintime > 8) remaintime = 8;
-                                    fpSpread1_Sheet1.Cells[rowindex, c + curday].Value = remaintime.ToString();
-                                    fpSpread1_Sheet1.Cells[rowindex, c + curday].BackColor = Color.DeepSkyBlue;
-                                    fpSpread1_Sheet1.Cells[rowindex, c + curday].Tag = "1";
-                                    accday += 1;
-                                }
-
-                                curday += 1;
-
-                            }
+                            fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents} 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
+                        }
+                        else if (dr.sdate.ToShortDateString() != dr.edate.ToShortDateString())
+                        {
+                            fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}) 기간:{dr.sdate.ToShortDateString()}~{dr.edate.ToShortDateString()}";
                         }
-
-                        if (string.IsNullOrEmpty(dr.contents) == false) fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents}";
                         //else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
                     }
                     else
@@ -335,13 +366,13 @@ namespace FBS0000
                                     {
                                         fpSpread1_Sheet1.Cells[rowindex, c].Value = "--";
                                         fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.Red;
-                                    }   
+                                    }
                                     else
                                     {
                                         fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
                                         fpSpread1_Sheet1.Cells[rowindex, c].ForeColor = Color.Black;
                                     }
-                                        
+
 
                                     fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
                                     //fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
@@ -462,18 +493,18 @@ namespace FBS0000
         private void toolStripButton4_Click(object sender, EventArgs e)
         {
 
-            var sd = DateTime.Parse(tbSD.Text);
+            var sd = DateTime.Parse(DateTime.Parse(tbSD.Text).ToString("yyyy-MM-01"));
             sd = sd.AddMonths(-1);
-            var ed = sd.AddMonths(1);
+            var ed = sd.AddMonths(1).AddDays(-1);
             tbSD.Text = sd.ToShortDateString();
             tbED.Text = ed.ToShortDateString();
         }
 
         private void toolStripButton5_Click(object sender, EventArgs e)
         {
-            var sd = DateTime.Parse(tbSD.Text);
+            var sd = DateTime.Parse(DateTime.Parse(tbSD.Text).ToString("yyyy-MM-01"));
             sd = sd.AddMonths(1);
-            var ed = sd.AddMonths(1);
+            var ed = sd.AddMonths(1).AddDays(-1);
             tbSD.Text = sd.ToShortDateString();
             tbED.Text = ed.ToShortDateString();
         }
diff --git a/SubProject/FBS0000/Holiday/fImpKunTae.cs b/SubProject/FBS0000/Holiday/fImpKunTae.cs
index 5353b09..fcd988b 100644
--- a/SubProject/FBS0000/Holiday/fImpKunTae.cs
+++ b/SubProject/FBS0000/Holiday/fImpKunTae.cs
@@ -98,7 +98,7 @@ namespace FBS0000.Holiday
             var ta = new dsMSSQLTableAdapters.HolydayTableAdapter();
             foreach (ListViewItem item in items)
             {
-                ta.InsertShort(item.SubItems[2].Text, item.SubItems[0].Text, double.Parse(item.SubItems[4].Text),
+                ta.InsertShort(item.SubItems[2].Text, item.SubItems[0].Text, item.SubItems[0].Text, double.Parse(item.SubItems[4].Text),
                     "PASTE", "PASTE", item.SubItems[1].Text, FCOMMON.info.Login.no, DateTime.Now,
                     double.Parse(item.SubItems[3].Text), FCOMMON.info.Login.gcode,
                     double.Parse(item.SubItems[5].Text), double.Parse(item.SubItems[6].Text), "CLIPBOARD");
diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs
index 4730ce2..cfb9bef 100644
--- a/SubProject/FBS0000/dsMSSQL.Designer.cs
+++ b/SubProject/FBS0000/dsMSSQL.Designer.cs
@@ -8276,7 +8276,12 @@ ORDER BY sdate, edate, uid";
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
-            this._commandCollection[1].CommandText = @"SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) ORDER BY sdate, edate, uid";
+            this._commandCollection[1].CommandText = @"SELECT  CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, 
+               wuid
+FROM     Holyday
+WHERE  (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) OR
+               (gcode = @gcode) AND (edate BETWEEN @sd AND @ed)
+ORDER BY sdate, edate, uid";
             this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -8298,12 +8303,13 @@ ORDER BY sdate, edate, uid";
             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
             this._commandCollection[4].CommandText = @"INSERT INTO Holyday
-               (cate, sdate, term, title, contents, uid, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
-VALUES  (@cate,@sdate,@term,@title,@contents,@uid,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);  
+               (cate, sdate, edate, term, title, contents, uid, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
+VALUES  (@cate,@sdate,@edate,@term,@title,@contents,@uid,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);   
 SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid";
             this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[4].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._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -9328,8 +9334,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [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, false)]
-        public virtual int InsertShort(string cate, string sdate, global::System.Nullable<double> term, string title, string contents, string uid, string wuid, System.DateTime wdate, global::System.Nullable<double> termDr, string gcode, global::System.Nullable<double> DrTime, global::System.Nullable<double> CrTime, string tag) {
+        public virtual int InsertShort(string cate, string sdate, string edate, global::System.Nullable<double> term, string title, string contents, string uid, string wuid, System.DateTime wdate, global::System.Nullable<double> termDr, string gcode, global::System.Nullable<double> DrTime, global::System.Nullable<double> CrTime, string tag) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
             if ((cate == null)) {
                 command.Parameters[0].Value = global::System.DBNull.Value;
@@ -9343,66 +9348,72 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             else {
                 command.Parameters[1].Value = ((string)(sdate));
             }
-            if ((term.HasValue == true)) {
-                command.Parameters[2].Value = ((double)(term.Value));
-            }
-            else {
+            if ((edate == null)) {
                 command.Parameters[2].Value = global::System.DBNull.Value;
             }
-            if ((title == null)) {
-                command.Parameters[3].Value = global::System.DBNull.Value;
+            else {
+                command.Parameters[2].Value = ((string)(edate));
+            }
+            if ((term.HasValue == true)) {
+                command.Parameters[3].Value = ((double)(term.Value));
             }
             else {
-                command.Parameters[3].Value = ((string)(title));
+                command.Parameters[3].Value = global::System.DBNull.Value;
             }
-            if ((contents == null)) {
+            if ((title == null)) {
                 command.Parameters[4].Value = global::System.DBNull.Value;
             }
             else {
-                command.Parameters[4].Value = ((string)(contents));
+                command.Parameters[4].Value = ((string)(title));
             }
-            if ((uid == null)) {
+            if ((contents == null)) {
                 command.Parameters[5].Value = global::System.DBNull.Value;
             }
             else {
-                command.Parameters[5].Value = ((string)(uid));
+                command.Parameters[5].Value = ((string)(contents));
+            }
+            if ((uid == null)) {
+                command.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[6].Value = ((string)(uid));
             }
             if ((wuid == null)) {
                 throw new global::System.ArgumentNullException("wuid");
             }
             else {
-                command.Parameters[6].Value = ((string)(wuid));
+                command.Parameters[7].Value = ((string)(wuid));
             }
-            command.Parameters[7].Value = ((System.DateTime)(wdate));
+            command.Parameters[8].Value = ((System.DateTime)(wdate));
             if ((termDr.HasValue == true)) {
-                command.Parameters[8].Value = ((double)(termDr.Value));
+                command.Parameters[9].Value = ((double)(termDr.Value));
             }
             else {
-                command.Parameters[8].Value = global::System.DBNull.Value;
+                command.Parameters[9].Value = global::System.DBNull.Value;
             }
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
             }
             else {
-                command.Parameters[9].Value = ((string)(gcode));
+                command.Parameters[10].Value = ((string)(gcode));
             }
             if ((DrTime.HasValue == true)) {
-                command.Parameters[10].Value = ((double)(DrTime.Value));
-            }
-            else {
-                command.Parameters[10].Value = global::System.DBNull.Value;
-            }
-            if ((CrTime.HasValue == true)) {
-                command.Parameters[11].Value = ((double)(CrTime.Value));
+                command.Parameters[11].Value = ((double)(DrTime.Value));
             }
             else {
                 command.Parameters[11].Value = global::System.DBNull.Value;
             }
-            if ((tag == null)) {
-                command.Parameters[12].Value = global::System.DBNull.Value;
+            if ((CrTime.HasValue == true)) {
+                command.Parameters[12].Value = ((double)(CrTime.Value));
             }
             else {
-                command.Parameters[12].Value = ((string)(tag));
+                command.Parameters[12].Value = global::System.DBNull.Value;
+            }
+            if ((tag == null)) {
+                command.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[13].Value = ((string)(tag));
             }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd
index 9e6a22b..b7c4031 100644
--- a/SubProject/FBS0000/dsMSSQL.xsd
+++ b/SubProject/FBS0000/dsMSSQL.xsd
@@ -417,7 +417,12 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByDate" GeneratorSourceName="FillByDate" GetMethodModifier="Public" GetMethodName="GetByDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByDate" UserSourceName="FillByDate">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) ORDER BY sdate, edate, uid</CommandText>
+                    <CommandText>SELECT  CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, 
+               wuid
+FROM     Holyday
+WHERE  (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) OR
+               (gcode = @gcode) AND (edate BETWEEN @sd AND @ed)
+ORDER BY sdate, edate, uid</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" 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="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -474,6 +479,30 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO Holyday
+               (cate, sdate, edate, term, title, contents, uid, wuid, wdate, termDr, gcode, DrTime, CrTime, tag)
+VALUES  (@cate,@sdate,@edate,@term,@title,@contents,@uid,@wuid,@wdate,@termDr,@gcode,@DrTime,@CrTime,@tag);   
+SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.Holyday" 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="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="term" ColumnName="term" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@term" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="term" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="title" ColumnName="title" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@title" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="title" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="contents" ColumnName="contents" DataSourceName="EE.dbo.Holyday" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@contents" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="contents" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" 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="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Holyday" 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="EE.dbo.Holyday" 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="termDr" ColumnName="termDr" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@termDr" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="termDr" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" 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="DrTime" ColumnName="DrTime" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@DrTime" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="DrTime" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CrTime" ColumnName="CrTime" DataSourceName="EE.dbo.Holyday" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@CrTime" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="CrTime" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="tag" ColumnName="tag" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
               </DbSource>
             </Sources>
           </TableAdapter>
@@ -846,7 +875,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
   <xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="minutes" msprop:Generator_TableClassName="minutesDataTable" msprop:Generator_TableVarName="tableminutes" msprop:Generator_TablePropName="minutes" msprop:Generator_RowDeletingName="minutesRowDeleting" msprop:Generator_RowChangingName="minutesRowChanging" msprop:Generator_RowEvHandlerName="minutesRowChangeEventHandler" msprop:Generator_RowDeletedName="minutesRowDeleted" msprop:Generator_UserTableName="minutes" msprop:Generator_RowChangedName="minutesRowChanged" msprop:Generator_RowEvArgName="minutesRowChangeEvent" msprop:Generator_RowClassName="minutesRow">
+        <xs:element name="minutes" msprop:Generator_TableClassName="minutesDataTable" msprop:Generator_TableVarName="tableminutes" msprop:Generator_RowChangedName="minutesRowChanged" msprop:Generator_TablePropName="minutes" msprop:Generator_RowDeletingName="minutesRowDeleting" msprop:Generator_RowChangingName="minutesRowChanging" msprop:Generator_RowEvHandlerName="minutesRowChangeEventHandler" msprop:Generator_RowDeletedName="minutesRowDeleted" msprop:Generator_RowClassName="minutesRow" msprop:Generator_UserTableName="minutes" msprop:Generator_RowEvArgName="minutesRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -906,7 +935,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_UserTableName="Board" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_RowEvArgName="BoardRowChangeEvent" msprop:Generator_RowClassName="BoardRow">
+        <xs:element name="Board" msprop:Generator_TableClassName="BoardDataTable" msprop:Generator_TableVarName="tableBoard" msprop:Generator_RowChangedName="BoardRowChanged" msprop:Generator_TablePropName="Board" msprop:Generator_RowDeletingName="BoardRowDeleting" msprop:Generator_RowChangingName="BoardRowChanging" msprop:Generator_RowEvHandlerName="BoardRowChangeEventHandler" msprop:Generator_RowDeletedName="BoardRowDeleted" msprop:Generator_RowClassName="BoardRow" msprop:Generator_UserTableName="Board" msprop:Generator_RowEvArgName="BoardRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -958,7 +987,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Holyday" msprop:Generator_TableClassName="HolydayDataTable" msprop:Generator_TableVarName="tableHolyday" msprop:Generator_TablePropName="Holyday" msprop:Generator_RowDeletingName="HolydayRowDeleting" msprop:Generator_RowChangingName="HolydayRowChanging" msprop:Generator_RowEvHandlerName="HolydayRowChangeEventHandler" msprop:Generator_RowDeletedName="HolydayRowDeleted" msprop:Generator_UserTableName="Holyday" msprop:Generator_RowChangedName="HolydayRowChanged" msprop:Generator_RowEvArgName="HolydayRowChangeEvent" msprop:Generator_RowClassName="HolydayRow">
+        <xs:element name="Holyday" msprop:Generator_TableClassName="HolydayDataTable" msprop:Generator_TableVarName="tableHolyday" msprop:Generator_RowChangedName="HolydayRowChanged" msprop:Generator_TablePropName="Holyday" msprop:Generator_RowDeletingName="HolydayRowDeleting" msprop:Generator_RowChangingName="HolydayRowChanging" msprop:Generator_RowEvHandlerName="HolydayRowChangeEventHandler" msprop:Generator_RowDeletedName="HolydayRowDeleted" msprop:Generator_RowClassName="HolydayRow" msprop:Generator_UserTableName="Holyday" msprop:Generator_RowEvArgName="HolydayRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1048,19 +1077,19 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="extcate" msprop:Generator_ColumnVarNameInTable="columnextcate" msprop:Generator_ColumnPropNameInRow="extcate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="extcateColumn" msprop:Generator_UserColumnName="extcate" minOccurs="0">
+              <xs:element name="extcate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="extcate" msprop:Generator_ColumnVarNameInTable="columnextcate" msprop:Generator_ColumnPropNameInTable="extcateColumn" msprop:Generator_UserColumnName="extcate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="extidx" msprop:Generator_ColumnVarNameInTable="columnextidx" msprop:Generator_ColumnPropNameInRow="extidx" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInTable="extidxColumn" msprop:Generator_UserColumnName="extidx" type="xs:int" minOccurs="0" />
-              <xs:element name="lock" msprop:Generator_ColumnVarNameInTable="columnlock" msprop:Generator_ColumnPropNameInRow="_lock" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="lockColumn" msprop:Generator_UserColumnName="lock" type="xs:boolean" minOccurs="0" />
+              <xs:element name="extidx" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="extidx" msprop:Generator_ColumnVarNameInTable="columnextidx" msprop:Generator_ColumnPropNameInTable="extidxColumn" msprop:Generator_UserColumnName="extidx" type="xs:int" minOccurs="0" />
+              <xs:element name="lock" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="_lock" msprop:Generator_ColumnVarNameInTable="columnlock" msprop:Generator_ColumnPropNameInTable="lockColumn" msprop:Generator_UserColumnName="lock" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vHoliday_uselist" msprop:Generator_TableClassName="vHoliday_uselistDataTable" msprop:Generator_TableVarName="tablevHoliday_uselist" msprop:Generator_TablePropName="vHoliday_uselist" msprop:Generator_RowDeletingName="vHoliday_uselistRowDeleting" msprop:Generator_RowChangingName="vHoliday_uselistRowChanging" msprop:Generator_RowEvHandlerName="vHoliday_uselistRowChangeEventHandler" msprop:Generator_RowDeletedName="vHoliday_uselistRowDeleted" msprop:Generator_UserTableName="vHoliday_uselist" msprop:Generator_RowChangedName="vHoliday_uselistRowChanged" msprop:Generator_RowEvArgName="vHoliday_uselistRowChangeEvent" msprop:Generator_RowClassName="vHoliday_uselistRow">
+        <xs:element name="vHoliday_uselist" msprop:Generator_TableClassName="vHoliday_uselistDataTable" msprop:Generator_TableVarName="tablevHoliday_uselist" msprop:Generator_RowChangedName="vHoliday_uselistRowChanged" msprop:Generator_TablePropName="vHoliday_uselist" msprop:Generator_RowDeletingName="vHoliday_uselistRowDeleting" msprop:Generator_RowChangingName="vHoliday_uselistRowChanging" msprop:Generator_RowEvHandlerName="vHoliday_uselistRowChangeEventHandler" msprop:Generator_RowDeletedName="vHoliday_uselistRowDeleted" msprop:Generator_RowClassName="vHoliday_uselistRow" msprop:Generator_UserTableName="vHoliday_uselist" msprop:Generator_RowEvArgName="vHoliday_uselistRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1105,7 +1134,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="WorkTableGrp" msprop:Generator_TableClassName="WorkTableGrpDataTable" msprop:Generator_TableVarName="tableWorkTableGrp" msprop:Generator_RowChangedName="WorkTableGrpRowChanged" msprop:Generator_TablePropName="WorkTableGrp" msprop:Generator_RowDeletingName="WorkTableGrpRowDeleting" msprop:Generator_RowChangingName="WorkTableGrpRowChanging" msprop:Generator_RowEvHandlerName="WorkTableGrpRowChangeEventHandler" msprop:Generator_RowDeletedName="WorkTableGrpRowDeleted" msprop:Generator_RowClassName="WorkTableGrpRow" msprop:Generator_UserTableName="WorkTableGrp" msprop:Generator_RowEvArgName="WorkTableGrpRowChangeEvent">
+        <xs:element name="WorkTableGrp" msprop:Generator_TableClassName="WorkTableGrpDataTable" msprop:Generator_TableVarName="tableWorkTableGrp" msprop:Generator_TablePropName="WorkTableGrp" msprop:Generator_RowDeletingName="WorkTableGrpRowDeleting" msprop:Generator_RowChangingName="WorkTableGrpRowChanging" msprop:Generator_RowEvHandlerName="WorkTableGrpRowChangeEventHandler" msprop:Generator_RowDeletedName="WorkTableGrpRowDeleted" msprop:Generator_UserTableName="WorkTableGrp" msprop:Generator_RowChangedName="WorkTableGrpRowChanged" msprop:Generator_RowEvArgName="WorkTableGrpRowChangeEvent" msprop:Generator_RowClassName="WorkTableGrpRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="grp" msprop:Generator_ColumnVarNameInTable="columngrp" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:Generator_UserColumnName="grp">
@@ -1118,7 +1147,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_WorkTableUser" msprop:Generator_TableClassName="EETGW_WorkTableUserDataTable" msprop:Generator_TableVarName="tableEETGW_WorkTableUser" msprop:Generator_RowChangedName="EETGW_WorkTableUserRowChanged" msprop:Generator_TablePropName="EETGW_WorkTableUser" msprop:Generator_RowDeletingName="EETGW_WorkTableUserRowDeleting" msprop:Generator_RowChangingName="EETGW_WorkTableUserRowChanging" msprop:Generator_RowEvHandlerName="EETGW_WorkTableUserRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_WorkTableUserRowDeleted" msprop:Generator_RowClassName="EETGW_WorkTableUserRow" msprop:Generator_UserTableName="EETGW_WorkTableUser" msprop:Generator_RowEvArgName="EETGW_WorkTableUserRowChangeEvent">
+        <xs:element name="EETGW_WorkTableUser" msprop:Generator_TableClassName="EETGW_WorkTableUserDataTable" msprop:Generator_TableVarName="tableEETGW_WorkTableUser" msprop:Generator_TablePropName="EETGW_WorkTableUser" msprop:Generator_RowDeletingName="EETGW_WorkTableUserRowDeleting" msprop:Generator_RowChangingName="EETGW_WorkTableUserRowChanging" msprop:Generator_RowEvHandlerName="EETGW_WorkTableUserRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_WorkTableUserRowDeleted" msprop:Generator_UserTableName="EETGW_WorkTableUser" msprop:Generator_RowChangedName="EETGW_WorkTableUserRowChanged" msprop:Generator_RowEvArgName="EETGW_WorkTableUserRowChangeEvent" msprop:Generator_RowClassName="EETGW_WorkTableUserRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1183,7 +1212,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
+        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -1321,7 +1350,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
+        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss
index 1e295f3..2805dfc 100644
--- a/SubProject/FBS0000/dsMSSQL.xss
+++ b/SubProject/FBS0000/dsMSSQL.xss
@@ -8,10 +8,10 @@
   <Shapes>
     <Shape ID="DesignTable:minutes" ZOrder="9" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Board" ZOrder="8" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:Holyday" ZOrder="3" X="581" Y="70" Height="440" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="313" />
+    <Shape ID="DesignTable:Holyday" ZOrder="3" X="581" Y="70" Height="554" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="410" />
     <Shape ID="DesignTable:vHoliday_uselist" ZOrder="2" X="916" Y="68" Height="248" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:WorkTableGrp" ZOrder="7" X="257" Y="433" Height="133" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:EETGW_WorkTableUser" ZOrder="6" X="600" Y="549" Height="270" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="200" />
+    <Shape ID="DesignTable:EETGW_WorkTableUser" ZOrder="6" X="610" Y="715" Height="270" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="200" />
     <Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="963" Y="373" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:HolidayLIst" ZOrder="1" X="1300" Y="157" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="5" X="250" Y="606" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />