diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 61122b3..808b7bc 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.02.22.0100")] -[assembly: AssemblyFileVersion("21.02.22.0100")] +[assembly: AssemblyVersion("21.02.23.1350")] +[assembly: AssemblyFileVersion("21.02.23.1350")] diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index e70d526..115cd0f 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,33 +30,33 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - 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.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.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 numberCellType1 = 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 numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = 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(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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 numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -87,9 +87,6 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton(); this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.구매승인양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -129,8 +126,12 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.label1 = new System.Windows.Forms.Label(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.label1 = new System.Windows.Forms.Label(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripDropDownButton(); + this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.입고품목메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -193,9 +194,7 @@ this.toolStripSeparator6, this.toolStripButton6, this.toolStripButton1, - this.toolStripButton3, - this.toolStripButton4, - this.toolStripButton5}); + this.toolStripButton7}); this.bn.Location = new System.Drawing.Point(0, 652); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -203,7 +202,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1180, 26); + this.bn.Size = new System.Drawing.Size(1226, 26); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -393,44 +392,17 @@ // 집계표ToolStripMenuItem // this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem"; - this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.집계표ToolStripMenuItem.Text = "집계표"; this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click); // // 구매승인양식ToolStripMenuItem // this.구매승인양식ToolStripMenuItem.Name = "구매승인양식ToolStripMenuItem"; - this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식"; this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click); // - // toolStripButton3 - // - this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); - this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(63, 23); - this.toolStripButton3.Text = "견적서"; - this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); - // - // toolStripButton4 - // - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(75, 23); - this.toolStripButton4.Text = "가져오기"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); - // - // toolStripButton5 - // - 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(75, 23); - this.toolStripButton5.Text = "메일전송"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); - // // cm1 // this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); @@ -580,7 +552,7 @@ this.btViewDel}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1180, 37); + this.toolStrip1.Size = new System.Drawing.Size(1226, 37); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -759,22 +731,10 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1180, 592); + this.fpSpread1.Size = new System.Drawing.Size(1226, 592); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 629); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1180, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -817,7 +777,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType77; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -826,7 +786,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; 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).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType78; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -834,203 +794,203 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType79; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; 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(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType80; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; 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(3).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType81; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType82; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(5).Tag = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType83; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType84; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType85; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType86; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; + numberCellType29.DecimalPlaces = 0; + numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType29.MaximumValue = 2147483647D; + numberCellType29.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType29; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType87; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType88; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사"; this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType88; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType88; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2; + numberCellType30.DecimalPlaces = 0; + numberCellType30.NegativeRed = true; + numberCellType30.NullDisplay = "--"; + numberCellType30.Separator = ","; + numberCellType30.ShowSeparator = true; + numberCellType30.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType30; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType89; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - numberCellType3.DecimalPlaces = 0; - numberCellType3.MaximumValue = 9999999999999.99D; - numberCellType3.MinimumValue = -9999999999999.99D; - numberCellType3.NegativeRed = true; - numberCellType3.NullDisplay = "--"; - numberCellType3.Separator = ","; - numberCellType3.ShowSeparator = true; - numberCellType3.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; + numberCellType31.DecimalPlaces = 0; + numberCellType31.MaximumValue = 9999999999999.99D; + numberCellType31.MinimumValue = -9999999999999.99D; + numberCellType31.NegativeRed = true; + numberCellType31.NullDisplay = "--"; + numberCellType31.Separator = ","; + numberCellType31.ShowSeparator = true; + numberCellType31.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType31; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - numberCellType4.DecimalPlaces = 0; - numberCellType4.MaximumValue = 9999999999999.99D; - numberCellType4.MinimumValue = -9999999999999.99D; - numberCellType4.NegativeRed = true; - numberCellType4.NullDisplay = "--"; - numberCellType4.Separator = ","; - numberCellType4.ShowSeparator = true; - numberCellType4.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + numberCellType32.DecimalPlaces = 0; + numberCellType32.MaximumValue = 9999999999999.99D; + numberCellType32.MinimumValue = -9999999999999.99D; + numberCellType32.NegativeRed = true; + numberCellType32.NullDisplay = "--"; + numberCellType32.Separator = ","; + numberCellType32.ShowSeparator = true; + numberCellType32.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType32; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType90; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5; + numberCellType33.DecimalPlaces = 0; + numberCellType33.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType33.MaximumValue = 2147483647D; + numberCellType33.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType33; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType91; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(21).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType6; + numberCellType34.DecimalPlaces = 0; + numberCellType34.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType34.MaximumValue = 2147483647D; + numberCellType34.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType34; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType92; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(23).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType93; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType94; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(25).Tag = "indate"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - numberCellType7.NegativeRed = true; - numberCellType7.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType7; + numberCellType35.NegativeRed = true; + numberCellType35.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType35; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType95; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType5; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel"; @@ -1041,11 +1001,59 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 629); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1226, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripButton7 + // + this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.입고품목메일전송ToolStripMenuItem, + this.엑셀에서가져오기ToolStripMenuItem, + this.견적서폴더열기ToolStripMenuItem}); + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(60, 23); + this.toolStripButton7.Text = "기능"; + // + // 견적서폴더열기ToolStripMenuItem + // + this.견적서폴더열기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("견적서폴더열기ToolStripMenuItem.Image"))); + this.견적서폴더열기ToolStripMenuItem.Name = "견적서폴더열기ToolStripMenuItem"; + this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기"; + this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click); + // + // 엑셀에서가져오기ToolStripMenuItem + // + this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image"))); + this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem"; + this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기"; + this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click); + // + // 입고품목메일전송ToolStripMenuItem + // + this.입고품목메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("입고품목메일전송ToolStripMenuItem.Image"))); + this.입고품목메일전송ToolStripMenuItem.Name = "입고품목메일전송ToolStripMenuItem"; + this.입고품목메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.입고품목메일전송ToolStripMenuItem.Text = "입고 품목 메일 전송"; + this.입고품목메일전송ToolStripMenuItem.Click += new System.EventHandler(this.입고품목메일전송ToolStripMenuItem_Click); + // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1180, 678); + this.ClientSize = new System.Drawing.Size(1226, 678); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.label1); this.Controls.Add(this.toolStrip1); @@ -1138,12 +1146,13 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem sC검색ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cRCF검색ToolStripMenuItem; - private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.Label label1; - private System.Windows.Forms.ToolStripButton toolStripButton4; - private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripMenuItem 구매승인양식ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton6; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripDropDownButton toolStripButton7; + private System.Windows.Forms.ToolStripMenuItem 입고품목메일전송ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 엑셀에서가져오기ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 견적서폴더열기ToolStripMenuItem; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 0311ee6..7e8cd27 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -903,8 +903,7 @@ namespace FEQ0000 private void toolStripButton3_Click(object sender, EventArgs e) { - string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년"; - FCOMMON.Util.RunExplorer(path); + } private void bs_CurrentChanged(object sender, EventArgs e) @@ -921,8 +920,7 @@ namespace FEQ0000 private void toolStripButton4_Click(object sender, EventArgs e) { - var f = new fPurchase_excelimport(); - f.Show(); + } string getmaxstr(string src, int len = 30) @@ -961,6 +959,59 @@ namespace FEQ0000 private void toolStripButton5_Click(object sender, EventArgs e) { + + } + + private void 구매승인양식ToolStripMenuItem_Click(object sender, EventArgs e) + { + //구매승인양식 + var f = new fPurchaseNRList(this.dsPurchase.Purchase); + f.Show(); + + } + + private void toolStripButton6_Click(object sender, EventArgs e) + { + //선택된 줄의 데이터를 생성하낟. + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPurchase.PurchaseRow; + string buffer = string.Format("{0}_{1}", dr.pumname.Replace("_", "-"), dr.pumscale.Replace("_", "-"), dr.dept.Replace("_", "-"), dr.manuproc.Replace("_", "-"), dr.asset.Replace("_", "-")); + Clipboard.SetText(buffer); + //FCOMMON.Util.MsgI("다음 데이터가 클립보드에 저장됨\n\n" + buffer); 190131 + } + + private void dtSD_DoubleClick(object sender, EventArgs e) + { + var tb = sender as ToolStripTextBox; + var text = tb.Text.Trim(); + var dt = DateTime.Parse(text); + var f = new FCOMMON.fSelectDay(dt); + if(f.ShowDialog() == DialogResult.OK) + { + tb.Text = f.dtPick.SelectionStart.ToShortDateString(); + + var sd = DateTime.Parse(this.dtSD.Text); + var ed = DateTime.Parse(this.dtED.Text); + if (ed < sd) this.dtED.Text = sd.ToShortDateString(); + } + } + + private void 견적서폴더열기ToolStripMenuItem_Click(object sender, EventArgs e) + { + string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년"; + FCOMMON.Util.RunExplorer(path); + } + + private void 엑셀에서가져오기ToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new fPurchase_excelimport(); + f.Show(); + } + + private void 입고품목메일전송ToolStripMenuItem_Click(object sender, EventArgs e) + { + var db = new DataClasses1DataContext(); var dr = db.MailForm.Where(t => t.cate == "PC").FirstOrDefault(); @@ -1049,8 +1100,8 @@ namespace FEQ0000 sb.AppendLine("규격"); sb.AppendLine("수량"); sb.AppendLine("단가"); - sb.AppendLine("금액"); - sb.AppendLine("공급"); + sb.AppendLine("금액"); + sb.AppendLine("공급"); sb.AppendLine(""); sb.AppendLine(""); @@ -1064,7 +1115,7 @@ namespace FEQ0000 var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index; var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index; var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index; - var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index; + var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index; var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index; var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index; @@ -1081,7 +1132,7 @@ namespace FEQ0000 var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value; var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value; var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value; - var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value; + var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value; var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value; var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value; @@ -1108,7 +1159,7 @@ namespace FEQ0000 if (v규격 != null) s규격 = v규격.ToString(); if (v수량 != null) s수량 = v수량.ToString(); if (v단가 != null) s단가 = v단가.ToString(); - if (v금액 != null) s금액 = v금액.ToString(); + if (v금액 != null) s금액 = v금액.ToString(); if (v공급 != null) s공급 = v공급.ToString(); sb.AppendLine(""); @@ -1121,9 +1172,9 @@ namespace FEQ0000 sb.AppendLine("" + getmaxstr(s규격) + ""); sb.AppendLine("" + int.Parse(s수량).ToString("N0") + ""); sb.AppendLine("" + int.Parse(s단가).ToString("N0") + ""); - sb.AppendLine("" + int.Parse(s금액).ToString("N0") + ""); + sb.AppendLine("" + int.Parse(s금액).ToString("N0") + ""); sb.AppendLine("" + getmaxstr(s공급) + ""); - + sb.AppendLine(""); } sb.AppendLine(""); @@ -1140,42 +1191,6 @@ namespace FEQ0000 util.MsgE("전송실패\n\n" + ex.Message + "\n\n" + "아웃룩의 설정이 정상인지 확인하세요"); } - - } - - private void 구매승인양식ToolStripMenuItem_Click(object sender, EventArgs e) - { - //구매승인양식 - var f = new fPurchaseNRList(this.dsPurchase.Purchase); - f.Show(); - - } - - private void toolStripButton6_Click(object sender, EventArgs e) - { - //선택된 줄의 데이터를 생성하낟. - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsPurchase.PurchaseRow; - string buffer = string.Format("{0}_{1}", dr.pumname.Replace("_", "-"), dr.pumscale.Replace("_", "-"), dr.dept.Replace("_", "-"), dr.manuproc.Replace("_", "-"), dr.asset.Replace("_", "-")); - Clipboard.SetText(buffer); - //FCOMMON.Util.MsgI("다음 데이터가 클립보드에 저장됨\n\n" + buffer); 190131 - } - - private void dtSD_DoubleClick(object sender, EventArgs e) - { - var tb = sender as ToolStripTextBox; - var text = tb.Text.Trim(); - var dt = DateTime.Parse(text); - var f = new FCOMMON.fSelectDay(dt); - if(f.ShowDialog() == DialogResult.OK) - { - tb.Text = f.dtPick.SelectionStart.ToShortDateString(); - - var sd = DateTime.Parse(this.dtSD.Text); - var ed = DateTime.Parse(this.dtED.Text); - if (ed < sd) this.dtED.Text = sd.ToShortDateString(); - } } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index f23658f..80f3871 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -249,68 +249,74 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANISURBVDhPtZBdTFN3GIdJvFu4cGY1OCFEZ0JCci5kLhCo - VMZHZoEYslIwFMs6LEioQItBZHCoaxVqyqB0pXUMwUqpOIKg1QoEoiZIsWvnEQlUrQW1H9ZK9bBNEuJv - pHbZlu12z+37Ps8//zfi76jnyMjTtvom8o54uu5WxXrVxNfrZaai6eKh/Mb8wcFNwtHnH4RX/42SamTJ - rXXO64+uYsw1AdPSDdx9YYPBdgFf6tmaqv6lI+U9j5xf6RyssPIXCvuJPOODXoy7xtDrGEC1rRGSn0kM - LV5Gbh87UNCr/aS852Gg55YfkvOPwVHY88Lqxstz5JaTllp6cmkSrXNqCGaPosRyFF3zPdDc7ESWJu1I - abdT03bVA9N9GtpxH9jNFjqrZnpLKEDOSGQmxxWcXTgP/qwIhdNCHLM2Q2/TI0u1116inU84JJ9bH733 - BsobfgxagqjuXsDeynFZKHDsZpnd/GQMIusJHNyQhTNi6B1GiIzlSGlJZBap5m+3mdz4yRpEjeE5ZCM+ - tAw/RYJgxB4KVJhL1kZc11BlbUArpcLFxSGcMbci+dvPfizqWOBmkfd+uzizAonBjbIfliHULuO7Kx7E - 8y4FQ4HiYW5wxjuLS4vDUE+pwDqVHEiS7mkaFZMfqWvPRWWTFqrzugd1Bg+K213gtTnRMuRGLPscHQpw - +3PtnVPt+LyT9SJVkSg2iwti3vL5Db/ncgP0/gNEWu1t6szlZxB1PwVH/hhlmmWIuhzYmdP1/gvZ2gxJ - egdTaK85tH3t8GHlKo9H003fYLXwIOjUdCKl0kxJjUsoVbmQU78ImdEDdvUktme2vz8ijh//8G1lhc4v - EKytymVYMeoR6O/F65wDoBOSiD2CUaq+z4miVifIjTvwTv+C6EwFHcWUM0KBdyIRY5XPp9/ovserwX64 - pQ3wn+3Cyr4MBOIIIr5ggKrWPQR5wY2C5rvYnW9AFLOFE5L/5Nc8DocWCPCKbIRfp4avQ4mXiSnwRscR - u/L6KEHbPNKFZnycpnQymKe+CGv/JJiSmvk6Icnp5xbCI6qEj/gU3q3RRGy2horJaLdsS1NIGSwyMrz+ - 3/ji4yP9O+Kkvm07LV5GDLybtxLh0f9FRMQf2irhLR48YCUAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANHSURBVDhPtZBvTNJ5HMfdenbzQdei2aVr/dnc3H4Psm66 + JMn8s0Jdc4doE8Oo0Jykgs3M9CeFpTQ8RQ6h80wjiSxnWhRps1WbiRHUL3NKRWjFnziS+nmVm+t9jrjd + tXp6r6efz+v13fcT9l9U42T4SWtVLXlPPFJ5p3ih9ObehUJj3kh+b3ZNdk/PEuHA6x9Cq9+ioGpY9ZZK + x/VnVzHovAnj9A3cf2OF3noOv+jY6tLu6QNFHc8ce7R2Vkj5F7ntSJbhSSeGnIPotJ9HmbUGkgckeqcu + I7OL7c/p1Kwr6njq77jjg+Tsc3DktqyQuvjyOLnsmLmCHp4eRuO4CoKxgygwH0TbRAfUt1uRpk46sK/d + oW666obxMQ3NkBfsOjOdVj6yLBggRyUyo/0KTk+eBX9MhNwRIQ5Z6qCz6pCm3GIr0EzE7j4+vjDw6D0U + N3zoMQdQ1j6JLSVDsmDg0O1Cm+nFIESWI9i1KAtHxdDZDRAZipDQEMfMU07cbTK6cMkSQLn+NWT9XjT0 + vUSsoN8WDBSbCub7nddQaqlGI6XEhalenDI1YvPxn//Ia5nkppGPPlwYnYVE70Lh7zMQambw6xU3YngX + A8FAfh83MOoZw8WpPqhuKcE6sdkfL91UOyAml6sqzkSkk2aq9boblXo38pud4DU50NDrwmr2GToY4HZn + 2lpvNWNbK+tNojxObBLnRH3i86s/ZnL99I6dRFLFXerU5VcQtb8Ep/45CtUzELXZsTaj7csX0jUpkuQW + ptBWvnvV/P79ijkej6Zrj2IudxfoxGQiocRESQ3T2Kd0IqNqCjKDG+yyYaxKbf5yRBw+/OOnkmKtVyCY + n6uXYdagg7+7E+8ydoKOjSc2CQaoqi4H8hodIBfvwDv5EJGpcjqCWc8IBj6LRIw5Pp9+r/0Nb3u64ZJW + w3e6DbNbU+CPJoiYnPNUmfYpyHMu5NTdx4ZsPSKYDZyg/A9/ZXE4tECAt2QNfFoVvC0K/BmXAE9kNLE+ + q4sSNE0gWWjCT0kKB4N5YntI+5pAQmLqu9h4h4+bC7eoBF5iIzwrIonV6WoqKqXZvDJJLmWwyPDQ+vfx + xsSE+9ZES70r15o9jCh4lq4gQqP/i7CwvwHRZOEpN7SW4gAAAABJRU5ErkJggg== - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKPSURBVDhPzZHbS5NhHMdf6K5/oYvuusjWAdGKIAiiCDoQ - 2OGi6EKCCsEwKAJheKEu1Ik4l2YnybQ2czolCjogTd1RN33T17np3HLoULe9Z9+9e789mwPzxut+PF+e - 54Hf5/v9PTzU/10Wy7U9jV02x/P+n2i2utBm86Hd+gMd+uK9hZbdq/GtzWH9FUYwzmNxTYYrzMLuiqHh - ld1RaNm92vrd+B1j4Y6IGFsQMEo0tSzBZBlFoYWiZoaL/Uv2i0rUfvkfXVLmP58IN310IpSQMRbm4Qjx - +M5w8EVltH7ybhs435XKmpYFoJGV09Y5IyVg6nOBjnEYCW7BOXljMhq6HdsGtK0kpakS5D9GCAstECJv - IC71QcskYfkyhm++KLwRAeMRCR6SPhTg0NzRC2N5yZ28QbDnGJtV0gQ2gQ+1gv1dg3X3AyQ8FQg76zFs - byeTjMNMfqDpgxPGDis8g2YM68vY6qv7b1JBa4mSEVeQpE3YmDBgdeQRxFUXNJUl4gp7Kj+RltlAYGQA - 7/XXNXqwEZ2VpwUywXEl//6sTCQCqpAHVZGBHDdBitVCXHwMYf4eeOYWVH4Wdv0+pfPJOdFceQZU0FS6 - qakiVNaJTPIrlLU+bK68JGADxEg1xFAFhLnb4GeugJs+C5XzY7L5iJR/f66cL0rlrMJCWR/C5mo3SW2D - FCWpC7nUu+Bnb4CjL4ANnEJ64igyrHenQe6iKUkCd0FeboG0VEPgKgjBcgKXkdTzYP0nkfYdRspzgBi4 - dxrMPdPFxRSdinp6s/z8a3BBMzjGCG62DiytBzv9FOmpKqT9FUhP3kecGdBoY3GqgFMUU1f0kDEc6qHr - DyYmDTppV9XrpIBBl2Zqi1q3aIr6C0ynQfqWY2xBAAAAAElFTkSuQmCC + R0lGODlhEAAQAIQfAPr8/VVritvj7IqsyElVa+Ps9MvT2rvc/aPQ/KrU/Or0/nmYspzN/LbZ/FJgeXiQ + q0NLXHWPrJnA1sDf/CkxQ9RSXD5FVa/X/H2fudPn8HyjwMPg/WV/nG+Or////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsKDBgwQ9KFzIsKHCDBIkDJg4AMOCBQ84cHCg + UAKAjyBDAjDA0cMAABsmHDjQoMGFBAkQCCCg8OQElS0vAKhQAYECmh40AJjw4EGEiQkUKPAJQSEGACtz + wkSAgIGAph4WFDhg9OgAqgysWlDYoUDOl2DDFhjrgYOBAgUEyJ0roIABCgofBNjrwAEBAhAgWLBAoaTD + wwoRKl5cMCAAOw== - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrT1JhHMd5lX9Cs1700q2VzGzV6kVlQqht - XU1dWV4IXeZtSastoyGti9E0J2zVWq7Wi2rZBdFCTUQUFrYos5sSIlGipHI5BzkHvz3nQFFbW7/ts+fF - c76fnd/3HAE3otPGoh2NFsPOy5YfYoWFIifNo+ZOK72zcYjOvmge2SQ3Na/MvbeED/05WecGTF4/PeP0 - eFlfMAxfIMGMn4PGe48f9U9cKLj8ISSp1CfFo7HJuWD2ur/PsEPOCKwTDKwuBhYnA/OXBRg/h9E1GkSY - AXQfKNQ/mkDp1RHqL4lY0UXNhxYwPMni1SRDTgYveckC+sfCeD4aIoIohj0srF8jUOldyDjVe5cP56u3 - OvYrchdlmr0obd2H1mdtaHioRoYiFVsJEtVGiJTr0KRr4lcJ0AymZkMQ1fQzvCCvMeNB79sOdHy6gVZL - HS853JKNujuFqGorgFS7CyXaEujsU+gYCeDpm3nMkZ7EygGaF0iaJUkiRTVr+diH22+VuGSs5CVFmhwS - 3o3ya2UwjQX5VXo+UTCQHmaDEYgbBmMCbrIu9NO1N4thGzNDaz2B893Hka/ehqKWXNicIdhIsVzBpvFY - Jz4iECn/EGw+o4isP7kChc0SDI8PQdV3FEp9LQquZKLN+Biv3QxspNihLxEMErz+CDLOxgVr5MmydPly - VN06gIOaLBxo2s5LavWFkD8sI2+SCe5+2MXiJfeJCX5SZFq1OSZIly91p8uXkYeSkV6XjD2XMlFxvRim - UQNUhpM4er8YUk0ebERgJf+GhQjoSBTCamNihS3VA7RnjobdzfL0f/yKmpvlOEKCMm0Bjt869vuOI7TA - EsHjhICzTfoSgv8RJCsIy9oTgg21L0L28W+L/3r4X3h9s9HVh3WBeJwUWd7tmJgP+e2OqahjmoLDS2Es - znQgwsM1H6BZeLw/ohRFzaUc6nwXjwsEa8ufVQilXd1pMoNPKGunf3MkRuovpO10irRzdlVJZ09qsb5U - IBAIfgI33aDRLdfyBgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAALnSURBVDhPhZJZT1NBGIa5kt+AXnhvFCEYNEJEsSiI + BhVRCRJLaUsFBQlLMGExpUZWAyKQqCEQjTcaorIJBaGFQhuKEUEUKJQ9obQs3U45PeV1zim0mpB48cxc + zHzPzPfO+ADw4RUo+FfK1fKYCvU6wU6gOCrZWUPFlA9R0aWq8ZDcgepQScsBtmYPboh6MtBvNFPGdauD + MVkdMFm8GM0sFH6tmFHweQGiF9O2EEmL7z+C6BKVwWynmaE5Gpp5JzQLTqjnnFDpt6GYduDLhBUOJ9D6 + 246Cj/MQPp+2n0lr5SSc4HLpoH3Lto2RRQbfFp1kdmKYk2xDqXOga8JGBC6MrDDQLNOQtS8g/FHvO05w + u/L87M2KuB1xXSySa2+gtrMJxc2VCC/yxzlCpOw0IqTBqGqt4lqxUE6sbtgQUagkd3ILPnwda0Pb1GvU + qrM5yd2aS8h+m4j0pngI669CUC9A6+gq2sYtaPmxhU2S0wXpALUn8I0tz2DUk314MyZFmeIBJ+HXRZPi + a5C8TEG/zsq10jNlh5zksGGlcaF40C1gh6gSJZXZkAStToV6TS6edmeBiMGviYN2zgYtCZYNuH/GnYmJ + CCKkfwnCCovok3mHkVgdiZGZIcj6UiFtz0T8Mx6aFJ/wfckJLQl2SE9jkGAw0wh/vCsIyjkoDso5hPTG + BNypi0JC1UVOktmeiJzmFHITHtj1kQUGw+wTE8wkyLB8lUewRCCb/BCU7YfrZTykvUpC/4QcMnkeUt8n + QVh3C1oi0JC/oSYCinYhJFfhbeFs/gC1sklhdInhUE4u42GDBCJSKK6PR1bjfc8ai22bQXBGr1cQmqeg + Fk1ewf+wkhYCU+RewanMXpt+zbaz3+b9IL/SdUzYafEIgu51zxq2HGa9kXLNrtkxa7BDt8uaheZgk7dQ + 5HQH43Lt7Gwe4Xf89AhOpMrTAkRd3YFiuSlA3EV5EHVRxwn+ok43Qo6No4KOHn9BRzIAnz/8M/0zf/tL + eAAAAABJRU5ErkJggg== - + + + R0lGODlhEAAQAIQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/np + ofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlwA/CBxIsKDBgwY9KFSIUKAHBgw0RIiwsKKHDw89YNiY + oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A + cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA + Ow== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEOSURBVDhPYxh48J9CADbg8vMP/2ceuAbGXWtOoODa+Tv/ - V87YBMYVE1b/T62fA8ZBCZUIA0Aaf/35SzQ+ffkWqgEgm0AShx/8/X/g/p//u+/8BeNtN/+A8frrf/6v - ugLBiy/8+X/78Zv/nqHZmAaANMMMQNYMkrsSFAPGIANeffmHakDN4gNwA0D+BOHS/jXwcADZDNIEwjAD - nL1jEAaAAgpkACGng/CcsxAvoBgACuHHb76ANcNsR3YBsmaYAXauoQgD8vvWgw1AthlmO7pmEAapRTEA - FK+gqAFJgDDIBlwYJA9Sq2nojDAA5OzQ7C44BsUxCINCGoRB/gVhkK0gDNKMkg4oAdAcMWCAgQEAUU2N - V3HhzrYAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index d7afa70..e1df466 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -105,14 +105,14 @@ this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter(); this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); + this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox5 = new System.Windows.Forms.TextBox(); this.tbDue = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.textBox3 = new System.Windows.Forms.TextBox(); this.pdateTextBox = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); pdateLabel = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); @@ -1012,6 +1012,16 @@ this.panel4.Size = new System.Drawing.Size(1345, 31); this.panel4.TabIndex = 8; // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true)); + this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBox1.Location = new System.Drawing.Point(768, 5); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(572, 21); + this.textBox1.TabIndex = 3; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // textBox5 // this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true)); @@ -1034,15 +1044,17 @@ this.tbDue.Text = "2020-01-01"; this.tbDue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // textBox1 + // linkLabel1 // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true)); - this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.textBox1.Location = new System.Drawing.Point(768, 5); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(572, 21); - this.textBox1.TabIndex = 3; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Left; + this.linkLabel1.Location = new System.Drawing.Point(522, 5); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(108, 21); + this.linkLabel1.TabIndex = 17; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "CR# Due Date"; + this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // // textBox3 // @@ -1086,18 +1098,6 @@ this.label1.Text = "프로젝트정보"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // linkLabel1 - // - this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Left; - this.linkLabel1.Location = new System.Drawing.Point(522, 5); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(108, 21); - this.linkLabel1.TabIndex = 17; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "CR# Due Date"; - this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // // fPartBuyStatus // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs index 39ee40e..7b654b3 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs @@ -750,39 +750,53 @@ namespace FPJ0000 if (drv == null) return; var dr = drv.Row as dsPRJ.ProjectPartStatusRow; - if (dr.IspathNull()) - { - util.MsgE("공유 폴더가 생성되지 않은 프로젝트 입니다\n열람 가능한 파일이 없습니다"); - return; - } - var tbPath = dr.path; - if (tbPath.Equals("")) - { - util.MsgE("공유폴더가 존재하지 않는 프로젝트 입니다. 프로젝트 정보에서 공유폴더를 클릭해 먼저 생성한 후 다시 시도하세요"); - return; - } - if (tbPath.StartsWith("\\") == false) - { - if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); - else tbPath = "\\" + tbPath; - } + var serverpath = Properties.Settings.Default.SharePath + @"\Project\" + dr.Project.ToString(); - var serverpath = @"\\" + FCOMMON.info.serverip + @"\Data\Project"; + //if (tbPath == "") tbPath = "/" + dr.idx.ToString(); + + //if (tbPath.StartsWith("\\") == false) + //{ + // if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); + // else tbPath = "\\" + tbPath; + //} + //\\10.131.32.29\Data + if (System.IO.Directory.Exists(serverpath) == false) { - FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + + FCOMMON.Util.MsgE("프로젝트 경로가 존재하지 않아 진행할 수 없습니다\n\n" + serverpath); return; } - var path = serverpath + tbPath; - if (System.IO.Directory.Exists(path) == false) - { - FCOMMON.Util.MsgE("프로젝트 저장소 없음"); - } - FCOMMON.Util.RunExplorer(path); + //if (tbPath.Equals("")) + //{ + // util.MsgE("공유폴더가 존재하지 않는 프로젝트 입니다. 프로젝트 정보에서 공유폴더를 클릭해 먼저 생성한 후 다시 시도하세요"); + // return; + //} + + //if (tbPath.StartsWith("\\") == false) + //{ + // if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); + // else tbPath = "\\" + tbPath; + //} + + //var serverpath = @"\\" + FCOMMON.info.serverip + @"\Data\Project"; + //if (System.IO.Directory.Exists(serverpath) == false) + //{ + // FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + + // serverpath); + // return; + //} + + //var path = serverpath + tbPath; + //if (System.IO.Directory.Exists(path) == false) + //{ + // FCOMMON.Util.MsgE("프로젝트 저장소 없음"); + //} + + FCOMMON.Util.RunExplorer(serverpath); } private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 057efeb..a9f0ff4 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6XpmhrY - zVTMvM05NDXRhUG2mEbmJTRRoUSUIqJCy3Rq8zbndMMZmcvUvM4LeFnqtnOO25l+e87ZUgOhH3x4Xjzn - ++H8vucIuAl6oI67XKRThRXrfgvlOpqcDE8Jd+qZsKJ+JuSp1nhOpinzDn93gA/tneDHvZplC7NqNBqd - ZtsmzNZdVi0cDH4uWpDbaEJU8SglSlN6uKOuCS3QLnPh/hkH9LMs9CYWuhkW2mk71L820TpiwyYLNI3S - yP04i8TnRvofiVDeSm9QdgzOOfF1jiUniwFeYkfPxCa+jFBEsIXBRSf0Cw7kK00IuN/5hg9HlvhP3ZSH - b0sqryOx4gYq2uqQV1+CALkP/Ami/LMIUpxCaVMpv4qVYbG0RiEotoflBRFFAR86h5vRPF6NCl02L4kt - D0H26xik10VBXHUFCVUJaBpaQrPRis/fN7BOehIqehleICoTeXjLM5y6sW68GlagUJ3GS+IqQ0n4KqQv - kqGZsPGrdIzTUJEe1mwOCPP6XAJuggt6mMyaeBgmtKjS38OT9ixEllxEXHk4DDMUDKRYrmDNpKsTMxEE - KfYIzj+UO07nHEFMmQiDk/3I706BQpmJqGeBqFN/wrd5FgZSbP+0A32EZYsDAY/cghMyT4mf7DDSa6Nx - qzIY0aWXeEmmMgay+mTyJoHg7gdNTgxwn5hgIUX6ZmhdAj/ZwXk/2SHykCf8sj1xrTAQqS/joRlRIV+V - g5T38RBXRsBABHryb+iIgHFsEYF6d4ULGb3M4jqDoXknT8/YAu7WSJFEgpKqKGTV3tm546DsTiJo2BVw - tjnzruB/2LgVkvcIzmR2UdVvG7f3e3g/urq6to7FNlndcVKktH1qdoOycBdTKzSmlmlMuFmxOni45q2M - K0zT9LrX7ZYf7rhAcFLaluorbm0/LlGZfSUNzA5JLnz+Im5gvMQta0cTWjp84pWJAoFA8AcYsp4t3wvN - zgAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY + zVTMvM0pmtrQhUG2mIvMS2iiAwtRCl9UqJVObd7mnNtwRuYyNa/zAl6Wuss5ujP99pyzpQZCP/jwvHjO + 98P5fc/hsRP8SJ1wtViviijR/w6R6ily0hyl7GmgI4p1dNhzremCRFPuG/nuEBfaP6FP+zTLVnrVZDK5 + LPZNWGx7rFpZaPxctCL/kxkxJaMOQabSyxN1T3ihdpkN62acMMwyMJgZ6GcYaKe3oP61ibYROzYZoHmU + Qn7TLJJfmqh/JCHSNmrDsYXBORe+zjHkZDDASbbQO7GJLyMOItjG4KILhgUn5EozAh921XPh6NKAqdvS + yB1R1U0kV95CZXsdChpKESj1QwBBID+PYNkZlDWXcavYaAZLaw4Ex/cynCCqOPBD13ALWsZfo1Kfy0ni + K8KQ+zYOWXUxECquIUmRhOahJbSYbPj8fQPrpKcQWR/NCQTlAi9fabZLP9aDN8MyFKkzOUlCVTgJX0da + dSo0E3Zulc5xCirSw5rdiZCCfreAndDCXlpckwjjhBYKwwM868hBdOllJFREwjjjgJEUyxasmXR3YiGC + YNk+wcXHUufZvGOIKxdgcFIHeU86ZEoxYl4EoU79Ed/mGRhJsbppJ/oJy1YnAp94BKck3iK+5CiyamNx + pyoUsWVXOIlYGQdJQyp5kyCw94NmFwbYT0ywkiL9s7VuAV9yeJ4vOUIe8gY/1xs3ioKQ8SoRmhEV5Ko8 + pL9PhLAqCkYiMJB/Q08EtHObCNR7K1zK7qMX12kMzbs4escWcL8mDSkkKFLEIKf23u4di2PLRQSNewLW + NmfZE/wPO7tC6j7BOXG3o7q+aeeghw+iu7t7+0R8s80TJ0WmdUzNbjis7MXUCoWpZQoTHlZsTg62eRvt + DlMUte5zt/WHJ87jnU5rz/AXtnWcFKks/qJGepcUN35/ETbSPsLWteNJrZ1+icpkHo/H+wMUXJ4nAsHB + vwAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 09b2d26..d1e921e 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -234,7 +234,12 @@ namespace FPJ0000 if (value_in != null) qty_in = (int)value_in; if (value_buy != null) qty_buy = (int)value_buy; - if (qty_buy < 1) //비구매건 + if(b_cancel == true) + { + row.ForeColor = Color.White; + row.BackColor = Color.Red; + } + else if (qty_buy < 1) //비구매건 { 비구매 += 1; row.ForeColor = Color.Black; diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 0357eca..0a30c23 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,25 +30,25 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.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.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 numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -266,7 +266,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -389,7 +388,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -434,7 +432,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(305, 418); + this.cm.Size = new System.Drawing.Size(299, 440); // // columnSizeToolStripMenuItem // @@ -444,7 +442,7 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.columnSizeToolStripMenuItem.Text = "열 너비"; // // autoToolStripMenuItem @@ -482,85 +480,86 @@ // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(301, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(295, 6); // // 편집ToolStripMenuItem // this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem"; - this.편집ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.편집ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.편집ToolStripMenuItem.Text = "편집"; this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); // // partListToolStripMenuItem // this.partListToolStripMenuItem.Name = "partListToolStripMenuItem"; - this.partListToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.partListToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.partListToolStripMenuItem.Text = "파트리스트"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // // iOMapToolStripMenuItem // this.iOMapToolStripMenuItem.Name = "iOMapToolStripMenuItem"; - this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.iOMapToolStripMenuItem.Text = "I/O 맵"; this.iOMapToolStripMenuItem.Click += new System.EventHandler(this.iOMapToolStripMenuItem_Click); // // 공유폴더ToolStripMenuItem // this.공유폴더ToolStripMenuItem.Name = "공유폴더ToolStripMenuItem"; - this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.공유폴더ToolStripMenuItem.Text = "공유 폴더"; this.공유폴더ToolStripMenuItem.Click += new System.EventHandler(this.공유폴더ToolStripMenuItem_Click); // // scheduleToolStripMenuItem // - this.scheduleToolStripMenuItem.ForeColor = System.Drawing.Color.Silver; + this.scheduleToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.scheduleToolStripMenuItem.Name = "scheduleToolStripMenuItem"; - this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(304, 36); - this.scheduleToolStripMenuItem.Text = "스케쥴 관리(개발중)"; + this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.scheduleToolStripMenuItem.Text = "스케쥴 관리"; this.scheduleToolStripMenuItem.Click += new System.EventHandler(this.scheduleToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(301, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(295, 6); // // 메일발송주소관리ToolStripMenuItem // + this.메일발송주소관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Gray; this.메일발송주소관리ToolStripMenuItem.Name = "메일발송주소관리ToolStripMenuItem"; - this.메일발송주소관리ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.메일발송주소관리ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.메일발송주소관리ToolStripMenuItem.Text = "메일발송 주소 관리"; this.메일발송주소관리ToolStripMenuItem.Click += new System.EventHandler(this.메일발송주소관리ToolStripMenuItem_Click); // // makeRepeatToolStripMenuItem // this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; - this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.makeRepeatToolStripMenuItem.Text = "복사"; this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // // 편집ToolStripMenuItem1 // this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(304, 36); + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(298, 36); this.편집ToolStripMenuItem1.Text = "편집"; // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(301, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(295, 6); // // 엑셀파일로저장ToolStripMenuItem // this.엑셀파일로저장ToolStripMenuItem.Name = "엑셀파일로저장ToolStripMenuItem"; - this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); this.엑셀파일로저장ToolStripMenuItem.Text = "목록 내보내기"; this.엑셀파일로저장ToolStripMenuItem.Click += new System.EventHandler(this.엑셀파일로저장ToolStripMenuItem_Click); // @@ -575,6 +574,7 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; this.tam.JobReportTableAdapter = null; @@ -657,118 +657,118 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + numberCellType16.DecimalPlaces = 0; + numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType16.MaximumValue = 2147483647D; + numberCellType16.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType43; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType44; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType45; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "category"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType46; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType47; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType48; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType49; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType50; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType51; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType52; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType53; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType54; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 78F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType2; + numberCellType17.DecimalPlaces = 0; + numberCellType17.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType17.MaximumValue = 2147483647D; + numberCellType17.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType17; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 59F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType3; + numberCellType18.MaximumValue = 999999999999999D; + numberCellType18.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType18; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4; + numberCellType19.MaximumValue = 999999999999999D; + numberCellType19.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType19; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; + numberCellType20.MaximumValue = 999999999999999D; + numberCellType20.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType20; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType55; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType56; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -892,7 +892,6 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 25); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -1004,6 +1003,7 @@ this.richTextBox2.Size = new System.Drawing.Size(577, 140); this.richTextBox2.TabIndex = 1; this.richTextBox2.Text = ""; + this.richTextBox2.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged); // // tableLayoutPanel2 // diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 9a98065..bf4937e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -698,8 +698,8 @@ namespace FPJ0000 if (tbPath.StartsWith("/")) tbPath = tbPath.Replace("/", "\\"); else tbPath = "\\" + tbPath; } - - var serverpath = @"\\10.131.32.29\Data\Project"; + //\\10.131.32.29\Data + var serverpath = Properties.Settings.Default.SharePath + @"\Project"; if (System.IO.Directory.Exists(serverpath) == false) { FCOMMON.Util.MsgE("프로젝트 기본경로가 존재하지 않아 진행할 수 없습니다\n\n" + @@ -743,5 +743,10 @@ namespace FPJ0000 { refreshData(); } + + private void richTextBox2_TextChanged(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index f94a048..b361a6d 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,36 +230,39 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rtEWlSUSuEhbtNmm - qzVXU9ewAI2pGZWzZimhu5mUjohorLKEFIeSRhq5Xu1Fe4FLIBBB2bqne7/cKZf8qT7b2d3uc87Zs+8e - 6r8xOj6i7eYCDNb30A/O48TAG2joV4+EsYj+sai2b3Rpse9hBGZXGD0PwqCS6V/IVV2njxUyImh39Huu - lzrlbYbBo4V+VIPjrgbys9b0DEJGRK/7K5kPzF0GHbgE88wFUMiBNxy8OLtmgWkkTObZUBZPCNniDQfO - +0UFlRa5spzeCVm3FKoeuchPWSeCQleGcDwN9bmplYJKS6lS0VHCNo00onWsCWUd20mQZ3A8mCmw+0Kw - TwbhnA7i7ZcE9rRPkgJVf6lSfmYbq7lbh92mMhSfLIC0ZTOGvCFYeU0wf2/w+lMc5S1eKOkdFbLTUrbB - WQuJrpAt0uVtNd5aRDy1DJuPIV479yUFZAtuAxunaut+KHpLUHVtL444DmGTbgO7Ubd+C79Rq+0DYsll - OKYY3J7OiBp+wiCRWn1Z9ZUK6N0aHLZXo1hXwOY3ZsI8zUPvsPTtJ+74Mxvcn+EOyfmYQbZU3QpI2gpR - pM9D/rF1K2Ee7fV5UjDMBfkwKbjBPUQ2LxZiUBu9a96B5upLRLkC19Mw8boDXAEfyJWs3f1byIiop58j - kvgBJpbG50gKC0wS1C6DB7mS1N+zCxkRR81z4zVdgWRN1yyqOv3Yd3b1Xv4RivoDC24tGxJwwQYAAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rtEWlaUSuEhbtNmm + qzVXU9ewAI2pMZa9zVJCdzMpHRHRWGUJKQ4xjTRyvdoL9gKXQCCCsnVP9365Uy75U322s7vd55yzZ989 + 1H9jdHxE580g9Nb30A0t4MTgG6jpV4+EsYiB8Zimf2xpsf9hFGZXBL0PIqBSmV/IV+NZHytkRNDu2Pd8 + L3XK2wa9RwPdmBrHXc3kZ4PpGYSMiD73VzIfnL8MOnAJ5tkLoJAHbzh4cW7NAtNohMxzoSyeMHLFGw6c + 94sKaiwyRRW9ExU9Uih7ZSI/ZZ0MCV1ZIokMVF3TKwU1lnKFvKuMbR1tQcd4KyrPbCdBnqGJULbAPhWG + 3ReCcyaEt1+S2GPwkQLlQLlCZtzGqu82YrepEqUniyBt34xhbxhWXpPM3xu8/pRAVbsXCnpHdYVByjY7 + GyDRFrMl2oKtxluLSKSXYZtiiNfOfUkB2YLbwMapzrof8r4y1F7biyOOQ9ik3cBu1K7fwm/UYfuAeGoZ + jmkGt2eyokaeMEimV19WdaUaOrcah+11KNUWsYUt2TBP2/A7LH37iTv+7Ab3Z7lDcj5mkCtljxySzmKU + 6ApQeGzdSphHc32BFIxwQT5MCm5wD5HLi2AcKqN3zTtQX32JGFfgehohXneAK+AD+So3uH8LGRFN9HNE + kz/AxDP4HE0jyKRA7dJ7kC9J0z27kBFx1Dw/Ud8dSNV3z6H2nB/7Tq/eyz9CUX8A/U0tFfLjRd0AAAAA SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ8SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVBcmLFyxM/ER - dhqNGzDRYMLCBUoMiI9geIgEEaMgryKoRWxrCMFAS0Eo0hGH0tZpKZVWYMpM59HpdI63ZRRcmPg4uScz - d3K/8///Heq/tTBUMBd8e1INWU/v8Cl1afio3/fiwG5/X0HOL35XkDM6WrTLwCnK3WNSdD0NQCcr4633 - lBxDeLQ0uew8p/xwZOayHHSWB5lXh84YOEXRg4VxXZOhhOsgBuohsk8gBfuhpziSlYCuCcSbW/vUBhI8 - l2QGTLSBU5S36yCfVjcJ3ISErxH8pyqsT5UiNn0JnKca3PwNcHPXsOGuIC4nnUXhHTgsGDgJMBeqKWkV - HN2EjdlaRMeuQoq6SFXeqJ55xn92kBnPbc6XDTzTwRE1O39aIZYATcyCmsRAiTwATffC4phE+wiL7vEV - 2N0huDqOKQZOAppNSV2ToPGTSHE2qGv9SK62QV6+C898B4Zmolj6KuLLmgKXn4d17hteW9o0Ayd/odWk - pFUe6roFyWhntqocqoYUqECfI4KFsIApVoIjIGKC2BNR0POehYGTgPv5sq5yBH4KZaUecrCKwOUQvRey - bftiChz+BMZ9CYwwAmZCCjrHwtsBi7fzIlKcjkfnu9OJpXYI3mYITB2EzzXoITMvrIgY827BGX9YVtA6 - vLgdwNTkXmFq93fRt/bF3LV58k6/GXysuXw8ZgnkZGVMk+qWjwLqWrp1W+Xxs0bE79VgY/e02tnrZnIX - vRMRPLLT6XstZt1jbcNkYwn/vCy3xDj653pZWXzR+fA8F7A1YPhmkWh8/js9K9tbYq0qlux3Tmzfxb+J - or4D2CMlTsoxq5sAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ9SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVBMXLNzozqgx + 7Eg0bsBEgwkLFwgxIErE8LIJEIyCvAW1WGkNIRhoCwgFOmIpbZ2WUmmFTpnpPDqdzvG2jIILEx8n92Tm + Tu53/v+/Q/23VkYLFgPmi0rw3eV9vqSsmU/7vC+PHfQNFOT84vcFORMTRQd0nKIWeg2ypqUBaGRlvPue + kqIITZQm1+0l8g+H529KAXt5wP36xBUdpyh6pDCuqRLkUAMEfyME5inEwBC0FEuyEtBUnnhnd5+Kgd+J + Jd3DBlrHKcrTc5xLKzsEbkHC2wzuUzW2Z0sRnbsB1lUDdrkK7OIdxJwVxOWkswg8wyd5HScBg4VKStwE + S7cgtlCHyORtiJEZUpXTq2ee8Z8dZMZzDuZLOp7p4JSSnT8tE4uAKmRBVXRDDreCpvthsjnQOc6gd2oD + VmcQjq4zso6TgFZDUlNFqJwDKdYCZWsIyc0OSOv1cC13YXQ+grWvAr5syZjxcRhb/IY3pnZVx8lfaDPI + aYWDsm1CMtKdrSoFayD6KzBgC2MlxGOWEWHzC5gmdoVl9H1goOMU5XycL2kKS+BnkDcaIQWqCVwOwXMt + 27Y3KsPmS2DKm8C4m8d8UEb3ZGgvYPVBXliM0/HNpd50Yq0TvOcJeHcD+M+16CMzr2wImPTswhl/XJfR + Zl7dC3DX5t5y1x3toe8fiTrr8qT9fjvSoc54OSwQyM5ImCPVTUs8Hhl7NEvl2RI94vdqsjCH2qzM3UFy + F/3TYbRbXel644DmGuuAo7mYe1GWW6wf/XO9qjx/3W68yvotTTDfKxL0z3+n52WHi8eqzonWhxf27uLf + RFHfAYHRJStazxuMAAAAAElFTkSuQmCC + + 17, 17 + 387, 17 @@ -317,12 +320,21 @@ 561, 17 + + 561, 17 + + + 561, 17 + 731, 17 647, 17 + + 731, 17 + 169, 56 diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs b/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs index ea8148b..f096d8f 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs @@ -42,9 +42,12 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); 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 numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dsPRJ = new FPJ0000.dsPRJ(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter(); + this.taTodo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -60,6 +63,7 @@ this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.projectsScheduleBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton10 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -70,13 +74,14 @@ this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.fpSpread2 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread2_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bsTodo = new System.Windows.Forms.BindingSource(this.components); + this.textBox1 = new System.Windows.Forms.TextBox(); this.bnTodo = new System.Windows.Forms.BindingNavigator(this.components); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); @@ -91,10 +96,7 @@ this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton9 = new System.Windows.Forms.ToolStripButton(); - this.taTodo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); this.button1 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.fpSpread2_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -106,10 +108,10 @@ this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread2_Sheet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsTodo)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bnTodo)).BeginInit(); this.bnTodo.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread2_Sheet1)).BeginInit(); this.SuspendLayout(); // // dsPRJ @@ -137,6 +139,14 @@ this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // ta + // + this.ta.ClearBeforeFill = true; + // + // taTodo + // + this.taTodo.ClearBeforeFill = true; + // // bn // this.bn.AddNewItem = null; @@ -157,7 +167,8 @@ this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, this.projectsScheduleBindingNavigatorSaveItem, - this.toolStripButton1}); + this.toolStripButton1, + this.toolStripButton10}); this.bn.Location = new System.Drawing.Point(5, 275); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -165,7 +176,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1098, 25); + this.bn.Size = new System.Drawing.Size(1127, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -209,7 +220,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -270,6 +280,7 @@ this.projectsScheduleBindingNavigatorSaveItem.Name = "projectsScheduleBindingNavigatorSaveItem"; this.projectsScheduleBindingNavigatorSaveItem.Size = new System.Drawing.Size(23, 22); this.projectsScheduleBindingNavigatorSaveItem.Text = "데이터 저장"; + this.projectsScheduleBindingNavigatorSaveItem.Visible = false; this.projectsScheduleBindingNavigatorSaveItem.Click += new System.EventHandler(this.projectsScheduleBindingNavigatorSaveItem_Click); // // toolStripButton1 @@ -280,17 +291,28 @@ this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(66, 22); this.toolStripButton1.Text = "Refresh"; + this.toolStripButton1.Visible = false; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // toolStripButton10 + // + this.toolStripButton10.Image = global::FPJ0000.Properties.Resources.accept; + this.toolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton10.Name = "toolStripButton10"; + this.toolStripButton10.Size = new System.Drawing.Size(99, 22); + this.toolStripButton10.Text = "기본목록생성"; + this.toolStripButton10.Click += new System.EventHandler(this.toolStripButton10_Click); + // // fpSpread1 // this.fpSpread1.AccessibleDescription = ""; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.EditModeReplace = true; this.fpSpread1.Location = new System.Drawing.Point(5, 19); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1098, 256); + this.fpSpread1.Size = new System.Drawing.Size(1127, 256); this.fpSpread1.TabIndex = 1; // // fpSpread1_Sheet1 @@ -299,7 +321,7 @@ 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 = 8; + this.fpSpread1_Sheet1.ColumnCount = 9; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -315,7 +337,9 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Actual(WW)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "진행"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "시작"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "완료"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "시작"; @@ -380,9 +404,13 @@ this.fpSpread1_Sheet1.Columns.Get(6).Label = "%"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "uid"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; @@ -452,10 +480,6 @@ this.exportListToolStripMenuItem.Text = "Export List"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // - // ta - // - this.ta.ClearBeforeFill = true; - // // groupBox1 // this.groupBox1.Controls.Add(this.fpSpread1); @@ -464,7 +488,7 @@ this.groupBox1.Location = new System.Drawing.Point(5, 5); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(5); - this.groupBox1.Size = new System.Drawing.Size(1108, 305); + this.groupBox1.Size = new System.Drawing.Size(1137, 305); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "Schedule"; @@ -476,19 +500,21 @@ this.groupBox2.Location = new System.Drawing.Point(5, 310); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(5); - this.groupBox2.Size = new System.Drawing.Size(541, 351); + this.groupBox2.Size = new System.Drawing.Size(654, 356); this.groupBox2.TabIndex = 3; this.groupBox2.TabStop = false; this.groupBox2.Text = "Time Table"; // // panel1 // - this.panel1.BackColor = System.Drawing.Color.Red; + this.panel1.BackColor = System.Drawing.Color.Black; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(5, 19); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(531, 327); + this.panel1.Size = new System.Drawing.Size(644, 332); this.panel1.TabIndex = 0; + this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); + this.panel1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseClick); // // groupBox3 // @@ -496,10 +522,10 @@ this.groupBox3.Controls.Add(this.textBox1); this.groupBox3.Controls.Add(this.bnTodo); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Right; - this.groupBox3.Location = new System.Drawing.Point(546, 310); + this.groupBox3.Location = new System.Drawing.Point(659, 310); this.groupBox3.Name = "groupBox3"; this.groupBox3.Padding = new System.Windows.Forms.Padding(5); - this.groupBox3.Size = new System.Drawing.Size(567, 351); + this.groupBox3.Size = new System.Drawing.Size(483, 356); this.groupBox3.TabIndex = 4; this.groupBox3.TabStop = false; this.groupBox3.Text = "Todo"; @@ -508,18 +534,74 @@ // this.fpSpread2.AccessibleDescription = ""; this.fpSpread2.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread2.EditModeReplace = true; this.fpSpread2.Location = new System.Drawing.Point(5, 19); this.fpSpread2.Name = "fpSpread2"; this.fpSpread2.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread2_Sheet1}); - this.fpSpread2.Size = new System.Drawing.Size(557, 231); + this.fpSpread2.Size = new System.Drawing.Size(473, 236); this.fpSpread2.TabIndex = 1; // + // fpSpread2_Sheet1 + // + this.fpSpread2_Sheet1.Reset(); + this.fpSpread2_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread2_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread2_Sheet1.ColumnCount = 5; + this.fpSpread2_Sheet1.ActiveColumnIndex = -1; + this.fpSpread2_Sheet1.ActiveRowIndex = -1; + this.fpSpread2_Sheet1.AutoGenerateColumns = false; + this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "No"; + this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "항목"; + this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "시작일"; + this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "완료일"; + this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "진행"; + this.fpSpread2_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; + this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType4; + this.fpSpread2_Sheet1.Columns.Get(0).DataField = "sort"; + this.fpSpread2_Sheet1.Columns.Get(0).Label = "No"; + this.fpSpread2_Sheet1.Columns.Get(0).Width = 58F; + this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType5; + this.fpSpread2_Sheet1.Columns.Get(1).DataField = "title"; + this.fpSpread2_Sheet1.Columns.Get(1).Label = "항목"; + this.fpSpread2_Sheet1.Columns.Get(1).Width = 151F; + this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType6; + this.fpSpread2_Sheet1.Columns.Get(2).DataField = "pdate"; + this.fpSpread2_Sheet1.Columns.Get(2).Label = "시작일"; + this.fpSpread2_Sheet1.Columns.Get(2).Width = 84F; + this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType7; + this.fpSpread2_Sheet1.Columns.Get(3).DataField = "edate"; + this.fpSpread2_Sheet1.Columns.Get(3).Label = "완료일"; + this.fpSpread2_Sheet1.Columns.Get(3).Width = 76F; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType7; + this.fpSpread2_Sheet1.Columns.Get(4).DataField = "process"; + this.fpSpread2_Sheet1.Columns.Get(4).Label = "진행"; + this.fpSpread2_Sheet1.Columns.Get(4).Width = 77F; + this.fpSpread2_Sheet1.DataAutoSizeColumns = false; + this.fpSpread2_Sheet1.DataSource = this.bsTodo; + this.fpSpread2_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread2_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // bsTodo // this.bsTodo.DataMember = "EETGW_ProjectToDo"; this.bsTodo.DataSource = this.dsPRJ; // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsTodo, "remark", true)); + this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.textBox1.Location = new System.Drawing.Point(5, 255); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(473, 71); + this.textBox1.TabIndex = 3; + // // bnTodo // this.bnTodo.AddNewItem = null; @@ -541,14 +623,14 @@ this.toolStripButton7, this.toolStripButton8, this.toolStripButton9}); - this.bnTodo.Location = new System.Drawing.Point(5, 321); + this.bnTodo.Location = new System.Drawing.Point(5, 326); this.bnTodo.MoveFirstItem = this.toolStripButton2; this.bnTodo.MoveLastItem = this.toolStripButton5; this.bnTodo.MoveNextItem = this.toolStripButton4; this.bnTodo.MovePreviousItem = this.toolStripButton3; this.bnTodo.Name = "bnTodo"; this.bnTodo.PositionItem = this.toolStripTextBox1; - this.bnTodo.Size = new System.Drawing.Size(557, 25); + this.bnTodo.Size = new System.Drawing.Size(473, 25); this.bnTodo.TabIndex = 2; this.bnTodo.Text = "bindingNavigator1"; // @@ -586,7 +668,6 @@ // this.toolStripTextBox1.AccessibleName = "위치"; this.toolStripTextBox1.AutoSize = false; - this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox1.Text = "0"; @@ -647,6 +728,7 @@ this.toolStripButton8.Name = "toolStripButton8"; this.toolStripButton8.Size = new System.Drawing.Size(23, 22); this.toolStripButton8.Text = "데이터 저장"; + this.toolStripButton8.Visible = false; this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); // // toolStripButton9 @@ -657,83 +739,25 @@ this.toolStripButton9.Name = "toolStripButton9"; this.toolStripButton9.Size = new System.Drawing.Size(66, 22); this.toolStripButton9.Text = "Refresh"; + this.toolStripButton9.Visible = false; this.toolStripButton9.Click += new System.EventHandler(this.toolStripButton9_Click); // - // taTodo - // - this.taTodo.ClearBeforeFill = true; - // // button1 // this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.button1.Location = new System.Drawing.Point(5, 661); + this.button1.Location = new System.Drawing.Point(5, 666); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(1108, 38); + this.button1.Size = new System.Drawing.Size(1137, 38); this.button1.TabIndex = 5; this.button1.Text = "저장"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // - // textBox1 - // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsTodo, "remark", true)); - this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.textBox1.Location = new System.Drawing.Point(5, 250); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(557, 71); - this.textBox1.TabIndex = 3; - // - // fpSpread2_Sheet1 - // - this.fpSpread2_Sheet1.Reset(); - this.fpSpread2_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread2_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread2_Sheet1.ColumnCount = 5; - this.fpSpread2_Sheet1.ActiveColumnIndex = -1; - this.fpSpread2_Sheet1.ActiveRowIndex = -1; - this.fpSpread2_Sheet1.AutoGenerateColumns = false; - this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "No"; - this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "항목"; - this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "시작일"; - this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "완료일"; - this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "진행"; - this.fpSpread2_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType3; - this.fpSpread2_Sheet1.Columns.Get(0).DataField = "sort"; - this.fpSpread2_Sheet1.Columns.Get(0).Label = "No"; - this.fpSpread2_Sheet1.Columns.Get(0).Width = 58F; - this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType4; - this.fpSpread2_Sheet1.Columns.Get(1).DataField = "title"; - this.fpSpread2_Sheet1.Columns.Get(1).Label = "항목"; - this.fpSpread2_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType5; - this.fpSpread2_Sheet1.Columns.Get(2).DataField = "pdate"; - this.fpSpread2_Sheet1.Columns.Get(2).Label = "시작일"; - this.fpSpread2_Sheet1.Columns.Get(2).Width = 84F; - this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType6; - this.fpSpread2_Sheet1.Columns.Get(3).DataField = "edate"; - this.fpSpread2_Sheet1.Columns.Get(3).Label = "완료일"; - this.fpSpread2_Sheet1.Columns.Get(3).Width = 76F; - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType7; - this.fpSpread2_Sheet1.Columns.Get(4).DataField = "process"; - this.fpSpread2_Sheet1.Columns.Get(4).Label = "진행"; - this.fpSpread2_Sheet1.Columns.Get(4).Width = 77F; - this.fpSpread2_Sheet1.DataAutoSizeColumns = false; - this.fpSpread2_Sheet1.DataSource = this.bsTodo; - this.fpSpread2_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread2_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // fProjectSchedule // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1118, 704); + this.ClientSize = new System.Drawing.Size(1147, 709); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox3); this.Controls.Add(this.button1); @@ -742,6 +766,7 @@ this.Padding = new System.Windows.Forms.Padding(5); this.Text = "스케쥴 관리"; this.Load += new System.EventHandler(this.fProjectSchedule_Load); + this.SizeChanged += new System.EventHandler(this.fProjectSchedule_SizeChanged); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); @@ -756,11 +781,11 @@ this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread2_Sheet1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsTodo)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bnTodo)).EndInit(); this.bnTodo.ResumeLayout(false); this.bnTodo.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread2_Sheet1)).EndInit(); this.ResumeLayout(false); } @@ -794,7 +819,6 @@ private System.Windows.Forms.BindingSource bs; private dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter ta; private System.Windows.Forms.ToolStripButton toolStripButton1; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Panel panel1; @@ -819,5 +843,7 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.TextBox textBox1; private FarPoint.Win.Spread.SheetView fpSpread2_Sheet1; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton10; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index 99fbba3..bcbb622 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -15,12 +15,34 @@ namespace FPJ0000 int projectindex = 0; EEEntities db; List list; + Boolean bini = false; public fProjectSchedule(int project_) { InitializeComponent(); projectindex = project_; db = new EEEntities();//this.dsPRJ.ProjectsSchedule.TableNewRow += ProjectsSchedule_TableNewRow; fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); + this.FormClosed += FProjectSchedule_FormClosed; + this.FormClosing += FProjectSchedule_FormClosing; + } + + private void FProjectSchedule_FormClosing(object sender, FormClosingEventArgs e) + { + if (dsPRJ.HasChanges()) + { + var dlg = FCOMMON.Util.MsgQ("변경된 자료가 있습니다. 지금 화면을 닫으면 해당 자료는 손실됩니다\n화면을 닫을까요?"); + if (dlg != DialogResult.Yes) + { + e.Cancel = true; + return; + } + } + } + + private void FProjectSchedule_FormClosed(object sender, FormClosedEventArgs e) + { + + this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged; } void ProjectsSchedule_TableNewRow(object sender, DataTableNewRowEventArgs e) @@ -33,7 +55,32 @@ namespace FPJ0000 private void fProjectSchedule_Load(object sender, EventArgs e) { RefreshData(); - + RefreshGraph(); + this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged; + bini = true; + + //시작할떄 cww 를 가져오낟. + var sql = "select dbo.getWorkWeek('" + DateTime.Now.ToShortDateString() + "')"; + var cmd = new System.Data.SqlClient.SqlCommand(sql, this.ta.Connection); + cmd.Connection.Open(); + var wccstr = cmd.ExecuteScalar(); + CWW = int.Parse(wccstr.ToString()); + cmd.Connection.Dispose(); + cmd.Dispose(); + + } + + int CWW = 0; + + private void EETGW_ProjectsSchedule_RowChanged(object sender, DataRowChangeEventArgs e) + { + if (bini == false) return; + RefreshGraph(); + } + + void RefreshGraph() + { + panel1.Invalidate(); } void RefreshData() { @@ -57,11 +104,12 @@ namespace FPJ0000 this.bs.EndEdit(); this.ta.Update(this.dsPRJ.EETGW_ProjectsSchedule); dsPRJ.EETGW_ProjectsSchedule.AcceptChanges(); + RefreshGraph(); } private void fillToolStripButton_Click(object sender, EventArgs e) { - + } @@ -111,6 +159,11 @@ namespace FPJ0000 newdr.seq = this.bs.Count + 1; newdr.gcode = FCOMMON.info.Login.gcode; dsPRJ.EETGW_ProjectsSchedule.AddEETGW_ProjectsScheduleRow(newdr); + + this.bs.EndEdit(); + this.fpSpread1.Focus(); + if (this.bs.Count > 0) + this.bs.Position = this.bs.Count - 1; } private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) @@ -129,7 +182,7 @@ namespace FPJ0000 var drv = this.bs.Current as DataRowView; if (drv == null) return; var dr = drv.Row as dsPRJ.EETGW_ProjectsScheduleRow; - if(dr.idx == -1) + if (dr.idx == -1) { this.fpSpread2.Enabled = false; bnTodo.Enabled = false; @@ -156,6 +209,12 @@ namespace FPJ0000 newdr.pidx = this.projectindex; newdr.pseq = dr.idx; this.dsPRJ.EETGW_ProjectToDo.AddEETGW_ProjectToDoRow(newdr); + + bsTodo.EndEdit(); + this.fpSpread2.Focus(); + + if (this.bsTodo.Count > 0) + this.bsTodo.Position = this.bsTodo.Count - 1; } private void toolStripButton9_Click(object sender, EventArgs e) @@ -171,14 +230,239 @@ namespace FPJ0000 private void toolStripButton8_Click(object sender, EventArgs e) { + this.Validate(); + this.bsTodo.EndEdit(); var cnt = taTodo.Update(this.dsPRJ.EETGW_ProjectToDo); FCOMMON.Util.MsgI($"{cnt}건의 자료가 업데이트 되었습니다"); } private void button1_Click(object sender, EventArgs e) { - this.tam.UpdateAll(this.dsPRJ); - this.Close(); + this.Validate(); + this.bs.EndEdit(); + this.bsTodo.EndEdit(); + if (this.dsPRJ.HasChanges() == false) + { + FCOMMON.Util.MsgE("변경된 내용이 없습니다"); + return; + } + else + { + var cnt = this.tam.UpdateAll(this.dsPRJ); + if (cnt == 0) + { + FCOMMON.Util.MsgE("저장된 자료가 없습니다"); + } + else + { + FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다"); + } + } + + + } + + private void panel1_Paint(object sender, PaintEventArgs e) + { + var list = this.dsPRJ.EETGW_ProjectsSchedule.Where(t => t.RowState != DataRowState.Deleted).Where(t => t.RowState != DataRowState.Detached).OrderBy(t => t.seq).ToList(); + e.Graphics.Clear(Color.DimGray); + //e.Graphics.DrawString(list.Count.ToString(), this.Font, Brushes.White, 10, 10); + var colsize = new int[] { 50 }; + var cols = new List(); + cols.Add("Item"); + + if (list == null || list.Count < 1) return; + + var vsw = list.Max(t => t.sw); + var vew = list.Max(t => t.ew); + var vswa = list.Max(t => t.swa); + var vewa = list.Max(t => t.ewa); + + var maxw = Math.Max(vsw, vew); + maxw = Math.Max(maxw, vswa); + maxw = Math.Max(maxw, vewa); + if (maxw == 0) return; //값이 없다. + + + var mvsw = list.Min(t => t.sw); + var mvew = list.Min(t => t.ew); + var mvswa = list.Min(t => t.swa); + var mvewa = list.Min(t => t.ewa); + + var minw = 999; + if (mvsw > 0) minw = Math.Min(minw, mvsw); + if (mvew > 0) minw = Math.Min(minw, mvew); + if (mvswa > 0) minw = Math.Min(minw, mvswa); + if (mvewa > 0) minw = Math.Min(minw, mvewa); + if (minw == 999) return; //값이 없다. + + + var wwcnt = maxw - minw + 1; + for (int i = 1; i <= wwcnt; i++) + { + cols.Add("ww" + (minw + i - 1).ToString());// + } + + + var rect_title = new Rectangle(3, 3, panel1.Width - 6, 30); + var rect_body = new Rectangle(rect_title.Left, rect_title.Bottom + 1, rect_title.Width, panel1.Height - rect_title.Height - 5); + var lineheight = (rect_body.Height - list.Count * 2) / list.Count; + var linewidth = rect_body.Width;// - 6; + + //제목줄표시 + var ci = 0; + var titlewi = 200f; + var twidth = (rect_title.Width - titlewi) / (cols.Count - 1); + foreach (var col in cols) + { + var titleWidth = ci == 0 ? titlewi : twidth; + var padX = ci > 0 ? ((ci - 1) * twidth + titlewi) : 0; + var rect = new RectangleF(rect_title.Left + padX, rect_title.Top, titleWidth, rect_title.Height); + e.Graphics.DrawRectangle(Pens.Black, rect.Left, rect.Top, rect.Width, rect.Height); + e.Graphics.DrawString(col, this.Font, Brushes.Gold, rect, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); + ci += 1; + } + + for (int i = 0; i < list.Count; i++) + { + var dr = list[i]; + var rect = new RectangleF(rect_body.Left, rect_body.Top + i * lineheight + ((i + 1) * 2), linewidth, lineheight); + + if (i % 2 == 0) + e.Graphics.FillRectangle(Brushes.Gray, rect.Left, rect.Top, rect.Width, rect.Height); + else + e.Graphics.FillRectangle(Brushes.DimGray, rect.Left, rect.Top, rect.Width, rect.Height); + + Color PBg = Color.SkyBlue; + Color ABg = Color.Gold; + var sw = dr.sw; + var ew = dr.ew; + var swa = dr.swa; + var ewa = dr.ewa; + if (sw == 0) { sw = minw; PBg = Color.Transparent; } + if (ew == 0) ew = sw; + + var isEmpty = swa == 0; + if (swa == 0) { swa = minw; ABg = Color.Transparent; }; + var isBusy = ewa == 0; //아직 완료되지 않았다 + if (ewa == 0) ewa = swa; + if (isBusy && ABg != Color.Transparent) ABg = Color.Pink; + + + ci = 0; + foreach (var col in cols) + { + var ww = minw + (ci - 1); + var titleWidth = ci == 0 ? titlewi : twidth; + var padX = ci > 0 ? ((ci - 1) * twidth + titlewi) : 0; + + var rect2 = new RectangleF(rect.Left + padX, rect.Top, titleWidth, rect.Height); + var rect2T = new RectangleF(rect.Left + padX, rect.Top, titleWidth, rect.Height / 2f); + var rect2L = new RectangleF(rect2T.Left, rect2T.Bottom, rect2T.Width, rect2T.Height); + + + var spacing = 3f; + var rect2TP = new RectangleF(rect2T.Left + spacing, rect2T.Top + spacing, rect2T.Width - spacing * 2, rect2T.Height - spacing * 2); + var rect2BP = new RectangleF(rect2L.Left + spacing, rect2L.Top + spacing, rect2L.Width - spacing * 2, rect2L.Height - spacing * 2); + + var str = ci == 0 ? dr.title : ww.ToString(); + if (ci == 0) + { + //e.Graphics.DrawRectangle(Pens.Black, rect2.Left, rect2.Top, rect2.Width, rect2.Height); + e.Graphics.DrawString(str + "\n" + dr.uid, + this.Font, + Brushes.Gold, + rect2, + new StringFormat { Alignment = StringAlignment.Near, LineAlignment = StringAlignment.Center } + ); + } + else + { + //plan + if (ww >= sw && ww <= ew) + e.Graphics.FillRectangle(new SolidBrush(PBg), rect2TP.Left, rect2TP.Top, rect2TP.Width, rect2TP.Height); + + using (Pen p = new Pen(Color.FromArgb(50, 50, 50))) + { + e.Graphics.DrawRectangle(p, rect2TP.Left, rect2TP.Top, rect2TP.Width, rect2TP.Height); + } + + + + //actual + if (ww >= swa && ww <= ewa) + e.Graphics.FillRectangle(new SolidBrush(ABg), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height); + else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW ) + { + e.Graphics.FillRectangle(new SolidBrush(Color.Pink), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height); + } + + + e.Graphics.DrawRectangle(Pens.Black, rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height); + + //title + if (ci == 1) + { + using (Font f = new Font("맑은 고딕", 7, FontStyle.Bold)) + { + var fsizeT = e.Graphics.MeasureString("PLAN", f); + var fsizeB = e.Graphics.MeasureString("ACTUAL", f); + e.Graphics.DrawString("PLAN", f, Brushes.White, rect2TP.Left - fsizeT.Width * 1.1f, rect2TP.Top + (rect2TP.Height - fsizeT.Height) / 2f); + e.Graphics.DrawString("ACTUAL", f, Brushes.White, rect2BP.Left - fsizeB.Width * 1.1f, rect2BP.Top + (rect2BP.Height - fsizeB.Height) / 2f); + } + + } + + } + ci += 1; + } + } + + + } + + private void panel1_MouseClick(object sender, MouseEventArgs e) + { + RefreshGraph(); + } + + private void toolStripButton10_Click(object sender, EventArgs e) + { + //if (this.dsPRJ.EETGW_ProjectsSchedule.Rows.Count > 0) + //{ + // var dlg = FCOMMON.Util.MsgQ("기존 목록을 삭제할까요?"); + // if (dlg == DialogResult.Yes) + // { + // for (int i = this.dsPRJ.EETGW_ProjectsSchedule.Count; i > 0; i--) + // { + // dsPRJ.EETGW_ProjectsSchedule.Rows[i - 1].Delete(); + // } + // } + //} + + + var db = new EEEntities(); + var list = db.Common.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.grp == "21") + .OrderBy(t => t.code) + .ToList(); + + + foreach (var item in list) + { + var newdr = this.dsPRJ.EETGW_ProjectsSchedule.NewEETGW_ProjectsScheduleRow(); + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.seq += dsPRJ.EETGW_ProjectsSchedule.Rows.Count + 1; + newdr.title = item.memo; + newdr.project = this.projectindex; + newdr.gcode = FCOMMON.info.Login.gcode; + dsPRJ.EETGW_ProjectsSchedule.AddEETGW_ProjectsScheduleRow(newdr); + } + } + + private void fProjectSchedule_SizeChanged(object sender, EventArgs e) + { + this.panel1.Invalidate(); } } } diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.resx b/SubProject/FPJ0000/Project/fProjectSchedule.resx index fd293c9..81425ea 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.resx +++ b/SubProject/FPJ0000/Project/fProjectSchedule.resx @@ -223,7 +223,7 @@ - 440, 17 + 1023, 17 239, 17 diff --git a/SubProject/FPJ0000/Project/fSPMaster.Designer.cs b/SubProject/FPJ0000/Project/fSPMaster.Designer.cs index c484aa3..896a5fd 100644 --- a/SubProject/FPJ0000/Project/fSPMaster.Designer.cs +++ b/SubProject/FPJ0000/Project/fSPMaster.Designer.cs @@ -496,12 +496,6 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.DataGridViewTextBoxColumn idxDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn stimeDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn mainDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn projectDataGridViewTextBoxColumn; private FarPoint.Win.Spread.FpSpread fpSpread1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.Panel panel2; diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 4411a12..b1d6033 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -9329,6 +9329,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columnuid; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_ProjectsScheduleDataTable() { @@ -9466,6 +9468,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn uidColumn { + get { + return this.columnuid; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -9503,7 +9513,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public EETGW_ProjectsScheduleRow AddEETGW_ProjectsScheduleRow(string gcode, int project, int seq, string title, int sw, int ew, int swa, int ewa, string memo, int progress, string wuid, System.DateTime wdate) { + public EETGW_ProjectsScheduleRow AddEETGW_ProjectsScheduleRow(string gcode, int project, int seq, string title, int sw, int ew, int swa, int ewa, string memo, int progress, string wuid, System.DateTime wdate, string uid) { EETGW_ProjectsScheduleRow rowEETGW_ProjectsScheduleRow = ((EETGW_ProjectsScheduleRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -9518,7 +9528,8 @@ namespace FPJ0000 { memo, progress, wuid, - wdate}; + wdate, + uid}; rowEETGW_ProjectsScheduleRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_ProjectsScheduleRow); return rowEETGW_ProjectsScheduleRow; @@ -9561,6 +9572,7 @@ namespace FPJ0000 { this.columnprogress = base.Columns["progress"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columnuid = base.Columns["uid"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9592,6 +9604,8 @@ namespace FPJ0000 { 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.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuid); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -9606,6 +9620,7 @@ namespace FPJ0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columnuid.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18148,11 +18163,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int seq { get { - try { - return ((int)(this[this.tableEETGW_ProjectsSchedule.seqColumn])); + if (this.IsseqNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_ProjectsSchedule\' 테이블의 \'seq\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.seqColumn])); } } set { @@ -18180,11 +18195,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int sw { get { - try { - return ((int)(this[this.tableEETGW_ProjectsSchedule.swColumn])); + if (this.IsswNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_ProjectsSchedule\' 테이블의 \'sw\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.swColumn])); } } set { @@ -18196,11 +18211,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int ew { get { - try { - return ((int)(this[this.tableEETGW_ProjectsSchedule.ewColumn])); + if (this.IsewNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_ProjectsSchedule\' 테이블의 \'ew\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.ewColumn])); } } set { @@ -18212,11 +18227,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int swa { get { - try { - return ((int)(this[this.tableEETGW_ProjectsSchedule.swaColumn])); + if (this.IsswaNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_ProjectsSchedule\' 테이블의 \'swa\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.swaColumn])); } } set { @@ -18228,11 +18243,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int ewa { get { - try { - return ((int)(this[this.tableEETGW_ProjectsSchedule.ewaColumn])); + if (this.IsewaNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_ProjectsSchedule\' 테이블의 \'ewa\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.ewaColumn])); } } set { @@ -18260,11 +18275,11 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int progress { get { - try { - return ((int)(this[this.tableEETGW_ProjectsSchedule.progressColumn])); + if (this.IsprogressNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_ProjectsSchedule\' 테이블의 \'progress\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.progressColumn])); } } set { @@ -18294,6 +18309,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string uid { + get { + if (this.IsuidNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_ProjectsSchedule.uidColumn])); + } + } + set { + this[this.tableEETGW_ProjectsSchedule.uidColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsgcodeNull() { @@ -18413,6 +18444,18 @@ namespace FPJ0000 { public void SetprogressNull() { this[this.tableEETGW_ProjectsSchedule.progressColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsuidNull() { + return this.IsNull(this.tableEETGW_ProjectsSchedule.uidColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetuidNull() { + this[this.tableEETGW_ProjectsSchedule.uidColumn] = global::System.Convert.DBNull; + } } /// @@ -33400,10 +33443,11 @@ WHERE (gcode = @gcode)"; tableMapping.ColumnMappings.Add("progress", "progress"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("uid", "uid"); 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_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -33426,10 +33470,12 @@ WHERE (gcode = @gcode)"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", 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_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", 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_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule 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("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -33443,10 +33489,11 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", 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("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", 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_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid))); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule 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("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -33460,6 +33507,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", 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("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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, "", "", "")); @@ -33481,6 +33529,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", 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_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", 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, "", "", "")); } @@ -33498,8 +33548,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, " + - "wdate\r\nFROM EETGW_ProjectsSchedule\r\nWHERE (gcode = @gcode) AND (project = @" + - "project)\r\nORDER BY seq"; + "wdate, uid\r\nFROM EETGW_ProjectsSchedule\r\nWHERE (gcode = @gcode) AND (projec" + + "t = @project)\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, 20, 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("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -33586,7 +33636,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable Original_project, global::System.Nullable Original_seq, string Original_title, global::System.Nullable Original_sw, global::System.Nullable Original_ew, global::System.Nullable Original_swa, global::System.Nullable Original_ewa, global::System.Nullable Original_progress, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable Original_project, global::System.Nullable Original_seq, string Original_title, global::System.Nullable Original_sw, global::System.Nullable Original_ew, global::System.Nullable Original_swa, global::System.Nullable Original_ewa, global::System.Nullable Original_progress, string Original_wuid, System.DateTime Original_wdate, string Original_uid) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -33667,6 +33717,14 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this.Adapter.DeleteCommand.Parameters[19].Value = ((string)(Original_wuid)); } this.Adapter.DeleteCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate)); + if ((Original_uid == null)) { + this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_uid)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -33687,7 +33745,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string gcode, global::System.Nullable project, global::System.Nullable seq, string title, global::System.Nullable sw, global::System.Nullable ew, global::System.Nullable swa, global::System.Nullable ewa, string memo, global::System.Nullable progress, string wuid, System.DateTime wdate) { + public virtual int Insert(string gcode, global::System.Nullable project, global::System.Nullable seq, string title, global::System.Nullable sw, global::System.Nullable ew, global::System.Nullable swa, global::System.Nullable ewa, string memo, global::System.Nullable progress, string wuid, System.DateTime wdate, string uid) { if ((gcode == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -33755,6 +33813,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this.Adapter.InsertCommand.Parameters[10].Value = ((string)(wuid)); } this.Adapter.InsertCommand.Parameters[11].Value = ((System.DateTime)(wdate)); + if ((uid == null)) { + this.Adapter.InsertCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[12].Value = ((string)(uid)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -33788,6 +33852,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, global::System.Nullable progress, string wuid, System.DateTime wdate, + string uid, int Original_idx, string Original_gcode, global::System.Nullable Original_project, @@ -33800,6 +33865,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, global::System.Nullable Original_progress, string Original_wuid, System.DateTime Original_wdate, + string Original_uid, int idx) { if ((gcode == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -33868,87 +33934,101 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(wuid)); } this.Adapter.UpdateCommand.Parameters[11].Value = ((System.DateTime)(wdate)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_idx)); - if ((Original_gcode == null)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + if ((uid == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(uid)); + } + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx)); + if ((Original_gcode == null)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_gcode)); } if ((Original_project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_project.Value)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_project.Value)); } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } if ((Original_seq.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_seq.Value)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_seq.Value)); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } if ((Original_title == null)) { - this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_title)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_title)); } if ((Original_sw.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_sw.Value)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_sw.Value)); } else { - this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } if ((Original_ew.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_ew.Value)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_ew.Value)); } else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } if ((Original_swa.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_swa.Value)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_swa.Value)); } else { - this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } if ((Original_ewa.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_ewa.Value)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_ewa.Value)); } else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } if ((Original_progress.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_progress.Value)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_progress.Value)); } else { - this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[32].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((System.DateTime)(Original_wdate)); + if ((Original_uid == null)) { + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_uid)); + } + this.Adapter.UpdateCommand.Parameters[36].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -33982,6 +34062,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, global::System.Nullable progress, string wuid, System.DateTime wdate, + string uid, int Original_idx, string Original_gcode, global::System.Nullable Original_project, @@ -33993,8 +34074,9 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, global::System.Nullable Original_ewa, global::System.Nullable Original_progress, string Original_wuid, - System.DateTime Original_wdate) { - return this.Update(gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, Original_idx, Original_gcode, Original_project, Original_seq, Original_title, Original_sw, Original_ew, Original_swa, Original_ewa, Original_progress, Original_wuid, Original_wdate, Original_idx); + System.DateTime Original_wdate, + string Original_uid) { + return this.Update(gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, Original_idx, Original_gcode, Original_project, Original_seq, Original_title, Original_sw, Original_ew, Original_swa, Original_ewa, Original_progress, Original_wuid, Original_wdate, Original_uid, Original_idx); } } @@ -34025,7 +34107,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.IDbCommand[1]; + this._commandCollection = new global::System.Data.IDbCommand[2]; 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::FPJ0000.Properties.Settings.Default.gwcs); ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "dbo.CopyProjectData"; @@ -34034,6 +34116,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userno", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@newid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.InputOutput, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FPJ0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = "dbo.getWorkWeek"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandType = global::System.Data.CommandType.StoredProcedure; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.VarChar, 6, global::System.Data.ParameterDirection.ReturnValue, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@datevalue", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -34082,6 +34170,40 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, } return returnValue; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual object getWorkWeek(string datevalue) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[1])); + if ((datevalue == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(datevalue)); + } + 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 ((object)(returnValue)); + } + } } /// diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index b3038c9..4bbfc43 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -2535,7 +2535,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, - DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid))) @@ -2558,13 +2558,15 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, + + - INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq + INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq @@ -2578,12 +2580,13 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + - - SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate + + SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (gcode = @gcode) AND (project = @project) ORDER BY seq @@ -2595,8 +2598,8 @@ ORDER BY seq - UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq + UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid))); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq @@ -2610,6 +2613,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + @@ -2631,6 +2635,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + + @@ -2651,6 +2657,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + @@ -2669,6 +2676,17 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + + + + dbo.getWorkWeek + + + + + + + @@ -2676,7 +2694,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -2914,7 +2932,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -2958,7 +2976,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3003,7 +3021,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3119,7 +3137,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3244,7 +3262,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3282,7 +3300,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3398,7 +3416,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3449,7 +3467,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3462,7 +3480,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3632,7 +3650,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3809,7 +3827,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3854,7 +3872,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3919,11 +3937,11 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + - + @@ -4113,7 +4131,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -4252,7 +4270,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -4264,7 +4282,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -4272,10 +4290,10 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - - - - + + + + @@ -4283,7 +4301,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -4292,6 +4310,13 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + + + + + + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 52b22d6..6d94cc4 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,25 +4,25 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + - + - + - - - - - - - + + + + + + + \ No newline at end of file