From 1b325a325aafd1356f81ebd4bf4209378dc8f26d Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 7 Sep 2020 17:57:16 +0900 Subject: [PATCH] .. --- .../FBS0000/Holiday/WorkTable.Designer.cs | 400 +++++++++++------- SubProject/FBS0000/Holiday/WorkTable.cs | 227 ++++------ SubProject/FBS0000/Holiday/WorkTable.resx | 27 +- .../FBS0000/Holiday/fHolyday.Designer.cs | 135 +++--- SubProject/FBS0000/Holiday/fHolyday.cs | 94 ++-- SubProject/FBS0000/Holiday/fHolyday.resx | 82 ++-- SubProject/FBS0000/dsMSSQL.Designer.cs | 302 ++++++++++++- SubProject/FBS0000/dsMSSQL.xsd | 100 ++++- SubProject/FBS0000/dsMSSQL.xss | 15 +- 9 files changed, 904 insertions(+), 478 deletions(-) diff --git a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs index f056cd3..ae82fd9 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs @@ -30,15 +30,9 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WorkTable)); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + System.Globalization.CultureInfo cultureInfo = new System.Globalization.CultureInfo("ko-KR", false); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -55,29 +49,21 @@ this.sbGen = new System.Windows.Forms.ToolStripLabel(); this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); this.sbJan = new System.Windows.Forms.ToolStripLabel(); - this.dsMSSQL = new FBS0000.dsMSSQL(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.autoResizeComlumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tbSD = new System.Windows.Forms.ToolStripTextBox(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.tbGrp = new System.Windows.Forms.ToolStripTextBox(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - this.cm1.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.SuspendLayout(); // // bn @@ -103,14 +89,14 @@ this.sbGen, this.toolStripLabel8, this.sbJan}); - this.bn.Location = new System.Drawing.Point(0, 531); + this.bn.Location = new System.Drawing.Point(0, 759); 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(984, 27); + this.bn.Size = new System.Drawing.Size(948, 27); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -221,39 +207,6 @@ this.sbJan.Size = new System.Drawing.Size(19, 24); this.sbJan.Text = "0"; // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // cm1 - // - this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.sendToMailToolStripMenuItem, - this.toolStripMenuItem1, - this.autoResizeComlumnsToolStripMenuItem}); - this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(201, 54); - // - // sendToMailToolStripMenuItem - // - this.sendToMailToolStripMenuItem.Name = "sendToMailToolStripMenuItem"; - this.sendToMailToolStripMenuItem.Size = new System.Drawing.Size(200, 22); - this.sendToMailToolStripMenuItem.Text = "Mail (Preview)"; - this.sendToMailToolStripMenuItem.Click += new System.EventHandler(this.sendToMailToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(197, 6); - // - // autoResizeComlumnsToolStripMenuItem - // - this.autoResizeComlumnsToolStripMenuItem.Name = "autoResizeComlumnsToolStripMenuItem"; - this.autoResizeComlumnsToolStripMenuItem.Size = new System.Drawing.Size(200, 22); - this.autoResizeComlumnsToolStripMenuItem.Text = "Auto Resize Comlumns"; - this.autoResizeComlumnsToolStripMenuItem.Click += new System.EventHandler(this.autoResizeComlumnsToolStripMenuItem_Click); - // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); @@ -262,10 +215,12 @@ this.tbSD, this.toolStripLabel2, this.tbED, + this.toolStripLabel3, + this.tbGrp, this.toolStripButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(984, 31); + this.toolStrip1.Size = new System.Drawing.Size(948, 31); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -297,6 +252,17 @@ this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel3.Text = "그룹"; + // + // tbGrp + // + this.tbGrp.Name = "tbGrp"; + this.tbGrp.Size = new System.Drawing.Size(200, 31); + // // toolStripButton1 // this.toolStripButton1.Image = global::FBS0000.Properties.Resources.action_refresh; @@ -308,14 +274,16 @@ // // fpSpread1 // - this.fpSpread1.AccessibleDescription = ""; + 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, 31); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(984, 500); + this.fpSpread1.Size = new System.Drawing.Size(948, 728); this.fpSpread1.TabIndex = 4; + this.fpSpread1.SetViewportLeftColumn(0, 0, 4); + this.fpSpread1.SetActiveViewport(0, 0, -1); // // fpSpread1_Sheet1 // @@ -323,97 +291,254 @@ 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.ColumnCount = 9; - 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.ColumnCount = 38; + this.fpSpread1_Sheet1.RowCount = 1; + this.fpSpread1_Sheet1.Cells.Get(0, 4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 9).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 9).Value = 6; + this.fpSpread1_Sheet1.Cells.Get(0, 9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 10).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 10).Value = 7; + this.fpSpread1_Sheet1.Cells.Get(0, 10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 11).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 11).Value = 8; + this.fpSpread1_Sheet1.Cells.Get(0, 11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 12).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 12).Value = 9; + this.fpSpread1_Sheet1.Cells.Get(0, 12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 13).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 13).Value = 10; + this.fpSpread1_Sheet1.Cells.Get(0, 13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 14).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 14).Value = 11; + this.fpSpread1_Sheet1.Cells.Get(0, 14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 15).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 15).Value = 12; + this.fpSpread1_Sheet1.Cells.Get(0, 15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 16).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 16).Value = 13; + this.fpSpread1_Sheet1.Cells.Get(0, 16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 33).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 33).Value = 30; + this.fpSpread1_Sheet1.Cells.Get(0, 33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo = ((System.Globalization.NumberFormatInfo)(cultureInfo.NumberFormat.Clone())); + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo)).NumberDecimalDigits = 0; + ((System.Globalization.NumberFormatInfo)(this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatInfo)).NumberGroupSizes = new int[] { + 0}; + this.fpSpread1_Sheet1.Cells.Get(0, 34).ParseFormatString = "n"; + this.fpSpread1_Sheet1.Cells.Get(0, 34).Value = 31; + this.fpSpread1_Sheet1.Cells.Get(0, 34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 35).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + numberCellType2.DecimalPlaces = 0; + numberCellType2.MaximumValue = 10000000D; + numberCellType2.MinimumValue = -10000000D; + numberCellType2.NegativeRed = true; + this.fpSpread1_Sheet1.Cells.Get(0, 35).CellType = numberCellType2; + this.fpSpread1_Sheet1.Cells.Get(0, 35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 35).Value = "발생연차"; + this.fpSpread1_Sheet1.Cells.Get(0, 35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 36).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Cells.Get(0, 36).CellType = numberCellType2; + this.fpSpread1_Sheet1.Cells.Get(0, 36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 36).Value = "사용휴가"; + this.fpSpread1_Sheet1.Cells.Get(0, 36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 37).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Cells.Get(0, 37).CellType = numberCellType2; + this.fpSpread1_Sheet1.Cells.Get(0, 37).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(0, 37).Value = "잔여휴가"; + this.fpSpread1_Sheet1.Cells.Get(0, 37).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + 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 = "사용(H)"; - 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.Rows.Get(0).Height = 31F; - 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(2020, 9, 3, 10, 46, 20, 866); - this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType2; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "sdate"; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "일자"; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(1).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "01"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "02"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "03"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "04"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "05"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "발생년차"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "사용휴가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "잔여휴가"; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + 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; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 69F; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); 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).Label = "사번"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "uid"; 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).Label = "직급"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 69F; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "UserName"; 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)(224)))), ((int)(((byte)(192))))); - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "term"; - 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)(224)))), ((int)(((byte)(192))))); - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "CrTime"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(H)"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "contents"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "내용"; - this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "termDr"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "DrTime"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 69F; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "01"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "02"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "03"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "04"; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "05"; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(23).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(24).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(25).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(26).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(27).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(28).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(29).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(30).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(31).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(32).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(33).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(34).Width = 35F; + this.fpSpread1_Sheet1.Columns.Get(35).Label = "발생년차"; + this.fpSpread1_Sheet1.Columns.Get(35).Width = 54F; + this.fpSpread1_Sheet1.Columns.Get(36).Label = "사용휴가"; + this.fpSpread1_Sheet1.Columns.Get(36).Width = 54F; + this.fpSpread1_Sheet1.Columns.Get(37).Label = "잔여휴가"; + this.fpSpread1_Sheet1.Columns.Get(37).Width = 54F; + this.fpSpread1_Sheet1.FrozenColumnCount = 4; + this.fpSpread1_Sheet1.PrintInfo.ColEnd = 37; + this.fpSpread1_Sheet1.PrintInfo.ColStart = 0; + this.fpSpread1_Sheet1.PrintInfo.Footer = ""; + this.fpSpread1_Sheet1.PrintInfo.Header = ""; + this.fpSpread1_Sheet1.PrintInfo.JobName = ""; + this.fpSpread1_Sheet1.PrintInfo.Margin.Bottom = 75; + this.fpSpread1_Sheet1.PrintInfo.Margin.Footer = 30; + this.fpSpread1_Sheet1.PrintInfo.Margin.Header = 30; + this.fpSpread1_Sheet1.PrintInfo.Margin.Left = 25; + this.fpSpread1_Sheet1.PrintInfo.Margin.Right = 25; + this.fpSpread1_Sheet1.PrintInfo.Margin.Top = 75; + noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo2.HardMarginX = 0F; + noPrinterPrintInfo2.HardMarginY = 0F; + noPrinterPrintInfo2.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; + this.fpSpread1_Sheet1.PrintInfo.Orientation = FarPoint.Win.Spread.PrintOrientation.Landscape; + this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; + this.fpSpread1_Sheet1.PrintInfo.Printer = ""; + this.fpSpread1_Sheet1.PrintInfo.PrintType = FarPoint.Win.Spread.PrintType.CellRange; + this.fpSpread1_Sheet1.PrintInfo.RowEnd = 0; + this.fpSpread1_Sheet1.PrintInfo.RowStart = 0; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // bs - // - this.bs.DataMember = "Holyday"; - this.bs.DataSource = this.dsMSSQL; - // - // ta - // - this.ta.ClearBeforeFill = true; - // // WorkTable // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(984, 558); + this.ClientSize = new System.Drawing.Size(948, 786); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); @@ -423,21 +548,16 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - this.cm1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); } #endregion - - private dsMSSQL dsMSSQL; private System.Windows.Forms.BindingNavigator bn; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; @@ -454,10 +574,6 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel2; private System.Windows.Forms.ToolStripTextBox tbED; private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.ContextMenuStrip cm1; - private System.Windows.Forms.ToolStripMenuItem autoResizeComlumnsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem sendToMailToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripLabel sbUse; private System.Windows.Forms.ToolStripLabel toolStripLabel5; @@ -465,8 +581,8 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel8; private System.Windows.Forms.ToolStripLabel sbJan; private FarPoint.Win.Spread.FpSpread fpSpread1; - private System.Windows.Forms.BindingSource bs; - private dsMSSQLTableAdapters.HolydayTableAdapter ta; + private System.Windows.Forms.ToolStripLabel toolStripLabel3; + private System.Windows.Forms.ToolStripTextBox tbGrp; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs index b32f07c..ee9ef2f 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.cs +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -14,45 +14,18 @@ namespace FBS0000 { public partial class WorkTable : FCOMMON.fBase { - public WorkTable(string sd,string ed ) + public WorkTable(string sd, string ed, string grp) { InitializeComponent(); - this.dsMSSQL.vHoliday_uselist.TableNewRow += Holyday_TableNewRow; tbSD.Text = sd; tbED.Text = ed; + tbGrp.Text = grp; //this.dv1.CellFormatting += dv1_CellFormatting; } - void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) - { - //if (e.RowIndex < 0 || e.ColumnIndex < 0) return; - //var col = this.dv1.Columns[e.ColumnIndex]; - //var cate = dv1.Rows[e.RowIndex].Cells["dvc_cate"].Value.ToString(); - //if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray; - //else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black; - } - private void __Load(object sender, EventArgs e) { - tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; - tbED.Text = DateTime.Now.AddDays(10).ToShortDateString(); - - //var userlist = FCOMMON.DBM.getUserTable(); - //dvc_user.DataSource = userlist; - //dvc_user.ValueMember = "Key"; - //dvc_user.DisplayMember = "Value"; - - //var cateList = FCOMMON.DBM.getCodeTable("02"); - //this.dvc_cate.DataSource = cateList; - //dvc_cate.ValueMember = "Key"; - //dvc_cate.DisplayMember = "Value"; - - //var rrltList = FCOMMON.DBM.getCodeTable("03"); - //this.dvc_result.DataSource = rrltList; - //dvc_result.ValueMember = "Key"; - //dvc_result.DisplayMember = "Value"; - //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); if (curLevel >= 5) @@ -61,61 +34,95 @@ namespace FBS0000 } else { - // this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. + // this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. } RefreshData(); } - void Holyday_TableNewRow(object sender, DataTableNewRowEventArgs e) - { - e.Row["wuid"] = FCOMMON.info.Login.no; - e.Row["uid"] = FCOMMON.info.Login.no; - e.Row["wdate"] = DateTime.Now; - e.Row["cate"] = "0"; //기본 신청 - e.Row["pdate"] = DateTime.Now; - e.Row["termDr"] = 1.0f; - e.Row["contents"] = string.Empty; - } - void RefreshData() { - //update data - - //var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); - //var ed = DateTime.Parse(tbED.Text + " 23:59:59"); - //this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid, FCOMMON.info.Login.gcode); + fpSpread1_Sheet1.Rows.Count = 0; + + //열제목 + var cols = new List(); + cols.AddRange(new string[] { "번호", "사번", "직급", "성명" }); + + var sd = DateTime.Parse(tbSD.Text); + var ed = DateTime.Parse(tbED.Text); + var idx = 0; ; + while (true) + { + var curDate = sd.AddDays(idx++); + cols.Add(curDate.Day.ToString("00")); + if (curDate.ToShortDateString() == ed.ToShortDateString()) break; + } + cols.AddRange(new string[]{ "발생년차","사용휴가","잔여휴가"}); + + //열제목 설정 + fpSpread1_Sheet1.Columns.Count = cols.Count; + for (int c = 0; c < cols.Count; c++) + { + fpSpread1_Sheet1.Columns[c].Label = cols[c]; + } + //fpSpread1_Sheet1.Cells[0, c].Value = cols[c]; + + //해당 기간내의 사용 + var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); + var dtUser = taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text); + var users = new List(); + foreach(var item in dtUser) + { + if(string.IsNullOrEmpty(item.indate)) + { + //입사일자를 체크해서. 이 날짜가 입사일 이전이면 넘어간다 + } + users.Add(new userinfo { grade = item.grade, name = item.name, empno = item.empno, seq = item.seq.ToString() }); + } + + //휴가테이블에서 데이터를 가져온다 + var taHoly = new dsMSSQLTableAdapters.HolydayTableAdapter(); + var dtHoly = taHoly.GetByGrp(tbSD.Text, tbED.Text, FCOMMON.info.Login.gcode, this.tbGrp.Text); - ////잔량계산 - //double sumdrD = this.dsMSSQL.Holyday.Sum(t => t.termDr); //전체발생수량 - //double sumdrT = this.dsMSSQL.Holyday.Sum(t => t.DrTime); //전체발생수량 + //사용자 목록을 1번열에 나열한다. + var rowindex = 0; + foreach (var item in users) + { + fpSpread1_Sheet1.Rows.Count += 1; + fpSpread1_Sheet1.Cells[rowindex, 0].Value = item.seq; + fpSpread1_Sheet1.Cells[rowindex, 1].Value = item.empno; + fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade; + fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name; - //double sumcrD = this.dsMSSQL.Holyday.Sum(t => t.term); //전체발생수량 - //double sumcrT = this.dsMSSQL.Holyday.Sum(t => t.CrTime); //전체발생수량 + //각 일자별로 특이사항을 찾는다 + for(int c= 4; c < cols.Count;c++) + { + var curDate = sd.AddDays(c-4); + var dr = dtHoly.Where(t => t.uid == item.empno && t.sdate.ToShortDateString() == curDate.ToShortDateString()).FirstOrDefault(); + if (dr != null) + { + //자료가있다. + if (dr.term == 1.0) fpSpread1_Sheet1.Cells[rowindex, c].Value = "Y"; + else if(dr.term != 0) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.term.ToString() +"Y"; - ////double sumcr = sumcrD + sumcrT; //전체 사용수량 - ////double sumdr = sumdrD + sumdrT; //전체 발생량 + if (dr.CrTime != 0) fpSpread1_Sheet1.Cells[rowindex, c].Value = dr.CrTime.ToString(); + } + else fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty; + } + + rowindex += 1; + } - //double janD = sumdrD - sumcrD; - //double janT = sumdrT - sumcrT; - //sbGen.Text = string.Format("{0}+{1}", sumdrD, sumdrT); //발생량 - //sbUse.Text = string.Format("{0}+{1}", sumcrD, sumcrT); //사용량 - //sbJan.Text = string.Format("{0}+{1}", janD, janT); //잔량 - //if (janD < 0) sbJan.ForeColor = Color.Red; - //else sbJan.ForeColor = Color.Blue; - - //색상변경 - // this.dv1.AutoResizeColumns(); } private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { this.Validate(); - this.bs.EndEdit(); + // this.bs.EndEdit(); var dlg = FCOMMON.Util.MsgQ("변경된 내용을 저장하시겠습니까?"); if (dlg != System.Windows.Forms.DialogResult.Yes) return; try @@ -128,39 +135,18 @@ namespace FBS0000 } } - private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + class userinfo { - var f = new fHolyday_Add(); - f.TopMost = true; - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + public string seq { get; set; } + public string empno { get; set; } + public string name { get; set; } + public string grade { get; set; } + public userinfo() { - RefreshData(); + } } - private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e) - { - // dv1.AutoResizeColumns(); - } - - private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) - { - - } - - private void dv1_DoubleClick(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.vHoliday_uselistRow; - var f = new fHolyday_Add(dr.idx); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - RefreshData(); - } - - } - private void toolStripButton1_Click(object sender, EventArgs e) { RefreshData(); @@ -180,61 +166,6 @@ namespace FBS0000 } } - private void sendToMailToolStripMenuItem_Click(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.HolydayRow; - - //string to = dr.tolist; - //string body = "test 2sfdnice to meet"; - //string bcc = string.Empty; - //string cc = string.Empty; - //string subject = "etst mail"; - - Outlook.Application outlookApplication = new Outlook.Application(); - Outlook.MailItem newTask = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem; - newTask.Subject = "mail test"; - newTask.To = "Chikyun.Kim@amkor.co.kr"; - newTask.HTMLBody = "this is test mail"; - newTask.BodyFormat = OlBodyFormat.olFormatHTML; - newTask.Display(); - - //FCOMMON.Util.RunDefaultMail(to, subject, body, cc, bcc); - } - - private void toolStripButton2_Click(object sender, EventArgs e) - { - this.Validate(); - this.bs.EndEdit(); - try - { - var cnt = this.ta.Update(this.dsMSSQL.Holyday); - this.dsMSSQL.Holyday.AcceptChanges(); - FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 저장됨"); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - } - } - - private void toolStripButton3_Click(object sender, EventArgs e) - { - var newdr = this.dsMSSQL.Holyday.NewHolydayRow(); - newdr.uid = FCOMMON.info.Login.no; - newdr.gcode = FCOMMON.info.Login.gcode; - newdr.sdate = DateTime.Now; - newdr.edate = DateTime.Now; - newdr.contents = string.Empty; - newdr.wuid = FCOMMON.info.Login.no; - newdr.wdate = DateTime.Now; - this.dsMSSQL.Holyday.AddHolydayRow(newdr); - } - - private void toolStripButton4_Click(object sender, EventArgs e) - { - - } + } } diff --git a/SubProject/FBS0000/Holiday/WorkTable.resx b/SubProject/FBS0000/Holiday/WorkTable.resx index a54eea1..f946638 100644 --- a/SubProject/FBS0000/Holiday/WorkTable.resx +++ b/SubProject/FBS0000/Holiday/WorkTable.resx @@ -161,35 +161,10 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - 17, 17 - - - 294, 17 - 188, 17 - 647, 17 - - - 647, 17 - - - - AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh - cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 - cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 - AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// - K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= - - - - 521, 17 - - - 585, 17 + 294, 17 \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index a07b9db..fd50869 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -30,15 +30,15 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -61,6 +61,7 @@ this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); this.sbJan = new System.Windows.Forms.ToolStripLabel(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.dsMSSQL = new FBS0000.dsMSSQL(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -71,22 +72,24 @@ this.tbSD = new System.Windows.Forms.ToolStripTextBox(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.tbED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); + this.cmbGrp = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm1.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.SuspendLayout(); // // bn @@ -222,6 +225,7 @@ this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(72, 24); this.bindingNavigatorDeleteItem.Text = "삭제(&D)"; + this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); // // toolStripButton2 // @@ -287,6 +291,16 @@ this.toolStripButton4.Text = "업무일지(휴가내역)"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(67, 24); + this.toolStripButton5.Text = "출근부"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // dsMSSQL // this.dsMSSQL.DataSetName = "dsMSSQL"; @@ -328,9 +342,12 @@ this.tbSD, this.toolStripLabel2, this.tbED, + this.toolStripLabel4, + this.cmbGrp, this.toolStripLabel3, this.cmbUser, - this.toolStripButton1}); + this.toolStripButton1, + this.toolStripButton6}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(984, 31); @@ -365,6 +382,17 @@ this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); // + // toolStripLabel4 + // + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel4.Text = "그룹"; + // + // cmbGrp + // + this.cmbGrp.Name = "cmbGrp"; + this.cmbGrp.Size = new System.Drawing.Size(200, 31); + // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; @@ -386,6 +414,16 @@ this.toolStripButton1.Text = "검색(&R)"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // toolStripButton6 + // + this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(59, 28); + this.toolStripButton6.Text = "닫기"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); + // // fpSpread1 // this.fpSpread1.AccessibleDescription = ""; @@ -397,15 +435,6 @@ this.fpSpread1.Size = new System.Drawing.Size(984, 500); this.fpSpread1.TabIndex = 4; // - // bs - // - this.bs.DataMember = "Holyday"; - this.bs.DataSource = this.dsMSSQL; - // - // ta - // - this.ta.ClearBeforeFill = true; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -426,61 +455,61 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "발생(일)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "발생(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - 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(2020, 9, 3, 10, 43, 44, 535); - this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType2; + 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(2020, 9, 7, 9, 10, 20, 482); + this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "일자"; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; 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; this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "uid"; 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).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "UserName"; 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)(224)))), ((int)(((byte)(192))))); - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType5; + numberCellType1.MaximumValue = 999999999999999D; + numberCellType1.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "term"; 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)(224)))), ((int)(((byte)(192))))); - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType6; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "CrTime"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(H)"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "contents"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "내용"; this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "termDr"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "DrTime"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "발생(H)"; @@ -489,15 +518,14 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton5 + // bs // - this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(67, 24); - this.toolStripButton5.Text = "출근부"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + // + // ta + // + this.ta.ClearBeforeFill = true; // // fHolyday // @@ -518,8 +546,8 @@ this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -567,5 +595,8 @@ private System.Windows.Forms.ToolStripButton toolStripButton4; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripLabel toolStripLabel4; + private System.Windows.Forms.ToolStripComboBox cmbGrp; + private System.Windows.Forms.ToolStripButton toolStripButton6; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 502b941..d154595 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -33,45 +33,54 @@ namespace FBS0000 private void __Load(object sender, EventArgs e) { - tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; - tbED.Text = DateTime.Now.AddDays(10).ToShortDateString(); + tbSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01"; + tbED.Text = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM") + "-01").AddDays(-1).ToShortDateString(); - //var userlist = FCOMMON.DBM.getUserTable(); - //dvc_user.DataSource = userlist; - //dvc_user.ValueMember = "Key"; - //dvc_user.DisplayMember = "Value"; + //현재 사용자의 그룹명을 가져옴 + var taQuery = new dsMSSQLTableAdapters.QueriesTableAdapter(); + var GrpName = taQuery.GetGrpName(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no); - //var cateList = FCOMMON.DBM.getCodeTable("02"); - //this.dvc_cate.DataSource = cateList; - //dvc_cate.ValueMember = "Key"; - //dvc_cate.DisplayMember = "Value"; - //var rrltList = FCOMMON.DBM.getCodeTable("03"); - //this.dvc_result.DataSource = rrltList; - //dvc_result.ValueMember = "Key"; - //dvc_result.DisplayMember = "Value"; - - //udpate user list - var userList = FCOMMON.DBM.getUserList(); - this.cmbUser.Items.Clear(); - this.cmbUser.Items.Add("-- ALL --"); - int curuserindex = -1; - foreach (var user in userList) + //그룹목록 + var taGrp = new dsMSSQLTableAdapters.WorkTableGrpTableAdapter(); + var dtGrp = taGrp.GetData(FCOMMON.info.Login.gcode); + this.cmbGrp.Items.Clear(); + foreach (var item in dtGrp) { - this.cmbUser.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value)); - if (user.Key == FCOMMON.info.Login.no) curuserindex = cmbUser.Items.Count - 1; + cmbGrp.Items.Add(string.Format("{0}", item.grp)); + } + if (string.IsNullOrEmpty(GrpName) == false) cmbGrp.Text = GrpName; + else if (cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0; + + //해당그룹내의 사용자 목록을 가져와야한다 + if (cmbGrp.SelectedIndex >= 0) + { + var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); + var dtUser = taUser.GetData(FCOMMON.info.Login.gcode, cmbGrp.Text); + this.cmbUser.Items.Clear(); + this.cmbUser.Items.Add("-- ALL --"); + foreach (var user in dtUser) + { + this.cmbUser.Items.Add(string.Format("[{0}] {1}", user.empno, user.name)); + } + } + else + { + //그룹이 선택되지 않아서 사용자 목록을 가져오지않는다. } - this.cmbUser.SelectedIndex = curuserindex; //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); if (curLevel >= 5) { //권한이 잇으므로 모든 사용자로 한다. + cmbUser.SelectedIndex = 0; } else { + this.cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. + this.cmbGrp.Enabled = false; } RefreshData(); @@ -100,11 +109,26 @@ namespace FBS0000 void RefreshData() { + if (this.dsMSSQL.Holyday.GetChanges() != null) + { + var dlg = FCOMMON.Util.MsgQ("변경된 내용이 있습니다. 새로고침하면 해당 자료가 손실됩니다\n진행하시겠습니까?"); + if (dlg != DialogResult.Yes) return; + } + //update data string uid = GetUIDValue(); var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); var ed = DateTime.Parse(tbED.Text + " 23:59:59"); - this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid, FCOMMON.info.Login.gcode); + + try + { + this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid, FCOMMON.info.Login.gcode); + this.dsMSSQL.Holyday.AcceptChanges(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } //잔량계산 @@ -128,7 +152,7 @@ namespace FBS0000 //색상변경 - // this.dv1.AutoResizeColumns(); + // this.dv1.AutoResizeColumns(); } private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { @@ -158,7 +182,7 @@ namespace FBS0000 private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e) { - // dv1.AutoResizeColumns(); + // dv1.AutoResizeColumns(); } private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) @@ -252,20 +276,30 @@ namespace FBS0000 private void toolStripButton4_Click(object sender, EventArgs e) { - if(this.cmbUser.SelectedIndex < 0) + if (this.cmbUser.SelectedIndex < 0) { FCOMMON.Util.MsgE("담당자가 선택되어야 합니다."); return; } string uid = GetUIDValue(); - var f = new fHolydayJobReport(tbSD.Text,tbED.Text,uid); + var f = new fHolydayJobReport(tbSD.Text, tbED.Text, uid); f.ShowDialog(); } private void toolStripButton5_Click(object sender, EventArgs e) { - var f = new WorkTable(tbSD.Text, tbED.Text); + var f = new WorkTable(tbSD.Text, tbED.Text, this.cmbGrp.Text); f.ShowDialog(); } + + private void toolStripButton6_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + this.bs.RemoveCurrent(); + } } } diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index b97f168..da8c4e5 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -211,35 +211,35 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi - Dwoi+hCn0lXUZFlGI7uI6iKQqJxDzCVZmjKnbi6m29oHTk+4TWzpcW5Nl86lsJ3Tjvvg6T1neWxsF77w - 4/Ae+D/v7zznnB38oiiq3PpChtHGChirD4LcOr5N9vPDh10uF+Ny2kA5LTDcKEM6nd4WQohSqdyp1Wpv - jjyth11VD8P1MiQSiRxYlgXDMCKxWAypVCobkGtghv6qNC9gM2STeDyOZDKZa6B/Ug9bax30V6TgOE7g - QVcQjZog7hEUnQEoOgJoIPAWYoBo4MgaDF2WYmNjQ4Af1pgj6CS8G4ugYzSCO+0LQgBvlWMw1FyHr69r - MXipVEjn+f9UORm8q6Zxu40WOiAhmYIGAxdKhYL4AI5LwOIJotcxi46xID7YljBMhbD+ewVra2sMCTi6 - ZaCshfWVDAPnS/4Nc+g0zWGQWsHcLxYLUQ7j8zEYplYx4vIjGo0W6MBhhvZssRDAd/DJEcbMYhyuwB84 - /CzsBG+YQ7c1ALfbDYlEckI00D2UwdJSg/7KYrHEdlMAdISDY56BjWZg8sVB/eTw3rKI5eXlfINJYtBX - cUAssZs888wSC8tsdphnMsRBNfwj/0vU3a/B2Mtq9J3ZCjC7wxinY/hGhpyBBCbI6Tp3HK2aAYQofWGD - 3tNFyGQywptYXWfh/B5BD+nioz0MtXEBbzTD8BrUmFDVQVG1r0kwkMvlRV2Vh9B/7Rh6ThWBpmn4fD5M - T0/D4/EIhXm9XuFq+fwW42234B9pga65PEEssqu6ZNfJR0f2PK6R7paRbaFfV6Sham/Tl2cXOePzc/gL - qwzIzob0lx0AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ7SURBVDhPjZNtSBNxHMd7Ib2uV72KWursRQQRRe+CglCU + 6IGCiB7EqfQqarIso5FBQb0IJCofkOWSLE2bT5uGbrN5hw8XbRNbeuqWuuZcyra77nQb3/53y7OxvfAP + H47/we/7/9z37rZJi2GY/KFnGgxWFqC/eD/IraNbZK80fJCmaW6UdoCh7bBcy0M8Ht8Scoher99uMpmu + 9z0px3BdOSxX8yAIQgo8z4PjOIVIJIJYLJYMSDWwwXxZnRawEbJBNBrF+vp6qoH5UTkctWUwX1JDFEWZ + e80+VBp9uEPQNXmhM3hRQZAslADFgEoa9FxUY21tTUYaNtqCaCK8sQZhGAziVuOcHCBZpRj0VJfhy8tS + dF/IldMl/j9VSwZvN7C4Wc/KHYTD4URGg85zuXJBUoAoCrC7fGijpmCw+vDOsYheZh6rv5ewsrLCkYDD + mwb6Ugy90KDzbM6/YRFNA9PoZpYw/YvHXEjEyEwElm/L6BudRSgUytABZYPpdLYcIHXwgfJjciGKUe8f + ULM8hgluv4iWIS+cTieysrKOKQZd9zWw15SgozBbKbFxwAs2KIKa4eBgOQx4omB+inhrX0AgEEg3GCcG + 7QX7lBJbyDNPLvKwTyWHJcbnRdT1/kj/ErvulsD6vBjtpzYDbE4/RtgIvpIh2itgjJze5Yyi1tiJecac + 2aDtpAqJREJ+E8urPOjvQbSSLt4P+9HQP4dXxl64LQ0YqyuDrmhPlWyg1WpVzYUH0HHlCFpPqMCyLDwe + DyYmJuByueTC3G63fLV/fI2R+huY7avBp+p8gVgkV3HOjuMPDu16WKLeqSHbTL+uQkXR7qrPj8+L/U/P + 4C8G28iAvxi6KAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi - Dwoi+pBNR1dRk2UZjeyiqItAolKHrC3J0pRt6qahbrYPpp5wm9jS49xSl86lsJ3Tzr54es9ZHhvuwhd+ - HM6B//P+3uecs4NfFEWVj76QY7i+AoPVB0EeHd8m+/nhw263mxlz2UG5bLDcKEMmk9kWQohard5pMBhu - DjxVwNGigOV6GRKJRB4sy4JhGJFYLIZ0Op0LyDewwnxVuiVgI2SDeDyOVCqVb2B+ooC9uRbmK1JwHCfw - oD2Een0I9wgqXRAqbRB1BN5CDBANnDmDvstSJJNJAX5Yb41AR3g3EoF2OII7bfNCAG+VZ9DXWIuvr2vQ - e6lUSOf5f1clGbyroXG7lRY6IMfIFjQwXigVCuIDOC4BmzeELucMtCMhfLAvoZ9awPrvFaytrTEk4Oim - gboGo6/kMJ4v+TfMQTc0i15qBbO/WMxHObjnYrBMrmJgLIBoNFqgA6cVhrPFQgDfwSdnGNOLcYwF/8AZ - YOEg+MIcOkaD8Hg8kEgkJ0QD00M5bE0y9FQWiyW2DQVBRzg45xjYaQZD/jionxze2xaxvLy81WCCGHRX - HBBL7CBnnl5iYZvJDfNMLHBo6f+x9Us03Zdh5GU1us9sBlg9YbjpGL6RIVcwgXGyu8kTR7PeiAXKXNig - 63QRstms8CZW11m4vkfQSbr46AhDMziPN/p++CwajLfUQlW1r0EwUCqVRe2Vh9Bz7Rg6TxWBpmn4/X5M - TU3B6/UKhfl8PuFq+/wW7tZbCAw0wdhYniAWuVVdsuvkoyN7Hsuku+XkttCvK1JXtbfhy7OL3ODzc/gL - dFHItBTWKaIAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ7SURBVDhPjZNbSFNxHMd7GD3XU09RS509RBBR9BYUhKJE + Fwoiusim0lPUxCyjkRFBPQQSlRdkbUmWpszbpqFuNs/wcsJdsKXHXVLXnGvKdk47cxvf/ucsjw334B8+ + HP4Hft//53zPOTuERdN00egLFYZrijFYdhDk1vFtsl8YPkxRFDths4K2WWC6UYhUKrUtxBCNRrPTYDDc + HHhWibHGSpiuFyIej2fBcRxYlpWIRqNIJpOZgGwDM4xXFVsCNkI2iMViWF9fzzYwPqmEtaECxisK8Dwv + 8qDVjxq9H/cI1TofqrU+VBEECylAMqAyBn2XFUgkEiLCsN4cgo7wbiQE7XAId1q8YoBglWXQV1eBr6/L + 0XupQEwX+P9UNRm828zgdhMjdrC2tpbOadB9oUAsSAjg+TgsDj86qFloR/z4YF1CP72A1d/LiEQiLAk4 + ummgKcfoKxW6z+f/G+ahG5pDL72MuV8cvGEe4/NRmKZXMDDhQTgcztEBZYbhbJ4YIHTwiQpgZjGGCd8f + UB4OYwRngEfbqA92ux0ymeyEZNDzUAVLvRJdJXlSiS1DPjAhHtQ8CyvDYsgdA/2Tx3vLIoLB4FaDKWLQ + WXxAKrGNPPPMEgfLbGZYYGqBR2P/j61fYs99JUZelqHzzGaA2R7AOBPFNzJk88UxSU7vscfQoO/GAm3M + bdBxWo50Oi2+iZVVDrbvIbSTLj6OBdA86MUbfT+cpmZMNlagunRfrWigVqvlrSWH0HXtGNpPycEwDNxu + N1wuFxwOh1iY0+kUr5bPbzHedAuegXp01RXFiUVmleXvOvnoyJ7HSsVuFdnm+nUlqkr31n55epEffH4O + fwHQEchmrws3yAAAAABJRU5ErkJggg== @@ -251,26 +251,38 @@ 188, 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== + + 647, 17 - - 521, 17 - - - 585, 17 - - - 647, 17 - - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////AQgAAP////8AAQgAAAs= + AAD///////////////8A/////ws= + + 521, 17 + + + 585, 17 + \ No newline at end of file diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index 1910fbc..5bc045b 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/SubProject/FBS0000/dsMSSQL.Designer.cs @@ -2493,6 +2493,8 @@ namespace FBS0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columnindate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public EETGW_WorkTableUserDataTable() { @@ -2598,6 +2600,14 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn indateColumn { + get { + return this.columnindate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2635,7 +2645,7 @@ namespace FBS0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public EETGW_WorkTableUserRow AddEETGW_WorkTableUserRow(string gcode, string grp, int seq, string grade, string empno, string name, string wuid, System.DateTime wdate) { + public EETGW_WorkTableUserRow AddEETGW_WorkTableUserRow(string gcode, string grp, int seq, string grade, string empno, string name, string wuid, System.DateTime wdate, string indate) { EETGW_WorkTableUserRow rowEETGW_WorkTableUserRow = ((EETGW_WorkTableUserRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2646,7 +2656,8 @@ namespace FBS0000 { empno, name, wuid, - wdate}; + wdate, + indate}; rowEETGW_WorkTableUserRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_WorkTableUserRow); return rowEETGW_WorkTableUserRow; @@ -2685,6 +2696,7 @@ namespace FBS0000 { this.columnname = base.Columns["name"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columnindate = base.Columns["indate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2708,6 +2720,8 @@ namespace FBS0000 { base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columnindate = new global::System.Data.DataColumn("indate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnindate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2725,6 +2739,7 @@ namespace FBS0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columnindate.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4265,6 +4280,22 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string indate { + get { + if (this.IsindateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_WorkTableUser.indateColumn])); + } + } + set { + this[this.tableEETGW_WorkTableUser.indateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsgrpNull() { @@ -4324,6 +4355,18 @@ namespace FBS0000 { public void SetnameNull() { this[this.tableEETGW_WorkTableUser.nameColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsindateNull() { + return this.IsNull(this.tableEETGW_WorkTableUser.indateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetindateNull() { + this[this.tableEETGW_WorkTableUser.indateColumn] = global::System.Convert.DBNull; + } } /// @@ -6090,7 +6133,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; 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 @@ -6104,12 +6147,25 @@ ORDER BY sdate, edate, uid"; 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, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason" + + this._commandCollection[1].CommandText = @"SELECT Holyday.idx, Holyday.cate, Holyday.result, Holyday.sdate, Holyday.edate, Holyday.term, Holyday.title, Holyday.contents, Holyday.uid, Holyday.tolist, Holyday.mail, Holyday.mailsend, + Holyday.reason, Holyday.wuid, Holyday.wdate, Holyday.termDr, Holyday.gcode, Holyday.DrTime, Holyday.CrTime, dbo.getUserName(Holyday.uid) AS UserName +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.edate <= @ed) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp) +ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + 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, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + 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("@grp", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "grp", 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 CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason" + ", result, sdate, term, termDr, title, tolist, uid, wdate, wuid, dbo.getUserName(" + "uid) AS UserName\r\nFROM Holyday\r\nWHERE (gcode = @gcode) AND (idx = @idx)"; - 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + 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, "", "", "")); + this._commandCollection[2].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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6188,8 +6244,80 @@ ORDER BY sdate, edate, uid"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillByIdx(dsMSSQL.HolydayDataTable dataTable, string gcode, int idx) { + public virtual int FillByGrp(dsMSSQL.HolydayDataTable dataTable, string sd, string ed, string gcode, string grp) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed)); + } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode)); + } + if ((grp == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(grp)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.HolydayDataTable GetByGrp(string sd, string ed, string gcode, string grp) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(ed)); + } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(gcode)); + } + if ((grp == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(grp)); + } + dsMSSQL.HolydayDataTable dataTable = new dsMSSQL.HolydayDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillByIdx(dsMSSQL.HolydayDataTable dataTable, string gcode, int idx) { + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -6209,7 +6337,7 @@ ORDER BY sdate, edate, uid"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.HolydayDataTable GetbyIdx(string gcode, int idx) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -7438,10 +7566,11 @@ ORDER BY sdate, edate, uid"; tableMapping.ColumnMappings.Add("name", "name"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("indate", "indate"); 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 [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)))"; 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -7457,10 +7586,12 @@ ORDER BY sdate, edate, uid"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_indate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", 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 [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate); -SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate], [indate]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate, @indate); +SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7470,10 +7601,11 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate, [indate] = @indate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate))); +SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7483,6 +7615,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -7497,6 +7630,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_indate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_indate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "indate", 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, "", "", "")); } @@ -7510,14 +7645,21 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate\r\nFROM EETGW_Wor" + - "kTableUser\r\nWHERE (gcode = @gcode) AND (grp = @grp)\r\nORDER BY seq"; + this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate\r\nFROM E" + + "ETGW_WorkTableUser\r\nWHERE (gcode = @gcode) AND (grp = @grp)\r\nORDER BY seq"; 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, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "grp", 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 empno, gcode, grade, grp, idx, indate, name, seq, wdate, wuid FROM EETGW_W" + + "orkTableUser WHERE (gcode = @gcode) AND (empno = @empno)"; + 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("@empno", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "empno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7568,6 +7710,54 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] + public virtual int FillbyEmpNo(dsMSSQL.EETGW_WorkTableUserDataTable dataTable, string gcode, string empno) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((empno == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(empno)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual dsMSSQL.EETGW_WorkTableUserDataTable GetbyEmpNo(string gcode, string empno) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((empno == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(empno)); + } + dsMSSQL.EETGW_WorkTableUserDataTable dataTable = new dsMSSQL.EETGW_WorkTableUserDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -7598,6 +7788,84 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class QueriesTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.IDbCommand[] _commandCollection; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected global::System.Data.IDbCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.IDbCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FBS0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "SELECT ISNULL(grp, \'\') AS grp\r\nFROM EETGW_WorkTableUser\r\nWHERE (gcode = @gc" + + "ode) AND (empno = @empno)"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandType = global::System.Data.CommandType.Text; + ((global::System.Data.SqlClient.SqlCommand)(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, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@empno", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "empno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual string GetGrpName(string gcode, string empno) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[0])); + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + command.Parameters[0].Value = ((string)(gcode)); + } + if ((empno == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(empno)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return null; + } + else { + return ((string)(returnValue)); + } + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index c2982f4..77cde36 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -2,7 +2,7 @@ - + @@ -385,6 +385,24 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail + + + + SELECT Holyday.idx, Holyday.cate, Holyday.result, Holyday.sdate, Holyday.edate, Holyday.term, Holyday.title, Holyday.contents, Holyday.uid, Holyday.tolist, Holyday.mail, Holyday.mailsend, + Holyday.reason, Holyday.wuid, Holyday.wdate, Holyday.termDr, Holyday.gcode, Holyday.DrTime, Holyday.CrTime, dbo.getUserName(Holyday.uid) AS UserName +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.edate <= @ed) AND (Holyday.gcode = @gcode) AND (EETGW_WorkTableUser.grp = @grp) +ORDER BY Holyday.sdate, Holyday.edate, Holyday.uid + + + + + + + + + @@ -471,7 +489,7 @@ ORDER BY grp - DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [EETGW_WorkTableUser] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate))) @@ -487,13 +505,15 @@ ORDER BY grp + + - INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate); -SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq + INSERT INTO [EETGW_WorkTableUser] ([gcode], [grp], [seq], [grade], [empno], [name], [wuid], [wdate], [indate]) VALUES (@gcode, @grp, @seq, @grade, @empno, @name, @wuid, @wdate, @indate); +SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq @@ -503,12 +523,13 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl + - SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate + SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (gcode = @gcode) AND (grp = @grp) ORDER BY seq @@ -520,8 +541,8 @@ ORDER BY seq - UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq + UPDATE [EETGW_WorkTableUser] SET [gcode] = @gcode, [grp] = @grp, [seq] = @seq, [grade] = @grade, [empno] = @empno, [name] = @name, [wuid] = @wuid, [wdate] = @wdate, [indate] = @indate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_empno = 1 AND [empno] IS NULL) OR ([empno] = @Original_empno)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate))); +SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate FROM EETGW_WorkTableUser WHERE (idx = @idx) ORDER BY seq @@ -531,6 +552,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl + @@ -545,6 +567,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl + + @@ -561,18 +585,45 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl + - + + + + + SELECT empno, gcode, grade, grp, idx, indate, name, seq, wdate, wuid FROM EETGW_WorkTableUser WHERE (gcode = @gcode) AND (empno = @empno) + + + + + + + + - + + + + + SELECT ISNULL(grp, '') AS grp +FROM EETGW_WorkTableUser +WHERE (gcode = @gcode) AND (empno = @empno) + + + + + + + + - + @@ -632,7 +683,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl - + @@ -684,7 +735,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl - + @@ -770,7 +821,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl - + @@ -815,7 +866,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl - + @@ -828,40 +879,40 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl - + - + - + - - + + - + - + @@ -876,6 +927,13 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate FROM EETGW_WorkTabl + + + + + + + diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss index 789f5d6..ccc774b 100644 --- a/SubProject/FBS0000/dsMSSQL.xss +++ b/SubProject/FBS0000/dsMSSQL.xss @@ -4,14 +4,15 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - + + + + + + + \ No newline at end of file