diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3156bdd..e6af9cf 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("24.02.14.1450")] -[assembly: AssemblyFileVersion("24.02.14.1450")] +[assembly: AssemblyVersion("24.03.03.1500")] +[assembly: AssemblyFileVersion("24.03.03.1500")] diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index 038bda3..164dcd8 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/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(); diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index c9b4db8..80526af 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -86,11 +86,11 @@ namespace FBS0000 btDel.Enabled = false; btAdd.Enabled = false; + RefreshData(); + //this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. - //this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. - - } - RefreshData(); + } + } void Holyday_TableNewRow(object sender, DataTableNewRowEventArgs e) diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index cf7067b..dcbab32 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -124,7 +124,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 - RzcNNLVwvlTAdL7s3zCHjuEZ9FFLmPnFIpTgMDqbgvXbMgbH5pBIJIp04LHDeLZUCOA7+OiJYmohjbHw - H3jmWLgJgSiHLmcYPp8PJSUlJ0QD80MFHM1yGKpLxRLbhsOg4xw8swxcNIPhYBrUTw7vHAuIxWJbDSaI - QW/VAbHELvLOU4ssHNP5YZ6JeQ7agR9bv0TzfTlsL2ToPbMZYPdFMUqn8JUMecMZjJPdzb40WvQmzFOW - 4gY9pyXI5XLCSSyvsPB+j6ObdPHBHYVuKITX+gEErDqMa5Wor9nXKBio1WpJZ/UhGK4dQ/cpCWiaRjAY - 5M8afr9fKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv - 3hnH99rC8mEAAAAASUVORK5CYII= + WvRdKhfSef7fVU0G7+po3G6lhQ78fn+uqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg + 6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+ + A88cCzchEOXQ5QzD5/OhpKTkhGhgfqiAo1kOQ3WpWGLbcBh0nINnloGLZjAcTIP6yeGdYwGxWGyrwQQx + 6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS + 3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD + mJyc5M9bKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv + 0DnH8T7GGj4AAAAASUVORK5CYII= @@ -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 - 6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS - 3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD - mJychN/vFwoj5y5cHZ/eYLT1FuYGm2FoqswQi/ySle06+ejInsdy6W4FuS3264rU1ext/Ky5yA09O4e/ - 1ynH9HmAcj4AAAAASUVORK5CYII= + A88cCzchEOXQ5QzzR0BJSckJ0cD8UAFHsxyG6lKxxLbhMOg4B88sAxfNYDiYBvWTwzvHAmKx2FaDCWLQ + W3VALLGLnHlqkYVjOj/MMzHPQTvwY+uXaL4vh+2FDL1nNgPsvihG6RS+kiFvOINxsrvZl0aL3oR5ylLc + oOe0BLlcTngTyyssvN/j6CZdfHBHoRsK4bV+AAGrDuNaJepr9jUKBmq1WtJZfQiGa8fQfUoCmqYRDAYx + OTkJv98vFBYIBISr49MbjLbewtxgMwxNlRlikV+ysl0nHx3Z81gu3a0gt8V+XZG6mr2NnzUXuaFn5/AX + yUnH7pGap3AAAAAASUVORK5CYII= @@ -284,41 +284,41 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3yuyKTuUVRE3cI3GxMT4 - BXwRNcaIIBRRthYKZQdBZVFJXCNCoSuFVkppfUJNQI0Eo0aMsskqxzvpNKE+0HuHBF96kvt8f5mZc/+T - 6+GOO+4IyMPjry88OGYev3/UhsYjZB22ouGQFfWJvahL6MW9gxbcPWDBnf1k7etB7d4e1MSbcXuPGdVx - 3aja3Y3KXa9QEUtWjAnl0SaURZlQGmlESYQRxeIuKMLJCutEUWgnCkMM4wXB+iR+e9dZZhzkwQbkBRnG - +O1dZ7lxBUEG5Ad2gN/edf4HThbAAlwCrjzGCEWkDvnidhSKtSiO6KLCyfz19MClPLmiKA1sjz9iZnIO - lqYPkIWqqXDSnQxAoTjuyXVWvcPClCRoqHB5O3T0QCG4kigDHl3qwfyfeZ4G/ByagDRcSYXL9WMAsuLK - ortQfUqPqbEZngbMTs+h9mwH5CEdVLgcXy09kA1HShGnwff3ozzNnhcSG/JDtNS4bB8GIC2OO0rkEWq8 - VX/mWfaYGwfIwatiwmV5swApcUUROhgqnUsxaBsm310bMy7LS0MPpMEVR5JSXHQuxciX3yiKV5HvTs+M - u7WdAegKVxrFl2J8lqfZS1FzpgNk6AvC3fRU0wMXw3HjSx6uxUDXV55mz7NUK2TBGsG4zG0MwMVw3Gwt - CNOiv9MZ+DSlF9IgjWDcDZGKHrgYjhv8CrEBFSd0zq94ag5VpwkoQCcIl7GVAbgYzjH45aE6NCWZnUry - i5REFtsGqb+WGSfZ0k4PdIVzzFZpsBq6sjc8z55P1mFkBbQw49I3swApcI5zLjtAib72IZ5nj6muH5m+ - rUy49E1t9EBaHFcIWaAeuWIlvg2M8Dx7niRbkOndRo1L28gApMU52sp9c4pENSZHF/wskNKUnSQoLxUV - 7voGBiALztHWbD8VGs4ZnUrzY3AMEp9mKlzqeiU9kBXnKESmjxJqRR/PsycnspUKl7KOASgE5yiExPsl - usnfzPTELEz1/UgTNVPhrq1tpQcKxTkKIfFsRaroOcG1IEPUToVLXsMCXAKOthD/4pJXt9AD/wfu6ioG - IMGNLzfu8spm+qsP7iKHuytZTtyVFc3n+e3dcccd+nh4/AW2FD3300VP1AAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM + X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J + dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi + pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5 + jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz + 6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX + HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D + O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm + 3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1 + L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek + v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3 + UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq + 3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr + dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM + QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tUWgBAbUguOOeGE18 - 8N0XFROjggurrV2kFhAE3BXQqJgoS1s67bS1pZTtSSMJookiiRpNpEYU5TjDTCPEpL13TPClJ7nP95e5 - c+a7mZhooolGQu7u6smu3xkI1u3oRu12bm3rwp2tXbid1YlbWzpxc3MHbmzqwPWN3NoQwLX1AVxd144r - me2oyfCjeq0fVeltuJzGLbUPlWt8qFjtw6VVXpSnelGW8hSlydxa6YE5yYOLie5gSQJ7RNw+ciYZB1OC - G3qVe0jcPnImG1eicuOC0gVx+8j5HzhjPA2QEFeT6UdFugtmdSvK1Swq03ySccY4lhxI+uTK01h0P3iF - H99+oqfhNUrXMJJxhhUUQOJj3c1ifDzVL2BOdUrC6Zc7yYGk71xZBoPPA19FHjD6axT3jwZgTnFR43Sx - FEDSQlSovbh5wDN2xKF8D46gei8Lc7KbCnde4SAHkuBCbS1b7cLjM90iT8jH10MwpdtwMclNjNPKKYCk - uFAhTMkOBOpfijwhvewg9AlWYpxGRgOkwIUKYUyx4lXgg8gT4qx4Dp3SToTTLGPIgbQ4vhDmZO5dy7Dh - 89txpRkF7mX7cT7OHhF3bikFkBYXaqsp0YUr+1mMDP8pzfDQD5Rts0O/whEWV7zETg6Uggu11aBi8Ci3 - U+QJ6XUNolhhCYsrWkwBlIrjC6FXMmjImQh84XzHAa1hcYWLWsmBUnFGJYuqfc6/jtic1QqtggmLK1hI - AZSCu6BywaC24NOboEgTSlJ/qA3FcmtEXP4CGzmQFsd/5zTKZvQH3os0IUzpMxTJLUS4vPk0QEqcNs6G - tjt9IkvIc2YAhYomYlzePCs5kAani7fj4YkOkSXkQ/8XaJKaoZEzxLizcymApDhDvBOVe5wTLgvD3GWh - dGsrNe7MHAogCY4fX1pVy8RScNet2we9KJbZqHGnZ1vIgSQ4fraaMm0iTQhfikKZRRLu1CwKIAmOn63n - Yi1or+vD968j8Nf2oUDeJBmXO7OFHEiC4we/brljbELky57805PjcTkzaIAEuEiDnxaXM72ZHPg/cCen - UQA5XHCyccemNpL/+uB/5PD/SiYTd3xK42Fx+2iiiYY8MTG/AVPPPpwTzX58AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH + 331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO + fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt + QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6 + pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH + T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS + FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q + elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U + 0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC + Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS + cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01 + AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs + tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm + QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK + IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg== @@ -379,7 +379,7 @@ - 585, 17 + 587, 17 @@ -388,7 +388,7 @@ cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD///////////////8A/////ws= + AAD/////AQgAAP////8AAQgAAAs= @@ -398,7 +398,7 @@ cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD///////////////8A/////ws= + AAD/////AQgAAP////8AAQgAAAs= diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs index 73b8abe..304464f 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs +++ b/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; - 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 = "종료일"; + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(404, 114); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(150, 23); + this.checkBox1.TabIndex = 19; + this.checkBox1.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; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index 426c030..ada349f 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/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; diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.resx b/SubProject/FBS0000/Holiday/fHolyday_Add.resx index d324a61..922f810 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.resx +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.resx @@ -141,6 +141,9 @@ False + + False + 17, 17 @@ -150,7 +153,4 @@ 248, 17 - - False - \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.Designer.cs b/SubProject/FBS0000/Holiday/rHolidaySummary.Designer.cs index 6f1e98e..284bd9d 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.Designer.cs +++ b/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.bs2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).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.bs2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).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; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.cs b/SubProject/FBS0000/Holiday/rHolidaySummary.cs index 4987fa2..b7f4cd2 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.cs +++ b/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,179 +84,281 @@ 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.cr = cate.Sum(t => t.CrTime); - newdr.jan = newdr.dr - newdr.cr; - //newdr.add = 0; - if (newdr.dr != 0) newdr.rate = (newdr.cr / newdr.dr)*100f; - else newdr.rate = 0; + newdr.dr = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.DrTime); + newdr.cr = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.CrTime); + newdr.iwol = cate.Where(t => t.IsiwolNull() == false && t.iwol == true).Sum(t => t.DrTime); + + } 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.jan = newdr.dr - newdr.cr; - if (newdr.jan < 0) //초과사용자는 0으로 처리 - { - 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; + //이월과 그렇지 않은 데이터로 분리한다. + newdr.drday = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.DrDay); + newdr.crday = cate.Where(t => t.IsiwolNull() == true || t.iwol == false).Sum(t => t.CrDay); + newdr.iwolday = cate.Where(t => t.IsiwolNull() == false && t.iwol == true).Sum(t => t.DrDay); } + 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.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal); - this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent; - this.reportViewer1.RefreshReport(); + ////this.reportViewer1.LocalReport.ReportPath = "JobReport_\\rK5Dailyform.rdlc"; + //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal); + //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent; + //this.reportViewer1.RefreshReport(); - ////휴일데이터가 들어가 있음. - //var taH = new dsReportTableAdapters.HolidayLIstTableAdapter(); - // //taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%"); + var numcell1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + numcell1.DecimalPlaces = 1; + numcell1.FixedPoint = false; + numcell1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.No; + numcell1.Separator = ","; + numcell1.ShowSeparator = false; - // string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); - //// this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname); - // //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); - // //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; - - // //그리드뷰 생성 - // 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 rowdata = new List(); - // rowdata.Add(drName.uname + "(" + drName.uid + ")"); - - // List high = new List(); - // List low = new List(); - // 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 percell1 = new FarPoint.Win.Spread.CellType.PercentCellType(); + numcell1.DecimalPlaces = 1; + numcell1.FixedPoint = false; + numcell1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.No; + numcell1.Separator = ","; + numcell1.ShowSeparator = false; - // var sumhr = userDatas.Sum(t => t.hrs); - // var sumot = userDatas.Sum(t => t.ot); - // var sumhl = userDatas.Sum(t => t.holyot); - // if (sumot + sumhl == 0) rowdata.Add(string.Format("{0}", sumhr, sumot)); + //데이터표시 + var grpproc = dsReport.holydatasum.OrderBy(t => t.process).GroupBy(t => t.process); + var row = 0; + 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(%)" }; + var headercol = 0; + var catelist = new Dictionary(); + foreach (var colname in cols) + { + this.fpSpread1_Sheet1.ColumnHeader.Cells[0, headercol].Value = colname; + this.fpSpread1_Sheet1.AddColumnHeaderSpanCell(0, headercol, 2, 1); + headercol += 1; + } - // if (sumhr > basehr) high.Add(true); - // else high.Add(false); + this.fpSpread1_Sheet1.ColumnCount = 200; - // if (sumhr < basehr) low.Add(true); - // else low.Add(false); - // } - // } + //모든카테고리를 확인하여 컬럼을 먼저 생성한다. + 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; + 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); //같은그룹명 병합 + } - // 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(); + //최종합계추가 + 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; + + this.fpSpread1_Sheet1.RowCount = 1; + foreach (var drp in grpproc) + { + 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; + + } + + if (발생 != 0) 사용률2 = ((사용 - 이월) / 발생) * 100f; + + } + + 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 btRefresh_Click(object sender, EventArgs e) - { - } - - private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) - { - - } - - private void button1_Click(object sender, EventArgs e) - { - - } - - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - - } - - private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e) - { - // if (tbProcess.SelectedIndex >= 0) refrehData(); - } - - private void toolStripButton6_Click(object sender, EventArgs e) - { - // dataGridView1.ExportData(string.Empty); - } private void btSearch_Click(object sender, EventArgs e) { @@ -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); + } } } diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.resx b/SubProject/FBS0000/Holiday/rHolidaySummary.resx index 53d279a..0a58906 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.resx +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 351, 17 + + + 17, 17 + + + 17, 17 + 119, 17 @@ -172,16 +181,31 @@ dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= - - 351, 17 - - - 17, 17 - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 225, 17 289, 17 + + 424, 17 + + + 424, 17 + \ No newline at end of file diff --git a/SubProject/FBS0000/Properties/Settings.Designer.cs b/SubProject/FBS0000/Properties/Settings.Designer.cs index 67d6cf9..0ab9355 100644 --- a/SubProject/FBS0000/Properties/Settings.Designer.cs +++ b/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"])); diff --git a/SubProject/FBS0000/Properties/Settings.settings b/SubProject/FBS0000/Properties/Settings.settings index 700a7f5..fbb0863 100644 --- a/SubProject/FBS0000/Properties/Settings.settings +++ b/SubProject/FBS0000/Properties/Settings.settings @@ -5,10 +5,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> + <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123! + Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True \ No newline at end of file diff --git a/SubProject/FBS0000/app.config b/SubProject/FBS0000/app.config index fb6f25f..b2bef1a 100644 --- a/SubProject/FBS0000/app.config +++ b/SubProject/FBS0000/app.config @@ -5,11 +5,16 @@
- - - - - + + + + + diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index 001c6df..de221a6 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/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; + } } /// @@ -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); -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"; + 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, 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" + - " 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 [ed" + - "ate] 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 NU" + - "LL) 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 ([mailse" + - "nd] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Origina" + - "l_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 N" + - "ULL) OR ([tag] = @Original_tag)) AND ((@IsNull_extcate = 1 AND [extcate] IS NULL" + - ") OR ([extcate] = @Original_extcate)) AND ((@IsNull_extidx = 1 AND [extidx] IS N" + - "ULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AND [lock] IS NULL" + - ") OR ([lock] = @Original_lock)));\r\nSELECT idx, cate, result, sdate, edate, term," + - " title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcod" + - "e, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag, extcate, extidx, lock " + - "FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid"; + " = @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 ((@IsNul" + + "l_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_e" + + "date = 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 A" + + "ND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [u" + + "id] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NU" + + "LL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS N" + + "ULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([w" + + "date] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([ter" + + "mDr] = @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 A" + + "ND [extidx] IS NULL) OR ([extidx] = @Original_extidx)) AND ((@IsNull_lock = 1 AN" + + "D [lock] IS NULL) OR ([lock] = @Original_lock)) AND ((@IsNull_iwol = 1 AND [iwol" + + "] IS NULL) OR ([iwol] = @Original_iwol)));\r\nSELECT idx, cate, result, sdate, eda" + + "te, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, ter" + + "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, - 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].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"; 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, - wuid -FROM Holyday WITH (NOLOCK) -WHERE (gcode = @gcode) AND (idx = @idx)"; + 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)"; 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 Original_extidx, - global::System.Nullable Original_lock) { + global::System.Nullable Original_lock, + global::System.Nullable 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 extidx, - global::System.Nullable _lock) { + global::System.Nullable _lock, + global::System.Nullable 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 extidx, global::System.Nullable _lock, + global::System.Nullable 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 Original_extidx, global::System.Nullable Original_lock, + global::System.Nullable 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 ((Original_cate == null)) { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + if ((iwol.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[22].Value = ((bool)(iwol.Value)); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_cate)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + } + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); + 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 = ((string)(Original_result)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); + 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 = ((System.DateTime)(Original_sdate.Value)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); + 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 = ((System.DateTime)(Original_edate.Value)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + 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 = ((double)(Original_term.Value)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + 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 = ((string)(Original_title)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + 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 = ((string)(Original_uid)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + 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 = ((bool)(Original_mail.Value)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + 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 = ((bool)(Original_mailsend.Value)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + 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 = ((double)(Original_termDr.Value)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); + 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 = ((double)(Original_DrTime.Value)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + 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 = ((double)(Original_CrTime.Value)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + 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 = ((string)(Original_tag)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + 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 = ((string)(Original_extcate)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + 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 = ((int)(Original_extidx.Value)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + 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 = ((bool)(Original_lock.Value)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + 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 extidx, global::System.Nullable _lock, + global::System.Nullable 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 Original_extidx, - global::System.Nullable 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 Original_lock, + global::System.Nullable 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()] diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index 082cd5e..a68cadd 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -234,7 +234,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM - 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))) + 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))) @@ -272,13 +272,15 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM + + - 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); -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 + 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, iwol FROM Holyday WITH (NOLOCK) WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid, idx @@ -302,13 +304,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail + 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 @@ -323,8 +326,8 @@ ORDER BY sdate, edate, uid, idx - 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))); -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 + 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, iwol FROM Holyday WITH (NOLOCK) WHERE (idx = @idx) ORDER BY sdate, edate, uid, idx @@ -348,6 +351,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail + @@ -384,7 +388,9 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail - + + + @@ -415,17 +421,13 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail + - SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, - wuid -FROM Holyday 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 + 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 @@ -437,7 +439,7 @@ ORDER BY sdate, edate, uid - 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 + 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 @@ -450,10 +452,7 @@ ORDER BY sdate, edate, uid - SELECT CrTime, DrTime, dbo.getUserName(uid) AS UserName, cate, contents, edate, extcate, extidx, gcode, idx, lock, mail, mailsend, reason, result, sdate, tag, term, termDr, title, tolist, uid, wdate, - wuid -FROM Holyday WITH (NOLOCK) -WHERE (gcode = @gcode) AND (idx = @idx) + 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) @@ -1121,6 +1120,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= + @@ -1172,7 +1172,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + @@ -1418,7 +1418,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) >= - + diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss index 0af7d58..698ace6 100644 --- a/SubProject/FBS0000/dsMSSQL.xss +++ b/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. --> - + @@ -14,8 +14,8 @@ - + \ No newline at end of file diff --git a/SubProject/FBS0000/dsReport.Designer.cs b/SubProject/FBS0000/dsReport.Designer.cs index 208a279..cf259f1 100644 --- a/SubProject/FBS0000/dsReport.Designer.cs +++ b/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; + } } /// @@ -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; + } } /// @@ -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; + } } /// @@ -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; + } } /// @@ -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 diff --git a/SubProject/FBS0000/dsReport.xsd b/SubProject/FBS0000/dsReport.xsd index 515252e..b647912 100644 --- a/SubProject/FBS0000/dsReport.xsd +++ b/SubProject/FBS0000/dsReport.xsd @@ -13,7 +13,7 @@ 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 + + + @@ -66,7 +69,7 @@ ORDER BY Holyday.uid, CrDay 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 + @@ -129,7 +133,7 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A 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 + @@ -210,6 +215,9 @@ ORDER BY Holyday.sdate, Holyday.idx + + + @@ -264,6 +272,7 @@ ORDER BY Holyday.sdate, Holyday.idx + @@ -317,6 +326,7 @@ ORDER BY Holyday.sdate, Holyday.idx + @@ -332,11 +342,14 @@ ORDER BY Holyday.sdate, Holyday.idx + + + diff --git a/SubProject/FBS0000/dsReport.xss b/SubProject/FBS0000/dsReport.xss index e628c32..365563b 100644 --- a/SubProject/FBS0000/dsReport.xss +++ b/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. --> - + - - - + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs index a16c407..1aef023 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrj.cs +++ b/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 row = new List(); - row.Add(dr.Key); - if (dr.Key == -1) + row.Add(fdr.pidx); + 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(); diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index b71af7c..686c3a9 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/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, "", "", "")); diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index aee88da..c479635 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -300,11 +300,12 @@ ORDER BY pdate 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 @@ -385,22 +386,22 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + - - + + - + @@ -425,7 +426,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -439,7 +440,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -468,7 +469,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -481,14 +482,14 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + - + @@ -531,10 +532,10 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + - + @@ -550,21 +551,21 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + - + - + @@ -665,8 +666,8 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - - + + @@ -678,13 +679,13 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + - - - - + + + + @@ -711,7 +712,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -729,10 +730,10 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + - + @@ -748,7 +749,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - +