휴가이력현황 report -> spread.net

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("24.02.14.1450")]
+[assembly: AssemblyVersion("24.03.03.1500")]
-[assembly: AssemblyFileVersion("24.02.14.1450")]
+[assembly: AssemblyFileVersion("24.03.03.1500")]

SubProject/FBS0000/Holiday/fHolyday.Designer.cs

@@ -30,6 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
             FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
@@ -96,19 +97,19 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
             this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
             this.textBox1 = new System.Windows.Forms.TextBox();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
             this.cmO.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -143,14 +144,14 @@
             this.toolStripButton5,
             this.toolStripButton3,
             this.toolStripButton7});
-            this.bn.Location = new System.Drawing.Point(0, 822);
+            this.bn.Location = new System.Drawing.Point(0, 680);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(1465, 27);
+            this.bn.Size = new System.Drawing.Size(1333, 27);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -369,7 +370,7 @@
             this.toolStripButton6});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1465, 31);
+            this.toolStrip1.Size = new System.Drawing.Size(1333, 31);
             this.toolStrip1.TabIndex = 3;
             this.toolStrip1.Text = "toolStrip1";
             this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked);
@@ -483,14 +484,14 @@
             this.fpSpread1.RangeDragFillMode = FarPoint.Win.Spread.DragFillMode.Series;
             this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
             this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(1465, 770);
+            this.fpSpread1.Size = new System.Drawing.Size(1333, 628);
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 4;
             this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
             this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
             this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown);
             this.fpSpread1.SetViewportLeftColumn(0, 0, 1);
-            this.fpSpread1.SetActiveViewport(0, -1, -1);
+            this.fpSpread1.SetActiveViewport(0, 0, -1);
             // 
             // cmO
             // 
@@ -501,7 +502,7 @@
             this.복사ToolStripMenuItem,
             this.현재사원원장보기ToolStripMenuItem});
             this.cmO.Name = "cm1";
-            this.cmO.Size = new System.Drawing.Size(307, 118);
+            this.cmO.Size = new System.Drawing.Size(305, 118);
             // 
             // toolStripMenuItem2
             // 
@@ -511,14 +512,14 @@
             this.toolStripMenuItem5,
             this.toolStripMenuItem6});
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(306, 36);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(304, 36);
             this.toolStripMenuItem2.Text = "Column Size";
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image")));
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 36);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(147, 36);
             this.toolStripMenuItem3.Text = "Auto";
             this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
             // 
@@ -526,7 +527,7 @@
             // 
             this.toolStripMenuItem4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem4.Image")));
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(149, 36);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(147, 36);
             this.toolStripMenuItem4.Text = "Reset";
             this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
             // 
@@ -534,7 +535,7 @@
             // 
             this.toolStripMenuItem5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem5.Image")));
             this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 36);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(147, 36);
             this.toolStripMenuItem5.Text = "Save";
             this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
             // 
@@ -542,216 +543,30 @@
             // 
             this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
             this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(149, 36);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(147, 36);
             this.toolStripMenuItem6.Text = "Load";
             this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(303, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(301, 6);
             // 
             // 복사ToolStripMenuItem
             // 
             this.복사ToolStripMenuItem.Enabled = false;
             this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem";
-            this.복사ToolStripMenuItem.Size = new System.Drawing.Size(306, 36);
+            this.복사ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
             this.복사ToolStripMenuItem.Text = "복사";
             this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click);
             // 
             // 현재사원원장보기ToolStripMenuItem
             // 
             this.현재사원원장보기ToolStripMenuItem.Name = "현재사원원장보기ToolStripMenuItem";
-            this.현재사원원장보기ToolStripMenuItem.Size = new System.Drawing.Size(306, 36);
+            this.현재사원원장보기ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
             this.현재사원원장보기ToolStripMenuItem.Text = "현재 사원 원장 보기";
             this.현재사원원장보기ToolStripMenuItem.Click += new System.EventHandler(this.현재사원원장보기ToolStripMenuItem_Click);
             // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            this.fpSpread1_Sheet1.SheetName = "WorkTable";
-            // Formulas and custom names must be loaded with R1C1 reference style
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 18;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "구분";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "시작일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "종료일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요일";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "사번";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "성명";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "사용(일)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "사용(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "내용";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "발생(일)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "발생(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "잔량(일)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "잔량(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(일)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "전일(H)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "소스";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "등록";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate";
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분";
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
-            dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2023, 2, 2, 20, 6, 38, 860);
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "시작일";
-            this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate";
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F;
-            dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
-            dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType2.TimeDefault = new System.DateTime(2023, 2, 2, 20, 6, 38, 860);
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "종료일";
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(3).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "요일";
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "uid";
-            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "사번";
-            this.fpSpread1_Sheet1.Columns.Get(4).Tag = "empno";
-            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            textCellType4.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "성명";
-            this.fpSpread1_Sheet1.Columns.Get(5).Tag = "name";
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            numberCellType1.MaximumValue = 999999999999999D;
-            numberCellType1.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "term";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(일)";
-            this.fpSpread1_Sheet1.Columns.Get(6).Tag = "dr";
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            numberCellType2.MaximumValue = 999999999999999D;
-            numberCellType2.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "CrTime";
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "사용(H)";
-            this.fpSpread1_Sheet1.Columns.Get(7).Tag = "drh";
-            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "contents";
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "내용";
-            this.fpSpread1_Sheet1.Columns.Get(8).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "tag";
-            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "#";
-            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 40F;
-            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            numberCellType3.MaximumValue = 999999999999999D;
-            numberCellType3.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "termDr";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(일)";
-            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "cr";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            numberCellType4.MaximumValue = 999999999999999D;
-            numberCellType4.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "DrTime";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "발생(H)";
-            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "crh";
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType5.DecimalPlaces = 1;
-            numberCellType5.MaximumValue = 999999999999999D;
-            numberCellType5.MinimumValue = -999999999999999D;
-            numberCellType5.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(일)";
-            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "jand";
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType6.DecimalPlaces = 2;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            numberCellType6.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[2]+RC[-2]-RC[-6]";
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "잔량(H)";
-            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "janh";
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            numberCellType7.DecimalPlaces = 1;
-            numberCellType7.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
-            numberCellType7.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray;
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(일)";
-            this.fpSpread1_Sheet1.Columns.Get(14).Tag = "yjand";
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            numberCellType8.DecimalPlaces = 2;
-            numberCellType8.MaximumValue = 999999999999999D;
-            numberCellType8.MinimumValue = -999999999999999D;
-            numberCellType8.ReadOnly = true;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.Gray;
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "전일(H)";
-            this.fpSpread1_Sheet1.Columns.Get(15).Tag = "yjanh";
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "extcate";
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "소스";
-            this.fpSpread1_Sheet1.Columns.Get(16).Tag = "src";
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "wuid";
-            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Label = "등록";
-            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Width = 70F;
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.FrozenColumnCount = 1;
-            this.fpSpread1_Sheet1.LockBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ShowEditingRowSelector = true;
-            this.fpSpread1_Sheet1.ShowRowSelector = true;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
-            // 
             // bs
             // 
             this.bs.DataMember = "Holyday";
@@ -769,17 +584,208 @@
             // textBox1
             // 
             this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.textBox1.Location = new System.Drawing.Point(0, 801);
+            this.textBox1.Location = new System.Drawing.Point(0, 659);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(1465, 21);
+            this.textBox1.Size = new System.Drawing.Size(1333, 21);
             this.textBox1.TabIndex = 5;
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "WorkTable";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnCount = 19;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "이월";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "구분";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "시작일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "종료일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "요일";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "사번";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "성명";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "사용(일)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "사용(H)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "내용";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "발생(일)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "발생(H)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "잔량(일)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "잔량(H)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "전일(일)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "전일(H)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "소스";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "등록";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
+            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "iwol";
+            this.fpSpread1_Sheet1.Columns.Get(0).Label = "이월";
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Label = "구분";
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
+            dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType1.TimeDefault = new System.DateTime(2024, 3, 3, 10, 46, 54, 215);
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sdate";
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작일";
+            this.fpSpread1_Sheet1.Columns.Get(2).Tag = "pdate";
+            this.fpSpread1_Sheet1.Columns.Get(2).Width = 71F;
+            dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
+            dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType2.TimeDefault = new System.DateTime(2024, 3, 3, 10, 46, 54, 215);
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = dateTimeCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Label = "종료일";
+            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(4).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
+            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "요일";
+            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "uid";
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "사번";
+            this.fpSpread1_Sheet1.Columns.Get(5).Tag = "empno";
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 151F;
+            this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            textCellType4.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "성명";
+            this.fpSpread1_Sheet1.Columns.Get(6).Tag = "name";
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 151F;
+            this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            numberCellType1.MaximumValue = 999999999999999D;
+            numberCellType1.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "term";
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "사용(일)";
+            this.fpSpread1_Sheet1.Columns.Get(7).Tag = "dr";
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            numberCellType2.MaximumValue = 999999999999999D;
+            numberCellType2.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "CrTime";
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "사용(H)";
+            this.fpSpread1_Sheet1.Columns.Get(8).Tag = "drh";
+            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "contents";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "내용";
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 151F;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "tag";
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "#";
+            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 40F;
+            this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            numberCellType3.MaximumValue = 999999999999999D;
+            numberCellType3.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "termDr";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "발생(일)";
+            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "cr";
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            numberCellType4.MaximumValue = 999999999999999D;
+            numberCellType4.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "DrTime";
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "발생(H)";
+            this.fpSpread1_Sheet1.Columns.Get(12).Tag = "crh";
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType5.DecimalPlaces = 1;
+            numberCellType5.MaximumValue = 999999999999999D;
+            numberCellType5.MinimumValue = -999999999999999D;
+            numberCellType5.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[2]+RC[-2]-RC[-6]";
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "잔량(일)";
+            this.fpSpread1_Sheet1.Columns.Get(13).Tag = "jand";
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType6.DecimalPlaces = 2;
+            numberCellType6.MaximumValue = 999999999999999D;
+            numberCellType6.MinimumValue = -999999999999999D;
+            numberCellType6.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(14).Formula = "RC[2]+RC[-2]-RC[-6]";
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "잔량(H)";
+            this.fpSpread1_Sheet1.Columns.Get(14).Tag = "janh";
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            numberCellType7.DecimalPlaces = 1;
+            numberCellType7.MaximumValue = 999999999999999D;
+            numberCellType7.MinimumValue = -999999999999999D;
+            numberCellType7.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.Gray;
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Label = "전일(일)";
+            this.fpSpread1_Sheet1.Columns.Get(15).Tag = "yjand";
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            numberCellType8.DecimalPlaces = 2;
+            numberCellType8.MaximumValue = 999999999999999D;
+            numberCellType8.MinimumValue = -999999999999999D;
+            numberCellType8.ReadOnly = true;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.Gray;
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "전일(H)";
+            this.fpSpread1_Sheet1.Columns.Get(16).Tag = "yjanh";
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "extcate";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Label = "소스";
+            this.fpSpread1_Sheet1.Columns.Get(17).Tag = "src";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "wuid";
+            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).Label = "등록";
+            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).Width = 70F;
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.FrozenColumnCount = 1;
+            this.fpSpread1_Sheet1.LockBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ShowEditingRowSelector = true;
+            this.fpSpread1_Sheet1.ShowRowSelector = true;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            // 
             // fHolyday
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1465, 849);
+            this.ClientSize = new System.Drawing.Size(1333, 707);
             this.Controls.Add(this.fpSpread1);
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.toolStrip1);
@@ -796,8 +802,8 @@
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
             this.cmO.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

SubProject/FBS0000/Holiday/fHolyday.cs

@@ -86,11 +86,11 @@ namespace FBS0000
 				btDel.Enabled = false;
 				btAdd.Enabled = false;
 
-
+                RefreshData();
                 //this.cmbUser.Enabled = false;   //사용자를 고칠수 없게 한다.
 
             }
-			RefreshData();
+	
 		}
 
 		void Holyday_TableNewRow(object sender, DataTableNewRowEventArgs e)

SubProject/FBS0000/Holiday/fHolyday.resx

@@ -124,7 +124,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -135,7 +135,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -144,7 +144,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -153,7 +153,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -164,7 +164,7 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -191,7 +191,7 @@
   <data name="btDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -219,13 +219,13 @@
         H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN
         NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4
         gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur
-        WvRdKhfSef7fVU0G7+po3G6lhQ4mJydzRQ1MF8qFgvgAjsvA4Y+gxzONdlsE712LGKDmsfJ7CclkkiEB
+        WvRdKhfSef7fVU0G7+po3G6lhQ78fn+uqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg
-        RzcNNLVwvlTAdL7s3zCHjuEZ9FFLmPnFIpTgMDqbgvXbMgbH5pBIJIp04LHDeLZUCOA7+OiJYmohjbHw
+        6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+
-        H3jmWLgJgSiHLmcYPp8PJSUlJ0QD80MFHM1yGKpLxRLbhsOg4xw8swxcNIPhYBrUTw7vHAuIxWJbDSaI
+        A88cCzchEOXQ5QzD5/OhpKTkhGhgfqiAo1kOQ3WpWGLbcBh0nINnloGLZjAcTIP6yeGdYwGxWGyrwQQx
-        QW/VAbHELvLOU4ssHNP5YZ6JeQ7agR9bv0TzfTlsL2ToPbMZYPdFMUqn8JUMecMZjJPdzb40WvQmzFOW
+        6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS
-        4gY9pyXI5XLCSSyvsPB+j6ObdPHBHYVuKITX+gEErDqMa5Wor9nXKBio1WpJZ/UhGK4dQ/cpCWiaRjAY
+        3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD
-        5M8afr9fKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv
+        mJyc5M9bKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv
-        3hnH99rC8mEAAAAASUVORK5CYII=
+        0DnH8T7GGj4AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -233,16 +233,16 @@
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
         Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF
-        H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN
+        H4dz4P+8v/c55+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN
         NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4
         gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur
-        WvRdKhfSef7fVU0G7+po3G6lhQ4CgUCuqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg
+        WvRdKhfSef7fVU0G7+po3G6lhQ58Pl+uqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg
         6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+
-        A88cCzchEOXQ5QzD5/OhpKTkhGhgfqiAo1kOQ3WpWGLbcBh0nINnloGLZjAcTIP6yeGdYwGxWGyrwQQx
+        A88cCzchEOXQ5QzzR0BJSckJ0cD8UAFHsxyG6lKxxLbhMOg4B88sAxfNYDiYBvWTwzvHAmKx2FaDCWLQ
-        6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS
+        W3VALLGLnHlqkYVjOj/MMzHPQTvwY+uXaL4vh+2FDL1nNgPsvihG6RS+kiFvOINxsrvZl0aL3oR5ylLc
-        3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD
+        oOe0BLlcTngTyyssvN/j6CZdfHBHoRsK4bV+AAGrDuNaJepr9jUKBmq1WtJZfQiGa8fQfUoCmqYRDAYx
-        mJychN/vFwoj5y5cHZ/eYLT1FuYGm2FoqswQi/ySle06+ejInsdy6W4FuS3264rU1ext/Ky5yA09O4e/
+        OTkJv98vFBYIBISr49MbjLbewtxgMwxNlRlikV+ysl0nHx3Z81gu3a0gt8V+XZG6mr2NnzUXuaFn5/AX
-        1ynH9HmAcj4AAAAASUVORK5CYII=
+        yUnH7pGap3AAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -284,41 +284,41 @@
   <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3yuyKTuUVRE3cI3GxMT4
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM
-        BXwRNcaIIBRRthYKZQdBZVFJXCNCoSuFVkppfUJNQI0Eo0aMsskqxzvpNKE+0HuHBF96kvt8f5mZc/+T
+        X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J
-        6+GOO+4IyMPjry88OGYev3/UhsYjZB22ouGQFfWJvahL6MW9gxbcPWDBnf1k7etB7d4e1MSbcXuPGdVx
+        dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi
-        3aja3Y3KXa9QEUtWjAnl0SaURZlQGmlESYQRxeIuKMLJCutEUWgnCkMM4wXB+iR+e9dZZhzkwQbkBRnG
+        pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5
-        +O1dZ7lxBUEG5Ad2gN/edf4HThbAAlwCrjzGCEWkDvnidhSKtSiO6KLCyfz19MClPLmiKA1sjz9iZnIO
+        jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz
-        lqYPkIWqqXDSnQxAoTjuyXVWvcPClCRoqHB5O3T0QCG4kigDHl3qwfyfeZ4G/ByagDRcSYXL9WMAsuLK
+        6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX
-        ortQfUqPqbEZngbMTs+h9mwH5CEdVLgcXy09kA1HShGnwff3ozzNnhcSG/JDtNS4bB8GIC2OO0rkEWq8
+        HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D
-        VX/mWfaYGwfIwatiwmV5swApcUUROhgqnUsxaBsm310bMy7LS0MPpMEVR5JSXHQuxciX3yiKV5HvTs+M
+        O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm
-        u7WdAegKVxrFl2J8lqfZS1FzpgNk6AvC3fRU0wMXw3HjSx6uxUDXV55mz7NUK2TBGsG4zG0MwMVw3Gwt
+        3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1
-        CNOiv9MZ+DSlF9IgjWDcDZGKHrgYjhv8CrEBFSd0zq94ag5VpwkoQCcIl7GVAbgYzjH45aE6NCWZnUry
+        L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek
-        i5REFtsGqb+WGSfZ0k4PdIVzzFZpsBq6sjc8z55P1mFkBbQw49I3swApcI5zLjtAib72IZ5nj6muH5m+
+        v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3
-        rUy49E1t9EBaHFcIWaAeuWIlvg2M8Dx7niRbkOndRo1L28gApMU52sp9c4pENSZHF/wskNKUnSQoLxUV
+        UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq
-        7voGBiALztHWbD8VGs4ZnUrzY3AMEp9mKlzqeiU9kBXnKESmjxJqRR/PsycnspUKl7KOASgE5yiExPsl
+        3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr
-        usnfzPTELEz1/UgTNVPhrq1tpQcKxTkKIfFsRaroOcG1IEPUToVLXsMCXAKOthD/4pJXt9AD/wfu6ioG
+        dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM
-        IMGNLzfu8spm+qsP7iKHuytZTtyVFc3n+e3dcccd+nh4/AW2FD3300VP1AAAAABJRU5ErkJggg==
+        QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tUWgBAbUguOOeGE18
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH
-        8N0XFROjggurrV2kFhAE3BXQqJgoS1s67bS1pZTtSSMJookiiRpNpEYU5TjDTCPEpL13TPClJ7nP95e5
+        331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO
-        c+a7mZhooolGQu7u6smu3xkI1u3oRu12bm3rwp2tXbid1YlbWzpxc3MHbmzqwPWN3NoQwLX1AVxd144r
+        fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt
-        me2oyfCjeq0fVeltuJzGLbUPlWt8qFjtw6VVXpSnelGW8hSlydxa6YE5yYOLie5gSQJ7RNw+ciYZB1OC
+        QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6
-        G3qVe0jcPnImG1eicuOC0gVx+8j5HzhjPA2QEFeT6UdFugtmdSvK1Swq03ySccY4lhxI+uTK01h0P3iF
+        pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH
-        H99+oqfhNUrXMJJxhhUUQOJj3c1ifDzVL2BOdUrC6Zc7yYGk71xZBoPPA19FHjD6axT3jwZgTnFR43Sx
+        T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS
-        FEDSQlSovbh5wDN2xKF8D46gei8Lc7KbCnde4SAHkuBCbS1b7cLjM90iT8jH10MwpdtwMclNjNPKKYCk
+        FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q
-        uFAhTMkOBOpfijwhvewg9AlWYpxGRgOkwIUKYUyx4lXgg8gT4qx4Dp3SToTTLGPIgbQ4vhDmZO5dy7Dh
+        elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U
-        89txpRkF7mX7cT7OHhF3bikFkBYXaqsp0YUr+1mMDP8pzfDQD5Rts0O/whEWV7zETg6Uggu11aBi8Ci3
+        0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC
-        U+QJ6XUNolhhCYsrWkwBlIrjC6FXMmjImQh84XzHAa1hcYWLWsmBUnFGJYuqfc6/jtic1QqtggmLK1hI
+        Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS
-        AZSCu6BywaC24NOboEgTSlJ/qA3FcmtEXP4CGzmQFsd/5zTKZvQH3os0IUzpMxTJLUS4vPk0QEqcNs6G
+        cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01
-        tjt9IkvIc2YAhYomYlzePCs5kAani7fj4YkOkSXkQ/8XaJKaoZEzxLizcymApDhDvBOVe5wTLgvD3GWh
+        AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs
-        dGsrNe7MHAogCY4fX1pVy8RScNet2we9KJbZqHGnZ1vIgSQ4fraaMm0iTQhfikKZRRLu1CwKIAmOn63n
+        tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm
-        Yi1or+vD968j8Nf2oUDeJBmXO7OFHEiC4we/brljbELky57805PjcTkzaIAEuEiDnxaXM72ZHPg/cCen
+        QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK
-        UQA5XHCyccemNpL/+uB/5PD/SiYTd3xK42Fx+2iiiYY8MTG/AVPPPpwTzX58AAAAAElFTkSuQmCC
+        IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -379,7 +379,7 @@
 </value>
   </data>
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>585, 17</value>
+    <value>587, 17</value>
   </metadata>
   <data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -388,7 +388,7 @@
         cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
         AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
         K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
-        AAD///////////////8A/////ws=
+        AAD/////AQgAAP////8AAQgAAAs=
 </value>
   </data>
   <data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -398,7 +398,7 @@
         cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
         AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
         K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
-        AAD///////////////8A/////ws=
+        AAD/////AQgAAP////8AAQgAAAs=
 </value>
   </data>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs

@@ -50,6 +50,7 @@
             this.nudDrHour = new System.Windows.Forms.NumericUpDown();
             this.nudDrDay = new System.Windows.Forms.NumericUpDown();
             this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
             sdateLabel = new System.Windows.Forms.Label();
             contentsLabel = new System.Windows.Forms.Label();
             uidLabel = new System.Windows.Forms.Label();
@@ -146,6 +147,16 @@
             label5.TabIndex = 6;
             label5.Text = "구분";
             // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new System.Drawing.Point(30, 82);
+            label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label6.Name = "label6";
+            label6.Size = new System.Drawing.Size(51, 19);
+            label6.TabIndex = 4;
+            label6.Text = "종료일";
+            // 
             // dsMSSQL
             // 
             this.dsMSSQL.DataSetName = "dsMSSQL";
@@ -211,6 +222,11 @@
             23,
             0,
             0});
+            this.nudCrDAy.Minimum = new decimal(new int[] {
+            1316134911,
+            2328,
+            0,
+            -2147483648});
             this.nudCrDAy.Name = "nudCrDAy";
             this.nudCrDAy.Size = new System.Drawing.Size(183, 27);
             this.nudCrDAy.TabIndex = 15;
@@ -225,6 +241,11 @@
             23,
             0,
             0});
+            this.nudCrHour.Minimum = new decimal(new int[] {
+            1316134911,
+            2328,
+            0,
+            -2147483648});
             this.nudCrHour.Name = "nudCrHour";
             this.nudCrHour.Size = new System.Drawing.Size(197, 27);
             this.nudCrHour.TabIndex = 17;
@@ -235,7 +256,7 @@
             this.cmbType.FormattingEnabled = true;
             this.cmbType.Location = new System.Drawing.Point(87, 112);
             this.cmbType.Name = "cmbType";
-            this.cmbType.Size = new System.Drawing.Size(462, 27);
+            this.cmbType.Size = new System.Drawing.Size(311, 27);
             this.cmbType.TabIndex = 7;
             // 
             // nudDrHour
@@ -247,6 +268,11 @@
             23,
             0,
             0});
+            this.nudDrHour.Minimum = new decimal(new int[] {
+            1316134911,
+            2328,
+            0,
+            -2147483648});
             this.nudDrHour.Name = "nudDrHour";
             this.nudDrHour.Size = new System.Drawing.Size(197, 27);
             this.nudDrHour.TabIndex = 13;
@@ -261,6 +287,11 @@
             23,
             0,
             0});
+            this.nudDrDay.Minimum = new decimal(new int[] {
+            1316134911,
+            2328,
+            0,
+            -2147483648});
             this.nudDrDay.Name = "nudDrDay";
             this.nudDrDay.Size = new System.Drawing.Size(183, 27);
             this.nudDrDay.TabIndex = 11;
@@ -273,21 +304,22 @@
             this.dateTimePicker2.Size = new System.Drawing.Size(462, 27);
             this.dateTimePicker2.TabIndex = 5;
             // 
-            // label6
+            // checkBox1
             // 
-            label6.AutoSize = true;
+            this.checkBox1.AutoSize = true;
-            label6.Location = new System.Drawing.Point(30, 82);
+            this.checkBox1.Location = new System.Drawing.Point(404, 114);
-            label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.checkBox1.Name = "checkBox1";
-            label6.Name = "label6";
+            this.checkBox1.Size = new System.Drawing.Size(150, 23);
-            label6.Size = new System.Drawing.Size(51, 19);
+            this.checkBox1.TabIndex = 19;
-            label6.TabIndex = 4;
+            this.checkBox1.Text = "이월된 자료 입니다";
-            label6.Text = "종료일";
+            this.checkBox1.UseVisualStyleBackColor = true;
             // 
             // fHolyday_Add
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(566, 430);
+            this.Controls.Add(this.checkBox1);
             this.Controls.Add(this.dateTimePicker2);
             this.Controls.Add(label6);
             this.Controls.Add(this.contentsTextBox);
@@ -340,5 +372,6 @@
         private System.Windows.Forms.NumericUpDown nudDrHour;
         private System.Windows.Forms.NumericUpDown nudDrDay;
         private System.Windows.Forms.DateTimePicker dateTimePicker2;
+        private System.Windows.Forms.CheckBox checkBox1;
     }
 }

SubProject/FBS0000/Holiday/fHolyday_Add.cs

@@ -66,6 +66,9 @@ namespace FBS0000
             cmbType.Text = dr.cate;
             contentsTextBox.Text = dr.contents;
 
+            if (dr.IsiwolNull()) checkBox1.Checked = false;
+            else checkBox1.Checked = dr.iwol;
+
             this.nudCrDAy.Value = (decimal)dr.term;
             this.nudCrHour.Value = (decimal)dr.CrTime;
 
@@ -129,6 +132,7 @@ namespace FBS0000
             dr.sdate = dateTimePicker1.Value;
            // dr.edate = dr.sdate;
             dr.edate = dateTimePicker2.Value;
+            dr.iwol = this.checkBox1.Checked;
 
             dr.cate = cmbType.Text;
             dr.contents = contentsTextBox.Text;

SubProject/FBS0000/Holiday/fHolyday_Add.resx

@@ -141,6 +141,9 @@
   <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -150,7 +153,4 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>248, 17</value>
   </metadata>
-  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
 </root>

SubProject/FBS0000/Holiday/rHolidaySummary.Designer.cs

@@ -30,7 +30,8 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rHolidaySummary));
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.bs2 = new System.Windows.Forms.BindingSource(this.components);
+            this.dsReport = new FBS0000.dsReport();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
@@ -38,17 +39,29 @@
             this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
-            this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.dsReport = new FBS0000.dsReport();
-            this.bs2 = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FBS0000.dsReportTableAdapters.holydataTableAdapter();
+            this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+            ((System.ComponentModel.ISupportInitialize)(this.bs2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bs2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
+            // bs2
+            // 
+            this.bs2.DataMember = "holydatasum";
+            this.bs2.DataSource = this.dsReport;
+            // 
+            // dsReport
+            // 
+            this.dsReport.DataSetName = "dsReport";
+            this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -58,7 +71,8 @@
             this.tbMon,
             this.toolStripButton7,
             this.toolStripSeparator2,
-            this.btSearch});
+            this.btSearch,
+            this.toolStripButton1});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
             this.toolStrip1.Size = new System.Drawing.Size(1059, 37);
@@ -119,55 +133,66 @@
             this.btSearch.Text = "조회(&R)";
             this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
             // 
-            // reportViewer1
-            // 
-            this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource1.Name = "DataSet2";
-            reportDataSource1.Value = this.bs2;
-            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
-            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolidaySummary.rdlc";
-            this.reportViewer1.Location = new System.Drawing.Point(0, 37);
-            this.reportViewer1.Name = "reportViewer1";
-            this.reportViewer1.ServerReport.BearerToken = null;
-            this.reportViewer1.Size = new System.Drawing.Size(1059, 543);
-            this.reportViewer1.TabIndex = 7;
-            this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load);
-            // 
             // bs
             // 
             this.bs.DataMember = "holydata";
             this.bs.DataSource = this.dsReport;
             // 
-            // dsReport
-            // 
-            this.dsReport.DataSetName = "dsReport";
-            this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
-            // bs2
-            // 
-            this.bs2.DataMember = "holydatasum";
-            this.bs2.DataSource = this.dsReport;
-            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
             // 
+            // fpSpread1
+            // 
+            this.fpSpread1.AccessibleDescription = "fpSpread1, Sheet1, Row 0, Column 0, 담당자";
+            this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.fpSpread1.Location = new System.Drawing.Point(0, 37);
+            this.fpSpread1.Name = "fpSpread1";
+            this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
+            this.fpSpread1_Sheet1});
+            this.fpSpread1.Size = new System.Drawing.Size(1059, 543);
+            this.fpSpread1.TabIndex = 8;
+            // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
+            this.fpSpread1_Sheet1.Cells.Get(0, 0).Value = "담당자";
+            this.fpSpread1_Sheet1.Cells.Get(0, 0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Bottom;
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 62F;
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 73F;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(89, 34);
+            this.toolStripButton1.Text = "내보내기";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+            // 
             // rHolidaySummary
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1059, 580);
-            this.Controls.Add(this.reportViewer1);
+            this.Controls.Add(this.fpSpread1);
             this.Controls.Add(this.toolStrip1);
             this.Name = "rHolidaySummary";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "휴가이력 현황";
             this.Load += new System.EventHandler(this.rJobReport_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.bs2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bs2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -182,9 +207,11 @@
         private System.Windows.Forms.ToolStripButton toolStripButton7;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripButton btSearch;
-        private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
         private System.Windows.Forms.BindingSource bs;
         private dsReportTableAdapters.holydataTableAdapter ta;
         private System.Windows.Forms.BindingSource bs2;
+        private FarPoint.Win.Spread.FpSpread fpSpread1;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
     }
 }

SubProject/FBS0000/Holiday/rHolidaySummary.cs

@@ -1,5 +1,8 @@
 using FarPoint.Excel;
+using FarPoint.Excel.EntityClassLibrary.DrawingVML;
+using FarPoint.Win.Spread;
 using FarPoint.Win.Spread.CellType.BarCode;
+using NetOffice.Extensions.Invoker;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -37,7 +40,7 @@ namespace FBS0000
             this.tbMon.Text = DateTime.Now.ToShortDateString();
 
             refrehData();
-            this.reportViewer1.RefreshReport();
+           // this.reportViewer1.RefreshReport();
         }
 
         void refrehData()
@@ -48,12 +51,31 @@ namespace FBS0000
 
             //데이터를 재 집계한다.
             this.dsReport.holydatasum.Clear();
-            var grp_user = dsReport.holydata.GroupBy(t => t.uid);
+
+            //1월1일년차데이터는  이월로 변경한다..
+            //var 이월데이터 = dsReport.holydata.Where(t => t.cate.StartsWith("이월") == false && t.cate.Contains("이월")).ToList();
+            //foreach (var dr in 이월데이터)
+            //{
+            //    var basecate = dr.cate.Split('-')[0].Trim();
+            //    dr.cate = basecate;
+            //    dr.iwol = true;
+
+            //}
+
+
+            var grp_user = dsReport.holydata.GroupBy(t => t.uid).ToList();
+            var sum_drday = 0.0;
+            var sum_crday = 0.0;
+            var sum_addday = 0.0;
+            var sum_janday = 0.0;
+            var sum_iwol = 0.0;
+
+
             foreach (var grp in grp_user)
             {
                 //cate group
                 var first_user = grp.First();
-                var grp_cate = grp.GroupBy(t => t.cate);
+                var grp_cate = grp.GroupBy(t => t.cate).ToList();
                 foreach (var cate in grp_cate)
                 {
                     var newdr = this.dsReport.holydatasum.NewholydatasumRow();
@@ -62,180 +84,282 @@ namespace FBS0000
                     newdr.uname = first_user.name;
                     newdr.process = first_user.Process;
                     newdr.cate = cate.Key;
+
                     if (catename.StartsWith("대체"))
                     {
-                        newdr.dr = cate.Sum(t => t.DrTime);
+                        newdr.dr = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.DrTime);
-                        newdr.cr = cate.Sum(t => t.CrTime);
+                        newdr.cr = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.CrTime);
-                        newdr.jan = newdr.dr - newdr.cr;
+                        newdr.iwol = cate.Where(t => t.IsiwolNull() == false && t.iwol == true).Sum(t => t.DrTime);
-                        //newdr.add = 0;
+
-                        if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr)*100f;
+
-                        else newdr.rate = 0;
                     }
                     else if (catename.StartsWith("외출"))
                     {
-                        //newdr.dr = 0;
+
-                        //newdr.cr = 0;
-                        //newdr.jan = 0;
-                        //newdr.add = 0;
-                        //newdr.rate = 0;
                     }
                     else
                     {
-                        newdr.dr = cate.Sum(t => t.DrDay);
+                        //이월과 그렇지 않은 데이터로 분리한다.
-                        newdr.cr = cate.Sum(t => t.CrDay);
+                        newdr.drday = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.DrDay);
-                        newdr.jan = newdr.dr - newdr.cr;
+                        newdr.crday = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.CrDay);
-                        if (newdr.jan < 0)  //초과사용자는 0으로 처리
+                        newdr.iwolday = cate.Where(t => t.IsiwolNull() == false && t.iwol == true).Sum(t => t.DrDay);
-                        {
-                            newdr.add = newdr.jan;
-                            newdr.cr = newdr.dr;
-                            newdr.jan = 0;
-                        }
-                        if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr) * 100f;
-                        else newdr.rate = 0;
-                        newdr.drday = newdr.dr;
-                        newdr.crday = newdr.cr;
-                        newdr.janday = newdr.jan;
-                        newdr.rateday = newdr.rate;
-                        newdr.addday = newdr.add;
                     }
 
+                    if (catename.StartsWith("대체")) newdr.orderno = 99;
+                    else if (catename.StartsWith("년차")) newdr.orderno = 1;
+                    else if (catename.StartsWith("이월")) newdr.orderno = 0;
+                    else newdr.orderno = 2;
+
                     this.dsReport.holydatasum.AddholydatasumRow(newdr);
                 }
             }
             this.dsReport.holydatasum.AcceptChanges();
 
 
-            //this.reportViewer1.LocalReport.ReportPath = "JobReport_\\rK5Dailyform.rdlc";
+            ////this.reportViewer1.LocalReport.ReportPath = "JobReport_\\rK5Dailyform.rdlc";
-            this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal);
+            //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal);
-            this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
+            //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
-            this.reportViewer1.RefreshReport();
+            //this.reportViewer1.RefreshReport();
 
-            ////휴일데이터가 들어가 있음.
+            var numcell1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            //var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
+            numcell1.DecimalPlaces = 1;
-            // //taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
+            numcell1.FixedPoint = false;
+            numcell1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.No;
+            numcell1.Separator = ",";
+            numcell1.ShowSeparator = false;
 
-            // string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
+            var percell1 = new FarPoint.Win.Spread.CellType.PercentCellType();
-            //// this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
+            numcell1.DecimalPlaces = 1;
-            // //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
+            numcell1.FixedPoint = false;
-            // //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
+            numcell1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.No;
-
+            numcell1.Separator = ",";
-            // //그리드뷰 생성
+            numcell1.ShowSeparator = false;
-            // this.dataGridView1.AllowUserToAddRows = false;
-            // this.dataGridView1.AllowUserToDeleteRows = false;
-            // this.dataGridView1.Rows.Clear();
-            // this.dataGridView1.Columns.Clear();
-            // this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-            // this.dataGridView1.ColumnHeadersHeight = 35;
-            // this.dataGridView1.Columns.Add("이름", "이름");
-
-            // //이름/년도데이터추가
-            // var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm);
-            // foreach (var ym in ymlist)
-            // {
-            //     var drYm = ym.FirstOrDefault();
-
-            //     var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", ""));
-
-            //     this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\r\n(" + basehr.ToString() + ")");
-            // }
-
-            // //이름으로 정렬해서 데이터를 가져온다
-            // var namelist = this.dsReport.jobReport.OrderBy(t => t.uname).GroupBy(t => t.uname);
-            // foreach (var uname in namelist)
-            // {
-            //     var drName = uname.FirstOrDefault();
-
-            //     List<string> rowdata = new List<string>();
-            //     rowdata.Add(drName.uname + "(" + drName.uid + ")");
-
-            //     List<Boolean> high = new List<bool>();
-            //     List<Boolean> low = new List<bool>();
-            //     for (int i = 1; i < this.dataGridView1.ColumnCount; i++)
-            //     {
-            //         var coltitle = dataGridView1.Columns[i].HeaderText;
-            //         var basehr = int.Parse(coltitle.Split('\n')[1].Replace("(","").Replace(")",""));
-
-            //         var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == dataGridView1.Columns[i].Name);
-            //         if (userDatas == null || userDatas.Count() == 0)
-            //         {
-            //             //이달에는 데이터가없다
-            //             rowdata.Add("--");
-            //             high.Add(false);
-            //             low.Add(false);
-            //         }
-            //         else
-            //         {
-            //             ////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
-            //             //var sumhr = 0f;
-            //             //var sumot = 0f;
-            //             //var sumholy = 0f;
-            //             //foreach(dsReport.jobReportRow item in userDatas)
-            //             //{
-            //             //    dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
-            //             //}
 
 
 
-            //             var sumhr = userDatas.Sum(t => t.hrs);
+            //데이터표시
-            //             var sumot = userDatas.Sum(t => t.ot);
+            var grpproc = dsReport.holydatasum.OrderBy(t => t.process).GroupBy(t => t.process);
-            //             var sumhl = userDatas.Sum(t => t.holyot);
+            var row = 0;
-            //             if (sumot + sumhl == 0) rowdata.Add(string.Format("{0}", sumhr, sumot));
+            this.fpSpread1_Sheet1.ColumnHeaderRowCount = 2;
 
-            //             else rowdata.Add(string.Format("{0}+{1}(*{2})", sumhr, sumot,sumhl));
+            var cols = new string[] { "공정", "사원명", "사번" };
-
+            var subcols = new string[] { "이월", "발생", "사용", "잔여", "초과", "소진율(%)", "이월\n소진율\n(%)" };
-            //             if (sumhr > basehr) high.Add(true);
+            var headercol = 0;
-            //             else high.Add(false);
+            var catelist = new Dictionary<string, int>();
-
+            foreach (var colname in cols)
-            //             if (sumhr < basehr) low.Add(true);
-            //             else low.Add(false);
-            //         }
-            //     }
-
-            //     dataGridView1.Rows.Add(rowdata.ToArray());
-
-            //     //이번에 추가한 줄의 셀 컬러를 지정한다
-            //     var currentrow = dataGridView1.Rows.Count - 1;
-            //     for (int i = 1; i < this.dataGridView1.ColumnCount; i++)
-            //     {
-            //         if (high[i - 1]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
-            //         else if (low[i - 1]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue;
-            //         else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
-            //     }
-            // }
-            // this.dataGridView1.AutoResizeColumns();
-
-        }
-
-        private void btRefresh_Click(object sender, EventArgs e)
             {
-
+                this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = colname;
+                this.fpSpread1_Sheet1.AddColumnHeaderSpanCell(0, headercol, 2, 1);
+                headercol += 1;
             }
 
-        private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
+            this.fpSpread1_Sheet1.ColumnCount = 200;
+
+            //모든카테고리를 확인하여 컬럼을 먼저 생성한다.
+            var gCate = dsReport.holydatasum.OrderBy(t => t.orderno).GroupBy(t => t.cate);
+            foreach (var drCate in gCate)
             {
-
+                catelist.Add(drCate.Key, headercol);
-        }
+                this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = drCate.Key;
-
+                var grpstart = headercol;
-        private void button1_Click(object sender, EventArgs e)
+                foreach (var colname in subcols)
                 {
-
+                    this.fpSpread1_Sheet1.ColumnHeader.Cells[1, headercol++].Value = colname;
+                }
+                var grpend = headercol;
+                fpSpread1.ActiveSheet.AddColumnHeaderSpanCell(0, grpstart, 1, grpend - grpstart); //같은그룹명 병합
             }
 
-        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+
+
+            //최종합계추가
+            this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = "합계";
+            var grpstart2 = headercol;
+            foreach (var colname in subcols)
             {
-
+                fpSpread1.ActiveSheet.ColumnCount = headercol + 1;
+                this.fpSpread1_Sheet1.ColumnHeader.Cells[1, headercol++].Value = colname;
             }
+            var grpend2 = headercol;
+            fpSpread1.ActiveSheet.AddColumnHeaderSpanCell(0, grpstart2, 1, grpend2 - grpstart2); //같은그룹명 병합
+            fpSpread1.ActiveSheet.ColumnCount = headercol;
 
-        private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e)
+            this.fpSpread1_Sheet1.RowCount = 1;
+            foreach (var drp in grpproc)
             {
-            // if (tbProcess.SelectedIndex >= 0) refrehData();
+                var grpdata = drp.OrderBy(t => t.uname).GroupBy(t => t.uid);
+                var grpstart = row;
+                foreach (var dr in grpdata)
+                {
+                    var col = 0;
+                    var druser = dr.First();
+
+                    if(row % 2 == 0)
+                    {
+                        fpSpread1_Sheet1.Rows[row].BackColor = Color.FromArgb(80,Color.LightSkyBlue);
+                    }
+                    else fpSpread1_Sheet1.Rows[row].BackColor = Color.White;
+
+                    fpSpread1_Sheet1.Cells[row, col++].Value = drp.First().process;
+                    fpSpread1_Sheet1.Cells[row, col++].Value = druser.uname;
+                    fpSpread1_Sheet1.Cells[row, col++].Value = druser.uid;
+
+                    //카테고리별로 데이터를 취합하여 대상 셀에 값을기록한다.
+                    var userCate = dr.GroupBy(t => t.cate);
+                    var sum_발생 = 0.0;
+                    var sum_사용 = 0.0;
+                    var sum_잔여 = 0.0;
+                    var sum_초과 = 0.0;
+                    var sum_이월 = 0.0;
+                    var lastcol = 0;
+                    foreach (var drCate in userCate)
+                    {
+                        var cateName = drCate.Key;
+                        var cateColumn = catelist[cateName]; //이컬럼의 시작 인덱스를 찾는다.
+
+                        //var offset = cateColumn;
+                        var 이월 = cateName.StartsWith("대체") ? drCate.Sum(t => t.iwol) : drCate.Sum(t => t.iwolday);
+                        var 발생 = cateName.StartsWith("대체") ? drCate.Sum(t => t.dr) : drCate.Sum(t => t.drday);
+                        var 사용 = cateName.StartsWith("대체") ? drCate.Sum(T => T.cr) : drCate.Sum(t => t.crday);
+                        var 잔여 = 발생 - 사용 + 이월;
+                        var 사용률 = 0.0;
+                        var 사용률2 = 0.0;
+                        var 초과 = 0.0;
+                        if (cateName.StartsWith("이월") && 잔여 < 0)
+                        {
+                            잔여 = 0;
+                        }
+                        else
+                        {
+                            if (발생 + 이월 != 0) 사용률 = (사용 / (발생 + 이월)) * 100f;
+
+                            //년차에서만 초과를 계산한다.
+                            if (cateName.StartsWith("년차"))
+                            {
+                                //잔여가 -라면 초과분으로 한다
+                                초과 = 잔여 < 0 ? -잔여 : 0;
+
                             }
 
-        private void toolStripButton6_Click(object sender, EventArgs e)
+                            if (발생 != 0) 사용률2 = ((사용 - 이월) / 발생) * 100f;
-        {
+
-            // dataGridView1.ExportData(string.Empty);
                         }
 
+                        if (이월 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = 이월;
+                        else cateColumn++;
+                        if (발생 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = 발생;
+                        else cateColumn++;
+                        if (사용 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = 사용;
+                        else cateColumn++;
+                        if (잔여 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = 잔여;
+                        else cateColumn++;
+                        if (초과 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = 초과;
+                        else cateColumn++;
+                        if (사용률 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = Math.Round(사용률, 1);
+                        else cateColumn++;
+                        if (사용률2 != 0.0) fpSpread1_Sheet1.Cells[row, cateColumn++].Value = Math.Round(사용률2, 1);
+                        else cateColumn++;
+
+
+
+                        sum_이월 += 이월;
+                        sum_발생 += 발생;
+                        sum_사용 += 사용;
+                        sum_잔여 += 잔여;
+                        sum_초과 += 초과;
+                        if (cateColumn > lastcol) lastcol = cateColumn;
+                    }
+
+                    var sum_사용률 = Math.Round((sum_사용 / (sum_발생 + sum_이월)) * 100f, 1);
+                    var sum_사용률2 = Math.Round((sum_사용 - sum_이월) / (sum_발생) * 100f, 1);
+
+
+                    var offset = 0;
+                    if (sum_이월 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_이월;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+                    if (sum_발생 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_발생;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+                    if (sum_사용 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_사용;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+                    if (sum_잔여 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_잔여;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+                    if (sum_초과 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_초과;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+                    if (sum_사용률 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_사용률;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+                    if (sum_사용률2 != 0.0) fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = sum_사용률2;
+                    else fpSpread1_Sheet1.Cells[row, headercol - subcols.Length + offset++].Value = null;
+
+                    row += 1;
+                    if (this.fpSpread1_Sheet1.RowCount < 1 + row) this.fpSpread1_Sheet1.RowCount = 1 + row;
+                }
+                var grpend = row;
+                fpSpread1.ActiveSheet.AddSpanCell(grpstart, 0, grpend - grpstart, 1); //같은그룹명 병합
+            }
+
+            //마지막줄에는 총계를 표시한다.
+            fpSpread1_Sheet1.Cells[row, 0].Value = "합계";
+            fpSpread1_Sheet1.AddSpanCell(row, 0, row, 3);
+            fpSpread1_Sheet1.SetFormula(row, 3, $"SUM(R1C4:R{row}C4)");
+
+            //0번컬럼은 색상을 초기화
+            for(int i = 0; i < fpSpread1_Sheet1.RowCount;i++)
+            fpSpread1_Sheet1.Cells[i,0].BackColor = Color.White;
+
+
+
+            for (int i = 4; i <= grpend2; i++)
+            {
+                var colname = fpSpread1_Sheet1.Columns[i - 1].Label;
+                var cellf = fpSpread1_Sheet1.Cells.Get(row, i - 1).CellType;
+
+
+                if (colname.Contains("%") == false)
+                {
+                    fpSpread1_Sheet1.SetFormula(row, i - 1, $"SUM(R1C{i}:R{row}C{i})");
+                }
+                else
+                {
+                    fpSpread1_Sheet1.SetFormula(row, i - 1, $"AVERAGE(R1C{i}:R{row}C{i})");
+                    fpSpread1_Sheet1.Cells[row, i - 1].CellType = numcell1;
+                    //var 발생 = (double)fpSpread1_Sheet1.GetValue(row, i - 1 - 4);
+                    //var 사용 = (double)fpSpread1_Sheet1.GetValue(row, i - 1 - 3);
+                    //var 사용률 = 0.0;
+                    //if (사용 > 발생) 사용률 = 100;
+                    //else if (발생 > 0) 사용률 = Math.Round((사용 / 발생) * 100f, 1);
+                    //if (사용률 != 0.0)
+                    //    fpSpread1_Sheet1.SetValue(row, i - 1, 사용률);
+                }
+
+                //cellf = numcell1;
+            }
+
+            fpSpread1_Sheet1.Cells[0, 0, row, grpend2 - 1].HorizontalAlignment = CellHorizontalAlignment.Center;
+            fpSpread1_Sheet1.Cells[0, 0, row, grpend2 - 1].VerticalAlignment = CellVerticalAlignment.Center;
+
+            //값이없는 컬럼은 숨김처리한다.
+            string title = "";
+            for (int i = 3; i < fpSpread1_Sheet1.ColumnCount; i++)
+            {
+                if ((i + 4) % subcols.Length == 0)
+                {
+                    title = fpSpread1_Sheet1.ColumnHeader.Cells[0, i].Text;
+                }
+                var title2 = fpSpread1_Sheet1.ColumnHeader.Cells[1, i].Text;
+                if(title != "년차" && title != "합계"  && title2 == "초과")
+                {
+                    fpSpread1_Sheet1.Columns[i].Visible = false;
+                }
+                else if (title != "년차" && title != "합계" && title != "대체" && title2.Contains("이월"))
+                {
+                    fpSpread1_Sheet1.Columns[i].Visible = false;
+                }
+                else fpSpread1_Sheet1.Columns[i].Visible = true;
+            }
+        }
+
+
+
         private void btSearch_Click(object sender, EventArgs e)
         {
             refrehData();
@@ -264,5 +388,20 @@ namespace FBS0000
         {
 
         }
+
+        private void toolStripButton1_Click(object sender, EventArgs e)
+        {
+            var sd = new SaveFileDialog();
+            sd.Filter = "excel file|*.xls";
+            sd.RestoreDirectory = true;
+            sd.FileName = $"휴가이력현황({tbMon.Text}).xls";
+            if (sd.ShowDialog() != DialogResult.OK) return;
+            this.fpSpread1.SaveExcel(sd.FileName, ExcelSaveFlags.SaveAsViewed | ExcelSaveFlags.SaveBothCustomRowAndColumnHeaders);
+
+            var dlg = FCOMMON.Util.MsgQ("생성된 파일을 확인 할까요?");
+            if (dlg != DialogResult.Yes) return;
+
+            FCOMMON.Util.RunExplorer(sd.FileName);
+        }
     }
 }

SubProject/FBS0000/Holiday/rHolidaySummary.resx

@@ -117,6 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="bs2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>351, 17</value>
+  </metadata>
+  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>119, 17</value>
   </metadata>
@@ -172,16 +181,31 @@
         dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="bs2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>351, 17</value>
+    <value>
-  </metadata>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-    <value>17, 17</value>
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-  </metadata>
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>225, 17</value>
   </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>289, 17</value>
   </metadata>
+  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>424, 17</value>
+  </metadata>
+  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>424, 17</value>
+  </metadata>
 </root>

SubProject/FBS0000/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace FBS0000.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -27,7 +27,7 @@ namespace FBS0000.Properties {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
-            "user;Password=Amkor123!")]
+            "user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
         public string gwcs {
             get {
                 return ((string)(this["gwcs"]));

SubProject/FBS0000/Properties/Settings.settings

@@ -5,10 +5,10 @@
     <Setting Name="gwcs" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
-  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
+      <Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SubProject/FBS0000/app.config

@@ -5,11 +5,16 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
+    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
-    <add name="FBS0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient"/>
+      providerName="System.Data.SqlClient" />
-    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+    <add name="FBS0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True"
-    <add name="EEEntity_BS0000" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+      providerName="System.Data.SqlClient" />
-    <add name="EEEntities_BS0000" connectionString="metadata=res://*/Model_BS0000.csdl|res://*/Model_BS0000.ssdl|res://*/Model_BS0000.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
+    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntity_BS0000" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
+    <add name="EEEntities_BS0000" connectionString="metadata=res://*/Model_BS0000.csdl|res://*/Model_BS0000.ssdl|res://*/Model_BS0000.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
+      providerName="System.Data.EntityClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>

SubProject/FBS0000/dsMSSQL.Designer.cs

@@ -1428,6 +1428,8 @@ namespace FBS0000 {
             
             private global::System.Data.DataColumn columnlock;
             
+            private global::System.Data.DataColumn columniwol;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public HolydayDataTable() {
@@ -1653,6 +1655,14 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn iwolColumn {
+                get {
+                    return this.columniwol;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1713,7 +1723,8 @@ namespace FBS0000 {
                         string tag, 
                         string extcate, 
                         int extidx, 
-                        bool _lock) {
+                        bool _lock, 
+                        bool iwol) {
                 HolydayRow rowHolydayRow = ((HolydayRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -1739,7 +1750,8 @@ namespace FBS0000 {
                         tag,
                         extcate,
                         extidx,
-                        _lock};
+                        _lock,
+                        iwol};
                 rowHolydayRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowHolydayRow);
                 return rowHolydayRow;
@@ -1793,6 +1805,7 @@ namespace FBS0000 {
                 this.columnextcate = base.Columns["extcate"];
                 this.columnextidx = base.Columns["extidx"];
                 this.columnlock = base.Columns["lock"];
+                this.columniwol = base.Columns["iwol"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1849,6 +1862,8 @@ namespace FBS0000 {
                 this.columnlock.ExtendedProperties.Add("Generator_ColumnVarNameInTable", "columnlock");
                 this.columnlock.ExtendedProperties.Add("Generator_UserColumnName", "lock");
                 base.Columns.Add(this.columnlock);
+                this.columniwol = new global::System.Data.DataColumn("iwol", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columniwol);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -5200,6 +5215,22 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool iwol {
+                get {
+                    try {
+                        return ((bool)(this[this.tableHolyday.iwolColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("\'Holyday\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e);
+                    }
+                }
+                set {
+                    this[this.tableHolyday.iwolColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IscateNull() {
@@ -5439,6 +5470,18 @@ namespace FBS0000 {
             public void Set_lockNull() {
                 this[this.tableHolyday.lockColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsiwolNull() {
+                return this.IsNull(this.tableHolyday.iwolColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetiwolNull() {
+                this[this.tableHolyday.iwolColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -8492,10 +8535,11 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
             tableMapping.ColumnMappings.Add("extcate", "extcate");
             tableMapping.ColumnMappings.Add("extidx", "extidx");
             tableMapping.ColumnMappings.Add("lock", "lock");
+            tableMapping.ColumnMappings.Add("iwol", "iwol");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) 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_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL) OR ([lock] = @Original_lock)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) 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_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL) OR ([lock] = @Original_lock)) AND ((@IsNull_iwol = 1 AND [iwol] IS NULL) OR ([iwol] = @Original_iwol)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.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, "", "", ""));
@@ -8533,10 +8577,12 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_extidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "extidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_lock", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "lock", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_lock", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "lock", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_iwol", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iwol", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_iwol", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iwol", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime], [tag], [extcate], [extidx], [lock]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime, @tag, @extcate, @extidx, @lock);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime], [tag], [extcate], [extidx], [lock], [iwol]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime, @tag, @extcate, @extidx, @lock, @iwol);
-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, extcate, extidx, lock FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid";
+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, extcate, extidx, lock, iwol FROM Holyday WITH (NOLOCK) WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid, idx";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -8560,6 +8606,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@extcate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "extcate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@extidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "extidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@lock", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "lock", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iwol", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iwol", 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 [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate" +
@@ -8567,27 +8614,29 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                 "id, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reas" +
                 "on, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrT" +
                 "ime] = @DrTime, [CrTime] = @CrTime, [tag] = @tag, [extcate] = @extcate, [extidx]" +
-                " = @extidx, [lock] = @lock WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1" +
+                " = @extidx, [lock] = @lock, [iwol] = @iwol WHERE (([idx] = @Original_idx) AND ((" +
-                " AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND " +
+                "@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull" +
-                "[result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND " +
+                "_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNul" +
-                "[sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [ed" +
+                "l_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_e" +
-                "ate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] " +
+                "date = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term" +
-                "IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NU" +
+                " = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 A" +
-                "LL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR " +
+                "ND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [u" +
-                "([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] =" +
+                "id] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NU" +
-                " @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailse" +
+                "LL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS N" +
-                "nd] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Origina" +
+                "ULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([w" +
-                "l_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original" +
+                "date] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([ter" +
-                "_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] " +
+                "mDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime =" +
-                "IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime]" +
+                " 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime " +
-                " IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS N" +
+                "= 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = " +
-                "ULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL" +
+                "1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [" +
-                ") OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS N" +
+                "extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 A" +
-                "ULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL" +
+                "ND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AN" +
-                ") OR ([lock] = @Original_lock)));\r\nSELECT idx, cate, result, sdate, edate, term," +
+                "D [lock] IS NULL) OR ([lock] = @Original_lock)) AND ((@IsNull_iwol = 1 AND [iwol" +
-                " title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcod" +
+                "] IS NULL) OR ([iwol] = @Original_iwol)));\r\nSELECT idx, cate, result, sdate, eda" +
-                "e, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag, extcate, extidx, lock " +
+                "te, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, ter" +
-                "FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid";
+                "mDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag, extcate, exti" +
+                "dx, lock, iwol FROM Holyday WITH (NOLOCK) WHERE (idx = @idx) ORDER BY sdate, eda" +
+                "te, uid, idx";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -8611,6 +8660,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@extcate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "extcate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@extidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "extidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@lock", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "lock", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iwol", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iwol", 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, 0, 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("@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, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -8647,6 +8697,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_extidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "extidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_lock", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "lock", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_lock", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "lock", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_iwol", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iwol", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_iwol", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iwol", 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.Current, false, null, "", "", ""));
         }
         
@@ -8664,7 +8716,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"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, extcate, extidx, 
-               lock
+               lock, iwol
 FROM     Holyday WITH (NOLOCK)
 WHERE  (sdate >= @sd) AND (gcode = @gcode) AND (uid LIKE @uid) AND (sdate <= @ed) AND (cate LIKE @cate)
 ORDER BY sdate, edate, uid, idx";
@@ -8676,19 +8728,14 @@ ORDER BY sdate, edate, uid, idx";
             this._commandCollection[0].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[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, 
+            this._commandCollection[1].CommandText = @"SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, iwol, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WITH (NOLOCK) WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) OR (gcode = @gcode) AND (edate BETWEEN @sd AND @ed) ORDER BY sdate, edate, uid";
-               wuid
-FROM     Holyday WITH (NOLOCK)
-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, "", "", ""));
             this._commandCollection[1].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[2] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[2].Connection = this.Connection;
-            this._commandCollection[2].CommandText = @"SELECT Holyday.CrTime, Holyday.DrTime, Holyday.cate, Holyday.contents, Holyday.edate, Holyday.extcate, Holyday.extidx, Holyday.gcode, Holyday.idx, Holyday.lock, Holyday.mail, Holyday.mailsend, Holyday.reason, Holyday.result, Holyday.sdate, Holyday.tag, Holyday.term, Holyday.termDr, Holyday.title, Holyday.tolist, Holyday.uid, Holyday.wdate, Holyday.wuid FROM Holyday LEFT OUTER JOIN EETGW_WorkTableUser ON Holyday.gcode = EETGW_WorkTableUser.gcode AND Holyday.uid = EETGW_WorkTableUser.empno WHERE (Holyday.sdate >= @sd) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp) AND (Holyday.sdate <= @ed) ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
+            this._commandCollection[2].CommandText = @"SELECT Holyday.CrTime, Holyday.DrTime, Holyday.cate, Holyday.contents, Holyday.edate, Holyday.extcate, Holyday.extidx, Holyday.gcode, Holyday.idx, Holyday.iwol, Holyday.lock, Holyday.mail, Holyday.mailsend, Holyday.reason, Holyday.result, Holyday.sdate, Holyday.tag, Holyday.term, Holyday.termDr, Holyday.title, Holyday.tolist, Holyday.uid, Holyday.wdate, Holyday.wuid FROM Holyday LEFT OUTER JOIN EETGW_WorkTableUser ON Holyday.gcode = EETGW_WorkTableUser.gcode AND Holyday.uid = EETGW_WorkTableUser.empno WHERE (Holyday.sdate >= @sd) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp) AND (Holyday.sdate <= @ed) ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid";
             this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[2].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, "", "", ""));
             this._commandCollection[2].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, "", "", ""));
@@ -8696,10 +8743,7 @@ ORDER BY sdate, edate, uid";
             this._commandCollection[2].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[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
-            this._commandCollection[3].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, 
+            this._commandCollection[3].CommandText = @"SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, iwol, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WITH (NOLOCK) WHERE (gcode = @gcode) AND (idx = @idx)";
-               wuid
-FROM     Holyday WITH (NOLOCK)
-WHERE  (gcode = @gcode) AND (idx = @idx)";
             this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[3].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[3].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.Current, false, null, "", "", ""));
@@ -9033,7 +9077,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     string Original_tag, 
                     string Original_extcate, 
                     global::System.Nullable<int> Original_extidx, 
-                    global::System.Nullable<bool> Original_lock) {
+                    global::System.Nullable<bool> Original_lock, 
+                    global::System.Nullable<bool> Original_iwol) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_cate == null)) {
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -9176,6 +9221,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                 this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(1));
                 this.Adapter.DeleteCommand.Parameters[35].Value = global::System.DBNull.Value;
             }
+            if ((Original_iwol.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[37].Value = ((bool)(Original_iwol.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[37].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -9218,7 +9271,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     string tag, 
                     string extcate, 
                     global::System.Nullable<int> extidx, 
-                    global::System.Nullable<bool> _lock) {
+                    global::System.Nullable<bool> _lock, 
+                    global::System.Nullable<bool> iwol) {
             if ((cate == null)) {
                 this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -9346,6 +9400,12 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             else {
                 this.Adapter.InsertCommand.Parameters[21].Value = global::System.DBNull.Value;
             }
+            if ((iwol.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[22].Value = ((bool)(iwol.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[22].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)) {
@@ -9389,6 +9449,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     string extcate, 
                     global::System.Nullable<int> extidx, 
                     global::System.Nullable<bool> _lock, 
+                    global::System.Nullable<bool> iwol, 
                     int Original_idx, 
                     string Original_cate, 
                     string Original_result, 
@@ -9409,6 +9470,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     string Original_extcate, 
                     global::System.Nullable<int> Original_extidx, 
                     global::System.Nullable<bool> Original_lock, 
+                    global::System.Nullable<bool> Original_iwol, 
                     int idx) {
             if ((cate == null)) {
                 this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -9537,149 +9599,163 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
             else {
                 this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_idx));
+            if ((iwol.HasValue == true)) {
-            if ((Original_cate == null)) {
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((bool)(iwol.Value));
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
-                this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_cate));
+            }
+            this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_idx));
+            if ((Original_cate == null)) {
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_cate));
             }
             if ((Original_result == null)) {
-                this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_result));
+                this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_result));
             }
             if ((Original_sdate.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[28].Value = ((System.DateTime)(Original_sdate.Value));
+                this.Adapter.UpdateCommand.Parameters[29].Value = ((System.DateTime)(Original_sdate.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
             }
             if ((Original_edate.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[30].Value = ((System.DateTime)(Original_edate.Value));
+                this.Adapter.UpdateCommand.Parameters[31].Value = ((System.DateTime)(Original_edate.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
             }
             if ((Original_term.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[32].Value = ((double)(Original_term.Value));
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((double)(Original_term.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
             }
             if ((Original_title == null)) {
-                this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_title));
+                this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_title));
             }
             if ((Original_uid == null)) {
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_uid));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_uid));
             }
             if ((Original_mail.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[38].Value = ((bool)(Original_mail.Value));
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((bool)(Original_mail.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value;
             }
             if ((Original_mailsend.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[40].Value = ((bool)(Original_mailsend.Value));
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((bool)(Original_mailsend.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
             }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[42].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[43].Value = ((System.DateTime)(Original_wdate));
             if ((Original_termDr.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[44].Value = ((double)(Original_termDr.Value));
+                this.Adapter.UpdateCommand.Parameters[45].Value = ((double)(Original_termDr.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value;
             }
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_gcode));
             }
             if ((Original_DrTime.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[47].Value = ((double)(Original_DrTime.Value));
+                this.Adapter.UpdateCommand.Parameters[48].Value = ((double)(Original_DrTime.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value;
             }
             if ((Original_CrTime.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[49].Value = ((double)(Original_CrTime.Value));
+                this.Adapter.UpdateCommand.Parameters[50].Value = ((double)(Original_CrTime.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value;
             }
             if ((Original_tag == null)) {
-                this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_tag));
+                this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_tag));
             }
             if ((Original_extcate == null)) {
-                this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_extcate));
+                this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_extcate));
             }
             if ((Original_extidx.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_extidx.Value));
+                this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_extidx.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value;
             }
             if ((Original_lock.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[57].Value = ((bool)(Original_lock.Value));
+                this.Adapter.UpdateCommand.Parameters[58].Value = ((bool)(Original_lock.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(idx));
+            if ((Original_iwol.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[60].Value = ((bool)(Original_iwol.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[61].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)) {
@@ -9723,6 +9799,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     string extcate, 
                     global::System.Nullable<int> extidx, 
                     global::System.Nullable<bool> _lock, 
+                    global::System.Nullable<bool> iwol, 
                     int Original_idx, 
                     string Original_cate, 
                     string Original_result, 
@@ -9742,8 +9819,9 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                     string Original_tag, 
                     string Original_extcate, 
                     global::System.Nullable<int> Original_extidx, 
-                    global::System.Nullable<bool> Original_lock) {
+                    global::System.Nullable<bool> Original_lock, 
-            return this.Update(cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, tag, extcate, extidx, _lock, Original_idx, Original_cate, Original_result, Original_sdate, Original_edate, Original_term, Original_title, Original_uid, Original_mail, Original_mailsend, Original_wuid, Original_wdate, Original_termDr, Original_gcode, Original_DrTime, Original_CrTime, Original_tag, Original_extcate, Original_extidx, Original_lock, Original_idx);
+                    global::System.Nullable<bool> Original_iwol) {
+            return this.Update(cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, tag, extcate, extidx, _lock, iwol, Original_idx, Original_cate, Original_result, Original_sdate, Original_edate, Original_term, Original_title, Original_uid, Original_mail, Original_mailsend, Original_wuid, Original_wdate, Original_termDr, Original_gcode, Original_DrTime, Original_CrTime, Original_tag, Original_extcate, Original_extidx, Original_lock, Original_iwol, Original_idx);
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

SubProject/FBS0000/dsMSSQL.xsd

@@ -234,7 +234,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) 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_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL) OR ([lock] = @Original_lock)))</CommandText>
+                    <CommandText>DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) 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_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL) OR ([lock] = @Original_lock)) AND ((@IsNull_iwol = 1 AND [iwol] IS NULL) OR ([iwol] = @Original_iwol)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -272,13 +272,15 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_extidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="extidx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_lock" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="lock" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_lock" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="lock" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_iwol" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="iwol" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_iwol" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="iwol" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime], [tag], [extcate], [extidx], [lock]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime, @tag, @extcate, @extidx, @lock);
+                    <CommandText>INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime], [tag], [extcate], [extidx], [lock], [iwol]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime, @tag, @extcate, @extidx, @lock, @iwol);
-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, extcate, extidx, lock FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid</CommandText>
+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, extcate, extidx, lock, iwol FROM Holyday WITH (NOLOCK) WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid, idx</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@result" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -302,13 +304,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@extcate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="extcate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@extidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="extidx" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@lock" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="lock" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@iwol" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="iwol" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>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, extcate, extidx, 
-               lock
+               lock, iwol
 FROM     Holyday WITH (NOLOCK)
 WHERE  (sdate &gt;= @sd) AND (gcode = @gcode) AND (uid LIKE @uid) AND (sdate &lt;= @ed) AND (cate LIKE @cate)
 ORDER BY sdate, edate, uid, idx</CommandText>
@@ -323,8 +326,8 @@ ORDER BY sdate, edate, uid, idx</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @uid, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reason, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrTime] = @DrTime, [CrTime] = @CrTime, [tag] = @tag, [extcate] = @extcate, [extidx] = @extidx, [lock] = @lock WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) 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_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL) OR ([lock] = @Original_lock)));
+                    <CommandText>UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @uid, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reason, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrTime] = @DrTime, [CrTime] = @CrTime, [tag] = @tag, [extcate] = @extcate, [extidx] = @extidx, [lock] = @lock, [iwol] = @iwol WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) 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_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL) OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL) OR ([lock] = @Original_lock)) AND ((@IsNull_iwol = 1 AND [iwol] IS NULL) OR ([iwol] = @Original_iwol)));
-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, extcate, extidx, lock FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid</CommandText>
+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, extcate, extidx, lock, iwol FROM Holyday WITH (NOLOCK) WHERE (idx = @idx) ORDER BY sdate, edate, uid, idx</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@result" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="result" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -348,6 +351,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@extcate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="extcate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@extidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="extidx" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@lock" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="lock" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@iwol" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="iwol" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -384,7 +388,9 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_extidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="extidx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_lock" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="lock" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_lock" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="lock" 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="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_iwol" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="iwol" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_iwol" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="iwol" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Holyday" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -415,17 +421,13 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
               <Mapping SourceColumn="extcate" DataSetColumn="extcate" />
               <Mapping SourceColumn="extidx" DataSetColumn="extidx" />
               <Mapping SourceColumn="lock" DataSetColumn="lock" />
+              <Mapping SourceColumn="iwol" DataSetColumn="iwol" />
             </Mappings>
             <Sources>
               <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, 
+                    <CommandText>SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, iwol, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WITH (NOLOCK) WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed) OR (gcode = @gcode) AND (edate BETWEEN @sd AND @ed) ORDER BY sdate, edate, uid</CommandText>
-               wuid
-FROM     Holyday WITH (NOLOCK)
-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" />
@@ -437,7 +439,7 @@ ORDER BY sdate, edate, uid</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByGrp" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByGrp" GeneratorSourceName="FillByGrp" GetMethodModifier="Public" GetMethodName="GetByGrp" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByGrp" UserSourceName="FillByGrp">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT Holyday.CrTime, Holyday.DrTime, Holyday.cate, Holyday.contents, Holyday.edate, Holyday.extcate, Holyday.extidx, Holyday.gcode, Holyday.idx, Holyday.lock, Holyday.mail, Holyday.mailsend, Holyday.reason, Holyday.result, Holyday.sdate, Holyday.tag, Holyday.term, Holyday.termDr, Holyday.title, Holyday.tolist, Holyday.uid, Holyday.wdate, Holyday.wuid FROM Holyday LEFT OUTER JOIN EETGW_WorkTableUser ON Holyday.gcode = EETGW_WorkTableUser.gcode AND Holyday.uid = EETGW_WorkTableUser.empno WHERE (Holyday.sdate &gt;= @sd) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp) AND (Holyday.sdate &lt;= @ed) ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid</CommandText>
+                    <CommandText>SELECT Holyday.CrTime, Holyday.DrTime, Holyday.cate, Holyday.contents, Holyday.edate, Holyday.extcate, Holyday.extidx, Holyday.gcode, Holyday.idx, Holyday.iwol, Holyday.lock, Holyday.mail, Holyday.mailsend, Holyday.reason, Holyday.result, Holyday.sdate, Holyday.tag, Holyday.term, Holyday.termDr, Holyday.title, Holyday.tolist, Holyday.uid, Holyday.wdate, Holyday.wuid FROM Holyday LEFT OUTER JOIN EETGW_WorkTableUser ON Holyday.gcode = EETGW_WorkTableUser.gcode AND Holyday.uid = EETGW_WorkTableUser.empno WHERE (Holyday.sdate &gt;= @sd) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp) AND (Holyday.sdate &lt;= @ed) ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid</CommandText>
                     <Parameters>
                       <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" />
                       <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" />
@@ -450,10 +452,7 @@ ORDER BY sdate, edate, uid</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIdx" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyIdx" GeneratorSourceName="FillByIdx" GetMethodModifier="Public" GetMethodName="GetbyIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyIdx" UserSourceName="FillByIdx">
                 <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, 
+                    <CommandText>SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, iwol, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, wuid FROM Holyday WITH (NOLOCK) WHERE (gcode = @gcode) AND (idx = @idx)</CommandText>
-               wuid
-FROM     Holyday WITH (NOLOCK)
-WHERE  (gcode = @gcode) AND (idx = @idx)</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="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Holyday" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1121,6 +1120,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
               </xs:element>
               <xs:element name="extidx" msprop:Generator_ColumnPropNameInTable="extidxColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="extidx" msprop:Generator_UserColumnName="extidx" msprop:Generator_ColumnVarNameInTable="columnextidx" type="xs:int" minOccurs="0" />
               <xs:element name="lock" msprop:Generator_ColumnPropNameInTable="lockColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="_lock" msprop:Generator_UserColumnName="lock" msprop:Generator_ColumnVarNameInTable="columnlock" type="xs:boolean" minOccurs="0" />
+              <xs:element name="iwol" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnVarNameInTable="columniwol" msprop:Generator_UserColumnName="iwol" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -1172,7 +1172,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
         <xs:element name="WorkTableGrp" msprop:Generator_RowEvHandlerName="WorkTableGrpRowChangeEventHandler" msprop:Generator_RowDeletedName="WorkTableGrpRowDeleted" msprop:Generator_RowDeletingName="WorkTableGrpRowDeleting" msprop:Generator_RowEvArgName="WorkTableGrpRowChangeEvent" msprop:Generator_TablePropName="WorkTableGrp" msprop:Generator_RowChangedName="WorkTableGrpRowChanged" msprop:Generator_UserTableName="WorkTableGrp" msprop:Generator_RowChangingName="WorkTableGrpRowChanging" msprop:Generator_RowClassName="WorkTableGrpRow" msprop:Generator_TableClassName="WorkTableGrpDataTable" msprop:Generator_TableVarName="tableWorkTableGrp">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="grp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_UserColumnName="grp" msprop:Generator_ColumnVarNameInTable="columngrp" minOccurs="0">
+              <xs:element name="grp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_UserColumnName="grp" msprop:Generator_ColumnVarNameInTable="columngrp">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -1418,7 +1418,7 @@ WHERE  (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
         <xs:element name="HolydayUserList" msprop:Generator_RowEvHandlerName="HolydayUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="HolydayUserListRowDeleted" msprop:Generator_RowDeletingName="HolydayUserListRowDeleting" msprop:Generator_RowEvArgName="HolydayUserListRowChangeEvent" msprop:Generator_TablePropName="HolydayUserList" msprop:Generator_RowChangedName="HolydayUserListRowChanged" msprop:Generator_UserTableName="HolydayUserList" msprop:Generator_RowChangingName="HolydayUserListRowChanging" msprop:Generator_RowClassName="HolydayUserListRow" msprop:Generator_TableClassName="HolydayUserListDataTable" msprop:Generator_TableVarName="tableHolydayUserList">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />

SubProject/FBS0000/dsMSSQL.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:minutes" ZOrder="10" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Board" ZOrder="9" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
@@ -14,8 +14,8 @@
     <Shape ID="DesignTable:EETGW_WorkTableUser" ZOrder="7" X="610" Y="715" Height="270" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="200" />
     <Shape ID="DesignTable:vJobReportForUser" ZOrder="5" X="963" Y="373" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:HolidayLIst" ZOrder="2" X="1300" Y="157" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="6" X="250" Y="606" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
     <Shape ID="DesignTable:HolydayUserList" ZOrder="1" X="77" Y="500" Height="115" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="6" X="250" Y="606" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FBS0000/dsReport.Designer.cs

@@ -414,6 +414,12 @@ namespace FBS0000 {
             
             private global::System.Data.DataColumn columnDrDay;
             
+            private global::System.Data.DataColumn columnsdate;
+            
+            private global::System.Data.DataColumn columnedate;
+            
+            private global::System.Data.DataColumn columniwol;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public holydataDataTable() {
@@ -519,6 +525,30 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn sdateColumn {
+                get {
+                    return this.columnsdate;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn edateColumn {
+                get {
+                    return this.columnedate;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn iwolColumn {
+                get {
+                    return this.columniwol;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -556,7 +586,7 @@ namespace FBS0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public holydataRow AddholydataRow(string uid, string cate, double DrTime, double CrTime, string gcode, string Process, string name, double CrDay, double DrDay) {
+            public holydataRow AddholydataRow(string uid, string cate, double DrTime, double CrTime, string gcode, string Process, string name, double CrDay, double DrDay, System.DateTime sdate, System.DateTime edate, bool iwol) {
                 holydataRow rowholydataRow = ((holydataRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         uid,
@@ -567,7 +597,10 @@ namespace FBS0000 {
                         Process,
                         name,
                         CrDay,
-                        DrDay};
+                        DrDay,
+                        sdate,
+                        edate,
+                        iwol};
                 rowholydataRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowholydataRow);
                 return rowholydataRow;
@@ -599,6 +632,9 @@ namespace FBS0000 {
                 this.columnname = base.Columns["name"];
                 this.columnCrDay = base.Columns["CrDay"];
                 this.columnDrDay = base.Columns["DrDay"];
+                this.columnsdate = base.Columns["sdate"];
+                this.columnedate = base.Columns["edate"];
+                this.columniwol = base.Columns["iwol"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -622,6 +658,12 @@ namespace FBS0000 {
                 base.Columns.Add(this.columnCrDay);
                 this.columnDrDay = new global::System.Data.DataColumn("DrDay", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDrDay);
+                this.columnsdate = new global::System.Data.DataColumn("sdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnsdate);
+                this.columnedate = new global::System.Data.DataColumn("edate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnedate);
+                this.columniwol = new global::System.Data.DataColumn("iwol", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columniwol);
                 this.columnuid.MaxLength = 20;
                 this.columncate.MaxLength = 20;
                 this.columngcode.AllowDBNull = false;
@@ -785,6 +827,8 @@ namespace FBS0000 {
             
             private global::System.Data.DataColumn columnjan;
             
+            private global::System.Data.DataColumn columniwol;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public Holydata_DayDataTable() : 
@@ -923,6 +967,14 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn iwolColumn {
+                get {
+                    return this.columniwol;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -960,7 +1012,7 @@ namespace FBS0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, double jan) {
+            public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, double jan, bool iwol) {
                 Holydata_DayRow rowHolydata_DayRow = ((Holydata_DayRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -974,7 +1026,8 @@ namespace FBS0000 {
                         gcode,
                         name,
                         Process,
-                        jan};
+                        jan,
+                        iwol};
                 rowHolydata_DayRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowHolydata_DayRow);
                 return rowHolydata_DayRow;
@@ -982,7 +1035,7 @@ namespace FBS0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process) {
+            public Holydata_DayRow AddHolydata_DayRow(System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string gcode, string name, string Process, bool iwol) {
                 Holydata_DayRow rowHolydata_DayRow = ((Holydata_DayRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -996,7 +1049,8 @@ namespace FBS0000 {
                         gcode,
                         name,
                         Process,
-                        null};
+                        null,
+                        iwol};
                 rowHolydata_DayRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowHolydata_DayRow);
                 return rowHolydata_DayRow;
@@ -1038,6 +1092,7 @@ namespace FBS0000 {
                 this.columnname = base.Columns["name"];
                 this.columnProcess = base.Columns["Process"];
                 this.columnjan = base.Columns["jan"];
+                this.columniwol = base.Columns["iwol"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1067,6 +1122,8 @@ namespace FBS0000 {
                 base.Columns.Add(this.columnProcess);
                 this.columnjan = new global::System.Data.DataColumn("jan", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnjan);
+                this.columniwol = new global::System.Data.DataColumn("iwol", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columniwol);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -1245,6 +1302,8 @@ namespace FBS0000 {
             
             private global::System.Data.DataColumn columnProcess;
             
+            private global::System.Data.DataColumn columniwol;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public Holydata_TimeDataTable() {
@@ -1366,6 +1425,14 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn iwolColumn {
+                get {
+                    return this.columniwol;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1403,7 +1470,7 @@ namespace FBS0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public Holydata_TimeRow AddHolydata_TimeRow(string gcode, string name, System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string Process) {
+            public Holydata_TimeRow AddHolydata_TimeRow(string gcode, string name, System.DateTime sdate, string uid, string cate, double jun, double Dr, double Cr, string contents, string Process, bool iwol) {
                 Holydata_TimeRow rowHolydata_TimeRow = ((Holydata_TimeRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         gcode,
@@ -1416,7 +1483,8 @@ namespace FBS0000 {
                         Dr,
                         Cr,
                         contents,
-                        Process};
+                        Process,
+                        iwol};
                 rowHolydata_TimeRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowHolydata_TimeRow);
                 return rowHolydata_TimeRow;
@@ -1457,6 +1525,7 @@ namespace FBS0000 {
                 this.columnCr = base.Columns["Cr"];
                 this.columncontents = base.Columns["contents"];
                 this.columnProcess = base.Columns["Process"];
+                this.columniwol = base.Columns["iwol"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1484,6 +1553,8 @@ namespace FBS0000 {
                 base.Columns.Add(this.columncontents);
                 this.columnProcess = new global::System.Data.DataColumn("Process", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnProcess);
+                this.columniwol = new global::System.Data.DataColumn("iwol", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columniwol);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columngcode.AllowDBNull = false;
@@ -1651,6 +1722,8 @@ namespace FBS0000 {
             
             private global::System.Data.DataColumn columnrate;
             
+            private global::System.Data.DataColumn columniwol;
+            
             private global::System.Data.DataColumn columndrday;
             
             private global::System.Data.DataColumn columncrday;
@@ -1661,6 +1734,10 @@ namespace FBS0000 {
             
             private global::System.Data.DataColumn columnaddday;
             
+            private global::System.Data.DataColumn columnorderno;
+            
+            private global::System.Data.DataColumn columniwolday;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public holydatasumDataTable() {
@@ -1766,6 +1843,14 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn iwolColumn {
+                get {
+                    return this.columniwol;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public global::System.Data.DataColumn drdayColumn {
@@ -1806,6 +1891,22 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn ordernoColumn {
+                get {
+                    return this.columnorderno;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn iwoldayColumn {
+                get {
+                    return this.columniwolday;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1843,7 +1944,24 @@ namespace FBS0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public holydatasumRow AddholydatasumRow(string uid, string uname, string process, string cate, double dr, double cr, double jan, double add, double rate, double drday, double crday, double janday, double rateday, double addday) {
+            public holydatasumRow AddholydatasumRow(
+                        string uid, 
+                        string uname, 
+                        string process, 
+                        string cate, 
+                        double dr, 
+                        double cr, 
+                        double jan, 
+                        double add, 
+                        double rate, 
+                        double iwol, 
+                        double drday, 
+                        double crday, 
+                        double janday, 
+                        double rateday, 
+                        double addday, 
+                        int orderno, 
+                        double iwolday) {
                 holydatasumRow rowholydatasumRow = ((holydatasumRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         uid,
@@ -1855,11 +1973,14 @@ namespace FBS0000 {
                         jan,
                         add,
                         rate,
+                        iwol,
                         drday,
                         crday,
                         janday,
                         rateday,
-                        addday};
+                        addday,
+                        orderno,
+                        iwolday};
                 rowholydatasumRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowholydatasumRow);
                 return rowholydatasumRow;
@@ -1899,11 +2020,14 @@ namespace FBS0000 {
                 this.columnjan = base.Columns["jan"];
                 this.columnadd = base.Columns["add"];
                 this.columnrate = base.Columns["rate"];
+                this.columniwol = base.Columns["iwol"];
                 this.columndrday = base.Columns["drday"];
                 this.columncrday = base.Columns["crday"];
                 this.columnjanday = base.Columns["janday"];
                 this.columnrateday = base.Columns["rateday"];
                 this.columnaddday = base.Columns["addday"];
+                this.columnorderno = base.Columns["orderno"];
+                this.columniwolday = base.Columns["iwolday"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1927,6 +2051,8 @@ namespace FBS0000 {
                 base.Columns.Add(this.columnadd);
                 this.columnrate = new global::System.Data.DataColumn("rate", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnrate);
+                this.columniwol = new global::System.Data.DataColumn("iwol", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columniwol);
                 this.columndrday = new global::System.Data.DataColumn("drday", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columndrday);
                 this.columncrday = new global::System.Data.DataColumn("crday", typeof(double), null, global::System.Data.MappingType.Element);
@@ -1937,6 +2063,10 @@ namespace FBS0000 {
                 base.Columns.Add(this.columnrateday);
                 this.columnaddday = new global::System.Data.DataColumn("addday", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnaddday);
+                this.columnorderno = new global::System.Data.DataColumn("orderno", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnorderno);
+                this.columniwolday = new global::System.Data.DataColumn("iwolday", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columniwolday);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnuid,
                                 this.columncate}, true));
@@ -2221,6 +2351,54 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public System.DateTime sdate {
+                get {
+                    try {
+                        return ((global::System.DateTime)(this[this.tableholydata.sdateColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'sdate\' 열의 값이 DBNull입니다.", e);
+                    }
+                }
+                set {
+                    this[this.tableholydata.sdateColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public System.DateTime edate {
+                get {
+                    try {
+                        return ((global::System.DateTime)(this[this.tableholydata.edateColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("\'holydata\' 테이블의 \'edate\' 열의 값이 DBNull입니다.", e);
+                    }
+                }
+                set {
+                    this[this.tableholydata.edateColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool iwol {
+                get {
+                    if (this.IsiwolNull()) {
+                        return false;
+                    }
+                    else {
+                        return ((bool)(this[this.tableholydata.iwolColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydata.iwolColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsuidNull() {
@@ -2316,6 +2494,42 @@ namespace FBS0000 {
             public void SetDrDayNull() {
                 this[this.tableholydata.DrDayColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IssdateNull() {
+                return this.IsNull(this.tableholydata.sdateColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetsdateNull() {
+                this[this.tableholydata.sdateColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsedateNull() {
+                return this.IsNull(this.tableholydata.edateColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetedateNull() {
+                this[this.tableholydata.edateColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsiwolNull() {
+                return this.IsNull(this.tableholydata.iwolColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetiwolNull() {
+                this[this.tableholydata.iwolColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -2514,6 +2728,22 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool iwol {
+                get {
+                    try {
+                        return ((bool)(this[this.tableHolydata_Day.iwolColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("\'Holydata_Day\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e);
+                    }
+                }
+                set {
+                    this[this.tableHolydata_Day.iwolColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IssdateNull() {
@@ -2633,6 +2863,18 @@ namespace FBS0000 {
             public void SetjanNull() {
                 this[this.tableHolydata_Day.janColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsiwolNull() {
+                return this.IsNull(this.tableHolydata_Day.iwolColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetiwolNull() {
+                this[this.tableHolydata_Day.iwolColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -2815,6 +3057,22 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool iwol {
+                get {
+                    try {
+                        return ((bool)(this[this.tableHolydata_Time.iwolColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("\'Holydata_Time\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e);
+                    }
+                }
+                set {
+                    this[this.tableHolydata_Time.iwolColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsnameNull() {
@@ -2922,6 +3180,18 @@ namespace FBS0000 {
             public void SetProcessNull() {
                 this[this.tableHolydata_Time.ProcessColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsiwolNull() {
+                return this.IsNull(this.tableHolydata_Time.iwolColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetiwolNull() {
+                this[this.tableHolydata_Time.iwolColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -3072,6 +3342,22 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double iwol {
+                get {
+                    try {
+                        return ((double)(this[this.tableholydatasum.iwolColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("\'holydatasum\' 테이블의 \'iwol\' 열의 값이 DBNull입니다.", e);
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.iwolColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public double drday {
@@ -3152,6 +3438,38 @@ namespace FBS0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public int orderno {
+                get {
+                    if (this.IsordernoNull()) {
+                        return 1;
+                    }
+                    else {
+                        return ((int)(this[this.tableholydatasum.ordernoColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.ordernoColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public double iwolday {
+                get {
+                    if (this.IsiwoldayNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tableholydatasum.iwoldayColumn]));
+                    }
+                }
+                set {
+                    this[this.tableholydatasum.iwoldayColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsunameNull() {
@@ -3236,6 +3554,18 @@ namespace FBS0000 {
                 this[this.tableholydatasum.rateColumn] = global::System.Convert.DBNull;
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsiwolNull() {
+                return this.IsNull(this.tableholydatasum.iwolColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetiwolNull() {
+                this[this.tableholydatasum.iwolColumn] = global::System.Convert.DBNull;
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsdrdayNull() {
@@ -3295,6 +3625,30 @@ namespace FBS0000 {
             public void SetadddayNull() {
                 this[this.tableholydatasum.adddayColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsordernoNull() {
+                return this.IsNull(this.tableholydatasum.ordernoColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetordernoNull() {
+                this[this.tableholydatasum.ordernoColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsiwoldayNull() {
+                return this.IsNull(this.tableholydatasum.iwoldayColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetiwoldayNull() {
+                this[this.tableholydatasum.iwoldayColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -3567,6 +3921,9 @@ namespace FBS0000.dsReportTableAdapters {
             tableMapping.ColumnMappings.Add("name", "name");
             tableMapping.ColumnMappings.Add("CrDay", "CrDay");
             tableMapping.ColumnMappings.Add("DrDay", "DrDay");
+            tableMapping.ColumnMappings.Add("sdate", "sdate");
+            tableMapping.ColumnMappings.Add("edate", "edate");
+            tableMapping.ColumnMappings.Add("iwol", "iwol");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -3584,7 +3941,7 @@ namespace FBS0000.dsReportTableAdapters {
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  Holyday.uid, Users.name, Holyday.cate, (CASE cate WHEN '외출' THEN 1 ELSE Holyday.term END) AS CrDay, Holyday.termDr AS DrDay, Holyday.DrTime, Holyday.CrTime, Holyday.gcode, 
-               EETGW_GroupUser.Process
+               EETGW_GroupUser.Process, Holyday.sdate, Holyday.edate, Holyday.iwol
 FROM     Users WITH (NOLOCK) INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser WITH (NOLOCK) ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
@@ -3790,6 +4147,7 @@ ORDER BY Holyday.uid, CrDay";
             tableMapping.ColumnMappings.Add("gcode", "gcode");
             tableMapping.ColumnMappings.Add("name", "name");
             tableMapping.ColumnMappings.Add("Process", "Process");
+            tableMapping.ColumnMappings.Add("iwol", "iwol");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -3845,7 +4203,7 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_Day(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, Holyday.termDr AS Dr, 
-               Holyday.term AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process
+               Holyday.term AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol
 FROM     Holyday WITH (NOLOCK) LEFT OUTER JOIN
                EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
                Users ON Holyday.uid = Users.id
@@ -4227,6 +4585,7 @@ ORDER BY Holyday.sdate, Holyday.idx";
             tableMapping.ColumnMappings.Add("Cr", "Cr");
             tableMapping.ColumnMappings.Add("contents", "contents");
             tableMapping.ColumnMappings.Add("Process", "Process");
+            tableMapping.ColumnMappings.Add("iwol", "iwol");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -4244,7 +4603,7 @@ ORDER BY Holyday.sdate, Holyday.idx";
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_Time(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, Holyday.DrTime AS Dr, 
-               Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process
+               Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol
 FROM     Holyday WITH (NOLOCK) LEFT OUTER JOIN
                EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
                Users WITH (NOLOCK) ON Holyday.uid = Users.id

SubProject/FBS0000/dsReport.xsd

@@ -13,7 +13,7 @@
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  Holyday.uid, Users.name, Holyday.cate, (CASE cate WHEN '외출' THEN 1 ELSE Holyday.term END) AS CrDay, Holyday.termDr AS DrDay, Holyday.DrTime, Holyday.CrTime, Holyday.gcode, 
-               EETGW_GroupUser.Process
+               EETGW_GroupUser.Process, Holyday.sdate, Holyday.edate, Holyday.iwol
 FROM     Users WITH (NOLOCK) INNER JOIN
                Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
                EETGW_GroupUser WITH (NOLOCK) ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
@@ -39,6 +39,9 @@ ORDER BY Holyday.uid, CrDay</CommandText>
               <Mapping SourceColumn="name" DataSetColumn="name" />
               <Mapping SourceColumn="CrDay" DataSetColumn="CrDay" />
               <Mapping SourceColumn="DrDay" DataSetColumn="DrDay" />
+              <Mapping SourceColumn="sdate" DataSetColumn="sdate" />
+              <Mapping SourceColumn="edate" DataSetColumn="edate" />
+              <Mapping SourceColumn="iwol" DataSetColumn="iwol" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -66,7 +69,7 @@ ORDER BY Holyday.uid, CrDay</CommandText>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_Day(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, Holyday.termDr AS Dr, 
-               Holyday.term AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process
+               Holyday.term AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol
 FROM     Holyday WITH (NOLOCK) LEFT OUTER JOIN
                EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
                Users ON Holyday.uid = Users.id
@@ -120,6 +123,7 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A
               <Mapping SourceColumn="gcode" DataSetColumn="gcode" />
               <Mapping SourceColumn="name" DataSetColumn="name" />
               <Mapping SourceColumn="Process" DataSetColumn="Process" />
+              <Mapping SourceColumn="iwol" DataSetColumn="iwol" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -129,7 +133,7 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_Time(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun, Holyday.DrTime AS Dr, 
-               Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process
+               Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol
 FROM     Holyday WITH (NOLOCK) LEFT OUTER JOIN
                EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
                Users WITH (NOLOCK) ON Holyday.uid = Users.id
@@ -157,6 +161,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
               <Mapping SourceColumn="Cr" DataSetColumn="Cr" />
               <Mapping SourceColumn="contents" DataSetColumn="contents" />
               <Mapping SourceColumn="Process" DataSetColumn="Process" />
+              <Mapping SourceColumn="iwol" DataSetColumn="iwol" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -210,6 +215,9 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
               </xs:element>
               <xs:element name="CrDay" msprop:Generator_ColumnPropNameInTable="CrDayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="CrDay" msprop:Generator_UserColumnName="CrDay" msprop:Generator_ColumnVarNameInTable="columnCrDay" type="xs:double" minOccurs="0" />
               <xs:element name="DrDay" msprop:Generator_ColumnPropNameInTable="DrDayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="DrDay" msprop:Generator_UserColumnName="DrDay" msprop:Generator_ColumnVarNameInTable="columnDrDay" type="xs:double" minOccurs="0" />
+              <xs:element name="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="edate" msprop:Generator_ColumnPropNameInTable="edateColumn" msprop:Generator_ColumnPropNameInRow="edate" msprop:Generator_UserColumnName="edate" msprop:Generator_ColumnVarNameInTable="columnedate" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -264,6 +272,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="jan" msdata:ReadOnly="true" msdata:Expression="jun+dr-cr" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
+              <xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -317,6 +326,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -332,11 +342,14 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
               <xs:element name="jan" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
               <xs:element name="add" msprop:Generator_ColumnPropNameInTable="addColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="add" msprop:Generator_UserColumnName="add" msprop:Generator_ColumnVarNameInTable="columnadd" type="xs:double" minOccurs="0" />
               <xs:element name="rate" msprop:Generator_ColumnPropNameInTable="rateColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rate" msprop:Generator_UserColumnName="rate" msprop:Generator_ColumnVarNameInTable="columnrate" type="xs:double" minOccurs="0" />
+              <xs:element name="iwol" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnVarNameInTable="columniwol" msprop:Generator_UserColumnName="iwol" type="xs:double" minOccurs="0" />
               <xs:element name="drday" msprop:Generator_ColumnPropNameInTable="drdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="drday" msprop:Generator_UserColumnName="drday" msprop:Generator_ColumnVarNameInTable="columndrday" type="xs:double" minOccurs="0" />
               <xs:element name="crday" msprop:Generator_ColumnPropNameInTable="crdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="crday" msprop:Generator_UserColumnName="crday" msprop:Generator_ColumnVarNameInTable="columncrday" type="xs:double" minOccurs="0" />
               <xs:element name="janday" msprop:Generator_ColumnPropNameInTable="jandayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="janday" msprop:Generator_UserColumnName="janday" msprop:Generator_ColumnVarNameInTable="columnjanday" type="xs:double" minOccurs="0" />
               <xs:element name="rateday" msprop:Generator_ColumnPropNameInTable="ratedayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rateday" msprop:Generator_UserColumnName="rateday" msprop:Generator_ColumnVarNameInTable="columnrateday" type="xs:double" minOccurs="0" />
               <xs:element name="addday" msprop:Generator_ColumnPropNameInTable="adddayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="addday" msprop:Generator_UserColumnName="addday" msprop:Generator_ColumnVarNameInTable="columnaddday" type="xs:double" minOccurs="0" />
+              <xs:element name="orderno" msprop:Generator_ColumnPropNameInTable="ordernoColumn" msprop:nullValue="1" msprop:Generator_ColumnPropNameInRow="orderno" msprop:Generator_UserColumnName="orderno" msprop:Generator_ColumnVarNameInTable="columnorderno" type="xs:int" minOccurs="0" />
+              <xs:element name="iwolday" msprop:Generator_ColumnPropNameInTable="iwoldayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="iwolday" msprop:Generator_UserColumnName="iwolday" msprop:Generator_ColumnVarNameInTable="columniwolday" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FBS0000/dsReport.xss

@@ -4,11 +4,12 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="331" ViewPortY="186" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:holydata" ZOrder="3" X="443" Y="240" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:holydata" ZOrder="4" X="443" Y="240" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
-    <Shape ID="DesignTable:Holydata_Day" ZOrder="2" X="788" Y="288" Height="514" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="446" />
+    <Shape ID="DesignTable:Holydata_Day" ZOrder="3" X="788" Y="288" Height="514" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="446" />
-    <Shape ID="DesignTable:Holydata_Time" ZOrder="1" X="1102" Y="298" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:Holydata_Time" ZOrder="2" X="1102" Y="298" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:holydatasum" ZOrder="1" X="0" Y="0" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/JobReport_/rJobReportPrj.cs

@@ -132,18 +132,25 @@ namespace FPJ0000.JobReport_
             var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs);
 
             //데이터를 추가한다.
-            foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.pidx))
+            bool addholy = false;
+            foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.PrjName))
             {
                 var pidx = dr.Key;
                 var fdr = dr.First();
 
                 List<object> row = new List<object>();
-                row.Add(dr.Key);
+                row.Add(fdr.pidx);
-                if (dr.Key == -1)
+                if (string.IsNullOrEmpty(dr.Key))
                 {
                     row.Add("--");
                     row.Add("비 프로젝트 업무");
                 }
+                else if (dr.Key == "휴가")
+                {
+                    row.Add("--");
+                    row.Add("휴가");
+                    addholy = true;
+                }
                 else
                 {
                     row.Add(fdr.PrjStatus);
@@ -179,7 +186,7 @@ namespace FPJ0000.JobReport_
 
                 row.Add(tperc);
 
-                if (dr.Key == -1)
+                if (string.IsNullOrEmpty(dr.Key))
                     dv1.Rows.Insert(0, row.ToArray());
                 else
                     dv1.Rows.Add(row.ToArray());
@@ -229,6 +236,16 @@ namespace FPJ0000.JobReport_
                 }
 
             }
+            if (addholy && dv1.RowCount > 1)
+            {
+                var dvrow = dv1.Rows[1];
+                for (int i = 0; i < this.dv1.ColumnCount; i++)
+                {
+                    var c = dvrow.Cells[i];
+                    c.Style.BackColor = Color.LightGray;
+                }
+
+            }
 
 
             this.dv1.AutoResizeColumns();

SubProject/FPJ0000/dsReport.Designer.cs

@@ -9040,11 +9040,12 @@ ORDER BY pdate";
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs, 
-               Projects.status AS PrjStatus, Projects.name AS PrjName
+               Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName
 FROM     JobReport WITH (nolock) LEFT OUTER JOIN
                Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
 WHERE  (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0)
-GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
+GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)), 
+               Projects.status
 ORDER BY title, ww";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

SubProject/FPJ0000/dsReport.xsd

@@ -300,11 +300,12 @@ ORDER BY pdate</CommandText>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs, 
-               Projects.status AS PrjStatus, Projects.name AS PrjName
+               Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName
 FROM     JobReport WITH (nolock) LEFT OUTER JOIN
                Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
 WHERE  (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) &gt; 0)
-GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
+GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)), 
+               Projects.status
 ORDER BY title, ww</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -385,22 +386,22 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
         <xs:element name="jobReport" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_UserColumnName="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnVarNameInTable="columnyymm">
+              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_UserColumnName="yymm" msprop:Generator_ColumnVarNameInTable="columnyymm">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="22" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="total" msdata:ReadOnly="true" msprop:Generator_UserColumnName="total" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_ColumnVarNameInTable="columntotal" type="xs:int" minOccurs="0" />
+              <xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_UserColumnName="total" msprop:Generator_ColumnVarNameInTable="columntotal" type="xs:int" minOccurs="0" />
-              <xs:element name="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnVarNameInTable="columnuid">
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="uname" msdata:ReadOnly="true" msprop:Generator_UserColumnName="uname" msprop:Generator_ColumnPropNameInTable="unameColumn" msprop:Generator_ColumnPropNameInRow="uname" msprop:Generator_ColumnVarNameInTable="columnuname" minOccurs="0">
+              <xs:element name="uname" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="unameColumn" msprop:Generator_ColumnPropNameInRow="uname" msprop:Generator_UserColumnName="uname" msprop:Generator_ColumnVarNameInTable="columnuname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
@@ -425,7 +426,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
         <xs:element name="JobReportDay" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
+              <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -439,7 +440,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
+              <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -468,7 +469,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
         <xs:element name="ProcessList" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="processs" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_UserColumnName="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" minOccurs="0">
+              <xs:element name="processs" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_UserColumnName="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -481,14 +482,14 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
         <xs:element name="ProcessUserList" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" minOccurs="0">
+              <xs:element name="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnVarNameInTable="columnid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
+              <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -531,10 +532,10 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst">
+        <xs:element name="HolidayLIst" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -550,21 +551,21 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
+              <xs:element name="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
         <xs:element name="vJobReportForUser" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -665,8 +666,8 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="otStart" msprop:Generator_UserColumnName="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_UserColumnName="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="otEnd" msprop:Generator_UserColumnName="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_UserColumnName="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" type="xs:dateTime" minOccurs="0" />
               <xs:element name="ot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_UserColumnName="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" type="xs:double" minOccurs="0" />
               <xs:element name="otReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_UserColumnName="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" minOccurs="0">
                 <xs:simpleType>
@@ -678,13 +679,13 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="K5DailyForm" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm">
+        <xs:element name="K5DailyForm" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="Grp" msprop:Generator_UserColumnName="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" type="xs:string" />
+              <xs:element name="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_UserColumnName="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" type="xs:string" />
-              <xs:element name="Item" msprop:Generator_UserColumnName="Item" msprop:Generator_ColumnPropNameInTable="ItemColumn" msprop:Generator_ColumnPropNameInRow="Item" msprop:Generator_ColumnVarNameInTable="columnItem" type="xs:string" />
+              <xs:element name="Item" msprop:Generator_ColumnPropNameInTable="ItemColumn" msprop:Generator_ColumnPropNameInRow="Item" msprop:Generator_UserColumnName="Item" msprop:Generator_ColumnVarNameInTable="columnItem" type="xs:string" />
-              <xs:element name="ww" msprop:Generator_UserColumnName="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" type="xs:string" />
+              <xs:element name="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_UserColumnName="ww" msprop:Generator_ColumnVarNameInTable="columnww" type="xs:string" />
-              <xs:element name="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" type="xs:string" />
+              <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" type="xs:string" />
               <xs:element name="value" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_UserColumnName="value" msprop:Generator_ColumnVarNameInTable="columnvalue" type="xs:double" minOccurs="0" />
               <xs:element name="Sign" msprop:Generator_ColumnPropNameInTable="SignColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Sign" msprop:Generator_UserColumnName="Sign" msprop:Generator_ColumnVarNameInTable="columnSign" type="xs:string" minOccurs="0" />
               <xs:element name="Format" msprop:Generator_ColumnPropNameInTable="FormatColumn" msprop:nullValue="N0" msprop:Generator_ColumnPropNameInRow="Format" msprop:Generator_UserColumnName="Format" msprop:Generator_ColumnVarNameInTable="columnFormat" type="xs:string" minOccurs="0" />
@@ -711,7 +712,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
                 </xs:simpleType>
               </xs:element>
               <xs:element name="hrs" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_UserColumnName="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" type="xs:double" minOccurs="0" />
-              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" minOccurs="0" />
+              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" minOccurs="0" />
               <xs:element name="PrjStatus" msprop:Generator_ColumnPropNameInTable="PrjStatusColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrjStatus" msprop:Generator_UserColumnName="PrjStatus" msprop:Generator_ColumnVarNameInTable="columnPrjStatus" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -729,10 +730,10 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="UserScheduleTable" msprop:Generator_RowClassName="UserScheduleTableRow" msprop:Generator_RowEvHandlerName="UserScheduleTableRowChangeEventHandler" msprop:Generator_RowDeletedName="UserScheduleTableRowDeleted" msprop:Generator_RowDeletingName="UserScheduleTableRowDeleting" msprop:Generator_RowEvArgName="UserScheduleTableRowChangeEvent" msprop:Generator_TablePropName="UserScheduleTable" msprop:Generator_RowChangedName="UserScheduleTableRowChanged" msprop:Generator_UserTableName="UserScheduleTable" msprop:Generator_RowChangingName="UserScheduleTableRowChanging" msprop:Generator_TableClassName="UserScheduleTableDataTable" msprop:Generator_TableVarName="tableUserScheduleTable">
+        <xs:element name="UserScheduleTable" msprop:Generator_RowEvHandlerName="UserScheduleTableRowChangeEventHandler" msprop:Generator_RowDeletedName="UserScheduleTableRowDeleted" msprop:Generator_RowDeletingName="UserScheduleTableRowDeleting" msprop:Generator_RowEvArgName="UserScheduleTableRowChangeEvent" msprop:Generator_TablePropName="UserScheduleTable" msprop:Generator_RowChangedName="UserScheduleTableRowChanged" msprop:Generator_UserTableName="UserScheduleTable" msprop:Generator_RowChangingName="UserScheduleTableRowChanging" msprop:Generator_RowClassName="UserScheduleTableRow" msprop:Generator_TableClassName="UserScheduleTableDataTable" msprop:Generator_TableVarName="tableUserScheduleTable">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="ScheduleNo" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="ScheduleNoColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ScheduleNo" msprop:Generator_UserColumnName="ScheduleNo" msprop:Generator_ColumnVarNameInTable="columnScheduleNo" type="xs:int" minOccurs="0" />
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
@@ -748,7 +749,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="SubIDX" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="SubIDX" msprop:Generator_ColumnPropNameInTable="SubIDXColumn" msprop:Generator_ColumnPropNameInRow="SubIDX" msprop:Generator_ColumnVarNameInTable="columnSubIDX" type="xs:int" minOccurs="0" />
+              <xs:element name="SubIDX" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="SubIDXColumn" msprop:Generator_ColumnPropNameInRow="SubIDX" msprop:Generator_UserColumnName="SubIDX" msprop:Generator_ColumnVarNameInTable="columnSubIDX" type="xs:int" />
               <xs:element name="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_UserColumnName="no" msprop:Generator_ColumnVarNameInTable="columnno" type="xs:int" minOccurs="0" />
               <xs:element name="seq" msprop:Generator_ColumnPropNameInTable="seqColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="seq" msprop:Generator_UserColumnName="seq" msprop:Generator_ColumnVarNameInTable="columnseq" type="xs:int" minOccurs="0" />
               <xs:element name="title" msprop:Generator_ColumnPropNameInTable="titleColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="title" msprop:Generator_UserColumnName="title" msprop:Generator_ColumnVarNameInTable="columntitle" minOccurs="0">