From 4d989d5e4d28aeb5ae17f51330c45bec4320a220 Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 11 Jan 2022 22:55:09 +0900 Subject: [PATCH] .... --- .../FBS0000/Holiday/fHolyday.Designer.cs | 191 ++++++++++-------- SubProject/FBS0000/Holiday/fHolyday.cs | 69 ++++++- SubProject/FBS0000/Holiday/fHolyday.resx | 50 ++--- SubProject/FBS0000/Holiday/fHolyday_Add.cs | 7 +- SubProject/FCM0000/Mail/fMailList.cs | 2 +- SubProject/FCOMMON/DataBaseManager.cs | 2 +- SubProject/FPJ0000/OtConfirm/fOTConfirm.cs | 22 +- 7 files changed, 221 insertions(+), 122 deletions(-) diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index ed0aa7e..0984899 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -30,19 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = 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(); @@ -54,6 +56,7 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btAdd = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btDel = new System.Windows.Forms.ToolStripButton(); this.btSave = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -86,19 +89,20 @@ this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); this.cmO.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -131,14 +135,14 @@ this.sbJan, this.toolStripButton4, this.toolStripButton5}); - this.bn.Location = new System.Drawing.Point(0, 582); + this.bn.Location = new System.Drawing.Point(0, 822); 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(1162, 27); + this.bn.Size = new System.Drawing.Size(1465, 27); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -220,6 +224,15 @@ this.btAdd.Text = "추가(&A)"; this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // + // toolStripButton2 + // + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(69, 24); + this.toolStripButton2.Text = "편집(&E)"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // // btDel // this.btDel.Enabled = false; @@ -326,7 +339,7 @@ this.toolStripButton6}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1162, 31); + this.toolStrip1.Size = new System.Drawing.Size(1465, 31); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -419,14 +432,14 @@ this.fpSpread1.RangeDragFillMode = FarPoint.Win.Spread.DragFillMode.Series; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1162, 551); + this.fpSpread1.Size = new System.Drawing.Size(1465, 770); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick); this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown); this.fpSpread1.SetViewportLeftColumn(0, 0, 1); - this.fpSpread1.SetActiveViewport(0, -1, -1); + this.fpSpread1.SetActiveViewport(0, 0, -1); // // cmO // @@ -434,9 +447,10 @@ this.cmO.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem2, this.toolStripSeparator2, + this.복사ToolStripMenuItem, this.현재사원원장보기ToolStripMenuItem}); this.cmO.Name = "cm1"; - this.cmO.Size = new System.Drawing.Size(307, 82); + this.cmO.Size = new System.Drawing.Size(307, 140); // // toolStripMenuItem2 // @@ -493,6 +507,36 @@ this.현재사원원장보기ToolStripMenuItem.Text = "현재 사원 원장 보기"; this.현재사원원장보기ToolStripMenuItem.Click += new System.EventHandler(this.현재사원원장보기ToolStripMenuItem_Click); // + // bs + // + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // taUser + // + this.taUser.ClearBeforeFill = true; + // + // textBox1 + // + this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.textBox1.Location = new System.Drawing.Point(0, 801); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(1465, 21); + this.textBox1.TabIndex = 5; + this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); + // + // 복사ToolStripMenuItem + // + this.복사ToolStripMenuItem.Enabled = false; + this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem"; + this.복사ToolStripMenuItem.Size = new System.Drawing.Size(306, 36); + this.복사ToolStripMenuItem.Text = "복사"; + this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click); + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -519,27 +563,27 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - dateTimeCellType3.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType3.TimeDefault = new System.DateTime(2021, 12, 29, 23, 55, 36, 293); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType3; + 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(2022, 1, 11, 22, 43, 24, 346); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자"; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; 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)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번"; @@ -547,90 +591,98 @@ this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType16.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType16; + textCellType10.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명"; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType13.MaximumValue = 999999999999999D; - numberCellType13.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType13; + numberCellType9.MaximumValue = 999999999999999D; + numberCellType9.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(일)"; this.fpSpread1_Sheet1.Columns.Get(5).Tag = "dr"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType14; + numberCellType10.MaximumValue = 999999999999999D; + numberCellType10.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType15.MaximumValue = 999999999999999D; - numberCellType15.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType15; + numberCellType11.MaximumValue = 999999999999999D; + numberCellType11.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - numberCellType16.MaximumValue = 999999999999999D; - numberCellType16.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType16; + numberCellType12.MaximumValue = 999999999999999D; + numberCellType12.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType17.DecimalPlaces = 1; - numberCellType17.MaximumValue = 999999999999999D; - numberCellType17.MinimumValue = -999999999999999D; - numberCellType17.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType17; + numberCellType13.DecimalPlaces = 1; + numberCellType13.MaximumValue = 999999999999999D; + numberCellType13.MinimumValue = -999999999999999D; + numberCellType13.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType13; this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType17; + numberCellType14.DecimalPlaces = 2; + numberCellType14.MaximumValue = 999999999999999D; + numberCellType14.MinimumValue = -999999999999999D; + numberCellType14.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - numberCellType18.DecimalPlaces = 1; - numberCellType18.MaximumValue = 999999999999999D; - numberCellType18.MinimumValue = -999999999999999D; - numberCellType18.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType18; + numberCellType15.DecimalPlaces = 1; + numberCellType15.MaximumValue = 999999999999999D; + numberCellType15.MinimumValue = -999999999999999D; + numberCellType15.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType18; + numberCellType16.DecimalPlaces = 2; + numberCellType16.MaximumValue = 999999999999999D; + numberCellType16.MinimumValue = -999999999999999D; + numberCellType16.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)"; @@ -645,34 +697,13 @@ this.fpSpread1_Sheet1.ShowRowSelector = true; 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; - // - // taUser - // - this.taUser.ClearBeforeFill = true; - // - // toolStripButton2 - // - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(69, 24); - this.toolStripButton2.Text = "편집(&E)"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); - // // fHolyday // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1162, 609); + this.ClientSize = new System.Drawing.Size(1465, 849); this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.textBox1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fHolyday"; @@ -687,8 +718,8 @@ this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); this.cmO.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -742,7 +773,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem 현재사원원장보기ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel lbStt; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 44f759a..4da74c4 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -88,6 +88,7 @@ namespace FBS0000 btSave.Enabled = true; btDel.Enabled = true; btAdd.Enabled = true; + 복사ToolStripMenuItem.Enabled = true; } else { @@ -134,8 +135,8 @@ namespace FBS0000 seluid = GetUIDValue(); var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); var ed = DateTime.Parse(tbED.Text + " 23:59:59"); - sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00")); - this.tbSD.Text = sd.ToShortDateString(); + //sd = DateTime.Parse(ed.ToString("yyyy-01-01 00:00:00")); + //this.tbSD.Text = sd.ToShortDateString(); try { @@ -219,6 +220,10 @@ namespace FBS0000 sbUse.ForeColor = Color.Blue; sbGen.ForeColor = Color.Black; sbJan.ForeColor = Color.DarkMagenta; + + this.bs.Filter = string.Empty; + textBox1.BackColor = SystemColors.Control; + textBox1.Text = string.Empty; } private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { @@ -253,15 +258,15 @@ namespace FBS0000 if (f.ShowDialog() == DialogResult.OK) { newdr.EndEdit(); - this.dsMSSQL.Holyday.AddHolydayRow(newdr); + this.dsMSSQL.Holyday.AddHolydayRow(newdr); } else newdr.Delete(); - + //var rowindex = this.bs.Count - 1; - + ////잔액및 성명찾기 ////모든데이터의 성명을 표시해준다 @@ -561,5 +566,59 @@ namespace FBS0000 } else dr.RejectChanges(); } + void SearchText() + { + var txt = textBox1.Text.Trim(); + if (string.IsNullOrEmpty(txt)) + { + bs.Filter = string.Empty; + textBox1.BackColor = SystemColors.Control; + } + else + { + this.bs.Filter = "cate like '%" + txt + "%' or contents like '%" + txt + "%'"; + textBox1.BackColor = Color.Lime; + } + textBox1.Focus(); + textBox1.SelectAll(); + + } + private void textBox1_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + SearchText(); + } + } + + private void 복사ToolStripMenuItem_Click(object sender, EventArgs e) + { + + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsMSSQL.HolydayRow; + + var newdr = this.dsMSSQL.Holyday.NewHolydayRow(); + if (this.cmbUser.SelectedIndex == 0) newdr.uid = FCOMMON.info.Login.no; + else newdr.uid = seluid; + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.sdate = DateTime.Now; + newdr.edate = DateTime.Now; + newdr.cate = dr.cate; + newdr.contents = dr.contents;// string.Empty; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.UserName = FCOMMON.info.Login.nameK; + + var f = new fHolyday_Add(newdr); + if (f.ShowDialog() == DialogResult.OK) + { + newdr.EndEdit(); + this.dsMSSQL.Holyday.AddHolydayRow(newdr); + } + else newdr.Delete(); + + + } } } diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index f4b4fad..55f728a 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -214,35 +214,35 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR - hYKILuLc6ClqYpbRyB6CeggkKucQ25IsTZmXXQzdpV3wcqJtYkuPbid1zbkmbOe0M9349j9neWy4B//w - 4fA/8Pv+P+d7ztkhLIqiKhzP5RhtrMRwzUGQW8e3yX5h+LDL5WLHPU5QHjvMN8qRyWS2hRiiVqt3GgyG - m5anSrg0SpivlyOVSuXBcRxYlpVIJBJYX1/PBeQb2GC6KtsSsBGyQTKZxNraWr6B6YkSzlYFTFdk4Hle - 5EEng0Y9g3uEBl0IDR0h1BMECylAMnDnDIYuy5BOp0WEYb0tCh3hrTWKjtEo7rQHxQDBKs9gqFmBL6/q - MHipTEwX+P9UFRm8q6Vxu40WO2AYJlvQoP9CmViQEMDzKdh9DHrcM+iwMnjvXIKRWsDq72XE43GWBBzd - NFDXwfFSjv7zpf+GeehGZjFILWP2F4dgjMfYXALmbyuwjM8jFosV6MBtg+FsiRggdPDRHcb0YhLjoT9w - z3NwEfxhHl2OELxeL4qKik5IBgMP5bC31KKvqkQqsX0kBDrKwz3HwkmzGAkkQf3k8c6+iEgkstVgkhj0 - Vh6QSuwizzy9xME+kxsWmFzgoTH+2PolDtyvhfVFDXrPbAbYvGGM0Ql8JUOeUAoT5PQBbxKt+n4sUKbC - Bj2ni5HNZsU3sbLKwfM9im7SxQdXGNrhIF7rjfCbtZjQKNBQva9JNFCpVMWdVYfQd+0Yuk8Vg6ZpBAIB - TE1NwefziYX5/X7xav/0BmNttzBvaUFfc0WKWORWTemuk4+O7HlcK9stJ9tCv65EffXeps/qi/zws3P4 - CzhYyB5xw8wTAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi + CwURXcam0lPUxCyjkT0E9RBIVM4htiVZmjJvm8bcZrvg5US7YEuPu6SuOdeE7Zx2tjm+/c9ZHhvuwT98 + OPwP/L7/z/mec3bwi6KoyonnCow3VWFMdhDk1vFtsp8fPmy325kppw2U0wrjjQqsr69vCyFEpVLt1Ov1 + N0ef1sOurofxegVSqVQBLMuCYRiRRCKBbDabDyg0sMBwVbolYCNkg2QyiUwmU2hgeFIPW1sdDFek4DhO + 4EFXCE26EO4RGrVBNHYG0UDgLcQA0cCRNxi+LEU6nRbgh3WWKLSEt+YoOsejuNMREAJ4qwKD4ZY6fHlV + i6FL5UI6z/+nKsngXQ2N2+200EEgEMgVNRi4UC4UxAdwXApWdwi9jjl0mkN4b1vGCLWItd8riMfjDAk4 + ummgqsXESwUGzpf9G+agNc1jiFrB/C8WgRiHyYUEjN9WMTrlRywWK9KBwwL92VIhgO/goyOM2aUkpoJ/ + 4PCzsBM8YQ7dE0G4XC6UlJScEA0GHypgbZWjv7pULLHDFAQd5eBYYGCjGZh8SVA/ObyzLiESiWw1mCEG + fVUHxBK7yTPPLrOwzuWHeWYWOahHfmz9Egfvy2F+IUPfmc0AiyuMSTqBr2TIGUxhmpw+6EqiTTeARcpQ + 3KD3tAS5XE54E6trLJzfo+ghXXywh6EZC+C1bgQeowbT6jo01uxrFgyUSqWkq/oQ+q8dQ88pCWiahs/n + g9frhdvtFgrzeDzC1frpDSbbb8E/2or+lsoUscgvWdmuk4+O7Hksl+5WkG2xX1ekoWZv82fVRW7s2Tn8 + BSp4yBiRDhTwAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNbSFNxHMd7GD3XU09Rps4eIogoegsKQlGi - CwURXcSp9BQ1MctoZA9BPQQSlVNkbUmWpszbpqFutgteTrQLtvQ4z1KXzjVh55zOcRe+/c9ZHhvuwT98 - OPwP/L7/z/mec3ZIi6Ko4rHnGozUlWCo/CDIrePbZL80fNjpdHITbgcotx3WG0VIpVLbQg7R6XQ7zWbz - zcGn1XDqq2G9XgRBELLgeR4cxynE43Ekk8lMQLaBDZar6i0BGyEbsCyLRCKRbWB5Ug1HUxUsV9QQRVHm - QVsIdaYQ7hFqjQxqDQxqCJKFEqAYuDIG/ZfVWF9fl5GGTbYIjIS3oxEYRiK40zovB0hWWQb9DVX48qoS - fZcK5XSJ/0/VksG7LTRuN9NyBwzDpHMa9FwolAuSAkRRgN0bQqdrBobREN47ljBALWDt9wpisRhHAo5u - GugqMfZSg57zBf+GRRiHZ9FHrWD2F4/5qIjxuTis31YxOBFENBrN0YHLBvPZfDlA6uCjK4zpRRYTzB+4 - gjycBF9YRPsYA4/HA5VKdUIx6H2ogb2xAt2l+UqJrcMM6IgI1xwHB81hOMCC+ininX0Ry8vLWw2miEFX - yQGlxHbyzNNLPOwzmWGJqQUR+oEfW7/E3vsVGH1Rjq4zmwE2TxjjdBxfyZCbETBJTu/1sGgy9WCBsuQ2 - 6Dydh3Q6Lb+J1TUe7u8RdJAuPjjDaBmax2vTAHzWFkzqq1Bbtq9eNtBqtXltpYfQfe0YOk7lgaZpBAIB - +P1+eL1euTCfzydf7Z/eYLz5FoKDjehuKBaIRWaVF+w6+ejInscV6t0ass316yrUlO2t/6y7KA49O4e/ - MWjIG/RgRIMAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi + CwURXcam0lPUxCyjkT0E9RBIVM4htiVZmjJvm8bcZrvg5US7YEuPu6SuOdeE7Zx2tjm+/c9ZHhvuwT98 + OPwP/L7/z/mec3bwi6KoyonnCow3VWFMdhDk1vFtsp8fPmy325kppw2U0wrjjQqsr69vCyFEpVLt1Ov1 + N0ef1sOurofxegVSqVQBLMuCYRiRRCKBbDabDyg0sMBwVbolYCNkg2QyiUwmU2hgeFIPW1sdDFek4DhO + 4EFXCE26EO4RGrVBNHYG0UDgLcQA0cCRNxi+LEU6nRbgh3WWKLSEt+YoOsejuNMREAJ4qwKD4ZY6fHlV + i6FL5UI6z/+nKsngXQ2N2+200IHf788VNRi4UC4UxAdwXApWdwi9jjl0mkN4b1vGCLWItd8riMfjDAk4 + ummgqsXESwUGzpf9G+agNc1jiFrB/C8WgRiHyYUEjN9WMTrlRywWK9KBwwL92VIhgO/goyOM2aUkpoJ/ + 4PCzsBM8YQ7dE0G4XC6UlJScEA0GHypgbZWjv7pULLHDFAQd5eBYYGCjGZh8SVA/ObyzLiESiWw1mCEG + fVUHxBK7yTPPLrOwzuWHeWYWOahHfmz9Egfvy2F+IUPfmc0AiyuMSTqBr2TIGUxhmpw+6EqiTTeARcpQ + 3KD3tAS5XE54E6trLJzfo+ghXXywh6EZC+C1bgQeowbT6jo01uxrFgyUSqWkq/oQ+q8dQ88pCWiahs/n + g9frhdvtFgrzeDzC1frpDSbbb8E/2or+lsoUscgvWdmuk4+O7Hksl+5WkG2xX1ekoWZv82fVRW7s2Tn8 + BSOIyBW1dFoHAAAAAElFTkSuQmCC @@ -272,7 +272,7 @@ 737, 17 - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index 060c6d9..32f876f 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -88,12 +88,15 @@ namespace FBS0000 return; } - if(cmbType.SelectedValue == null) + var usertxt = cmbUser.Text.Trim(); + var userid = usertxt.Substring(usertxt.IndexOf('(')+1, usertxt.LastIndexOf(')') - usertxt.IndexOf('(') -1); + + if(string.IsNullOrEmpty(userid)) { FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다"); return; } - dr.uid = cmbType.SelectedValue.ToString(); + dr.uid = userid;// cmbType.SelectedValue.ToString(); dr.sdate = dateTimePicker1.Value; dr.edate = dateTimePicker2.Value; diff --git a/SubProject/FCM0000/Mail/fMailList.cs b/SubProject/FCM0000/Mail/fMailList.cs index d2b02dd..e8c4043 100644 --- a/SubProject/FCM0000/Mail/fMailList.cs +++ b/SubProject/FCM0000/Mail/fMailList.cs @@ -34,7 +34,7 @@ namespace FCM0000.Mail { //한달전으로 처리 this.dtEd.Value = DateTime.Now; - this.dtSd.Value = DateTime.Now.AddMonths(-1); + this.dtSd.Value = DateTime.Now.AddDays(-10); refreshData(); } diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 306a540..76a8e71 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -406,7 +406,7 @@ namespace FCOMMON string sql = "select [id],[name],([name] +'(' +[id] +')') as dispName,[dept],[email],[level],[tel] " + " from vGroupUser " + - " where gcode='" + FCOMMON.info.Login.gcode + "' and [id] <> 'dev' and dept like '%" + FCOMMON.info.Login.dept.Replace("'", "''") + "%' order by [name]"; + " where gcode='" + FCOMMON.info.Login.gcode + "' and [id] <> 'dev' and isnull(outdate,'') = '' and useUserState = 1 order by [name]"; var cmd = new SqlCommand(sql, cn); var da = new SqlDataAdapter(sql, cn); var ds = new System.Data.DataSet(); diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs index 0fb1125..ec0e2ae 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs @@ -45,15 +45,19 @@ namespace FPJ0000 int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.otconfirm)); //cmbProcess.Items.Clear(); //cmbProcess.Items.Add("--전체--"); - //foreach (dsReport.ProcessListRow dr in dtProcList) - //{ - // cmbProcess.Items.Add(dr.processs); - //} - //cmbProcess.Text = FCOMMON.info.Login.process; - //if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함 - tbProcess.Text = FCOMMON.info.Login.process; - tbProcess.Tag = new List(new string[] { FCOMMON.info.Login.process }); + + + List fprclist = new List(); + foreach (dsReport.ProcessListRow dr in dtProcList) + { + fprclist.Add(dr.processs); + } + tbProcess.Tag = fprclist.ToArray(); + tbProcess.Text = string.Join(",", fprclist.ToArray()); + + //tbProcess.Text = FCOMMON.info.Login.process; + //tbProcess.Tag = new List(new string[] { FCOMMON.info.Login.process }); //담당자목록 - 사용자목록으로 처리한다. string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no); @@ -125,7 +129,7 @@ namespace FPJ0000 var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter(); var prclist = this.tbProcess.Tag as List; - if (prclist.Count < 1) + if (prclist == null || prclist.Count < 1) { var processStr = "%"; var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);