diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d0ff2dd..4974d52 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("23.03.08.1300")] -[assembly: AssemblyFileVersion("23.03.08.1300")] +[assembly: AssemblyVersion("23.03.17.1300")] +[assembly: AssemblyFileVersion("23.03.17.1300")] diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs index da07068..7797534 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs @@ -30,34 +30,34 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseNR)); - 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.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = 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 numberCellType8 = 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 textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = 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(); @@ -856,7 +856,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 = textCellType20; 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 = "등록일"; @@ -865,7 +865,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 = textCellType21; 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 = "상태"; @@ -873,27 +873,27 @@ 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 = textCellType22; 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 = "Storage"; 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 = textCellType23; 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 = textCellType24; 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 = textCellType25; 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#"; @@ -901,183 +901,183 @@ 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).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType26; 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 = "SCR/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 = textCellType27; 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 = textCellType28; 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 = textCellType29; 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; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType9; 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 = textCellType30; 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 = textCellType31; 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 = textCellType31; 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 = textCellType31; 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; + numberCellType10.DecimalPlaces = 0; + numberCellType10.NegativeRed = true; + numberCellType10.NullDisplay = "--"; + numberCellType10.Separator = ","; + numberCellType10.ShowSeparator = true; + numberCellType10.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType10; 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 = textCellType32; 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 = 2; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; + numberCellType11.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumpriceD"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - 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; + numberCellType12.DecimalPlaces = 0; + numberCellType12.MaximumValue = 9999999999999.99D; + numberCellType12.MinimumValue = -9999999999999.99D; + numberCellType12.NegativeRed = true; + numberCellType12.NullDisplay = "--"; + numberCellType12.Separator = ","; + numberCellType12.ShowSeparator = true; + numberCellType12.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice"; 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 = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5; + numberCellType13.DecimalPlaces = 0; + numberCellType13.MaximumValue = 9999999999999.99D; + numberCellType13.MinimumValue = -9999999999999.99D; + numberCellType13.NegativeRed = true; + numberCellType13.NullDisplay = "--"; + numberCellType13.Separator = ","; + numberCellType13.ShowSeparator = true; + numberCellType13.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType13; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(19).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(21).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(21).CellType = numberCellType6; + numberCellType14.DecimalPlaces = 0; + numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType14.MaximumValue = 2147483647D; + numberCellType14.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType34; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(22).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType7; + numberCellType15.DecimalPlaces = 0; + numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType15.MaximumValue = 2147483647D; + numberCellType15.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType35; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(24).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType36; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "edate"; 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).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType37; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "indate"; 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 = "indate"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.NegativeRed = true; - numberCellType8.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType8; + numberCellType16.DecimalPlaces = 0; + numberCellType16.NegativeRed = true; + numberCellType16.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(27).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType38; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(28).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = checkBoxCellType2; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(29).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(29).Tag = "isdel"; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx index 8ef2df4..cda1ffa 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx @@ -279,6 +279,20 @@ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= @@ -318,20 +332,6 @@ oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA Ow== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index d4f8ac5..60ac6a4 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -707,7 +707,10 @@ namespace FEQ0000 dr.po = tbPO.Text; dr.orderno = tbOrderNo.Text; dr.bigo = tbBigo.Text; - dr.inqty = int.Parse(tbInQty.Text.Replace(",", "")); + + if (chkInDate.Checked) + dr.inqty = int.Parse(tbInQty.Text.Replace(",", "")); + else dr.SetinqtyNull(); //품정보가 업데이트 되어있으면 해당 데이터의 이미지를 업데이트 한다.(크기비교) //품정보가 없다면 그대로 생성을 해준다. diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs index 99bbe6a..d74bb69 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs @@ -30,33 +30,33 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseCR)); - 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = 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.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = 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.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = 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.EETGW_PurchaseCRTableAdapter(); @@ -863,7 +863,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 35F; 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 = textCellType19; 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).Tag = "pdate"; @@ -871,195 +871,195 @@ 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 = textCellType20; 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).Tag = "state"; 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 = textCellType21; 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).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 = textCellType22; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Tag = "sc"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Tag = "crcf"; 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 = textCellType25; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(7).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(7).CellType = numberCellType1; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType26; 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(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale"; 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 = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2; + numberCellType10.DecimalPlaces = 0; + numberCellType10.NegativeRed = true; + numberCellType10.NullDisplay = "--"; + numberCellType10.Separator = ","; + numberCellType10.ShowSeparator = true; + numberCellType10.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - numberCellType3.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + numberCellType11.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(12).Label = "단가($)"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - 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(13).CellType = numberCellType4; + numberCellType12.DecimalPlaces = 0; + numberCellType12.MaximumValue = 9999999999999.99D; + numberCellType12.MinimumValue = -9999999999999.99D; + numberCellType12.NegativeRed = true; + numberCellType12.NullDisplay = "--"; + numberCellType12.Separator = ","; + numberCellType12.ShowSeparator = true; + numberCellType12.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(13).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType5; + numberCellType13.DecimalPlaces = 0; + numberCellType13.MaximumValue = 9999999999999.99D; + numberCellType13.MinimumValue = -9999999999999.99D; + numberCellType13.NegativeRed = true; + numberCellType13.NullDisplay = "--"; + numberCellType13.Separator = ","; + numberCellType13.ShowSeparator = true; + numberCellType13.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType13; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(14).Label = "금액"; this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(15).Label = "공급"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(16).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(16).CellType = numberCellType6; + numberCellType14.DecimalPlaces = 0; + numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType14.MaximumValue = 2147483647D; + numberCellType14.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Visible = false; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(17).Tag = "project"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7; + numberCellType15.DecimalPlaces = 0; + numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType15.MaximumValue = 2147483647D; + numberCellType15.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(18).Visible = false; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "edate"; 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).Tag = "edate"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(21).Label = "수령인"; this.fpSpread1_Sheet1.Columns.Get(21).Tag = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType34; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "indate"; 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 = "indate"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.NegativeRed = true; - numberCellType8.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType8; + numberCellType16.DecimalPlaces = 0; + numberCellType16.NegativeRed = true; + numberCellType16.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "inqty"; 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 = textCellType35; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "inremark"; this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(24).Tag = "inremark"; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType36; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = checkBoxCellType2; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "isdel"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; @@ -1073,7 +1073,6 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.ClientSize = new System.Drawing.Size(1226, 678); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.label1); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx index 1123464..67d9eed 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.resx @@ -264,6 +264,20 @@ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= @@ -293,20 +307,6 @@ Fk1ewf+wkhYCU+RewanMXpt+zbaz3+b9IL/SdUzYafEIgu51zxq2HGa9kXLNrtkxa7BDt8uaheZgk7dQ 5HQH43Lt7Gwe4Xf89AhOpMrTAkRd3YFiuSlA3EV5EHVRxwn+ok43Qo6No4KOHn9BRzIAnz/8M/0zf/tL eAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index bf36aaa..2272af2 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -212,6 +212,7 @@ namespace FPJ0000 FCOMMON.DBM.buyinfo TotInfo = new FCOMMON.DBM.buyinfo(); + List sidlist = new List(); for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { var v_supply = string.Empty; @@ -227,7 +228,21 @@ namespace FPJ0000 if (db_supply != null) v_supply = db_supply.ToString().Trim(); //해당 자료의 CR구매현황을 확인한다(gcode,project,sid) - var sidinfo = FCOMMON.DBM.GetPartBuyInfo(project, v_sid); + FCOMMON.DBM.buyinfo sidinfo; + if (sidlist.Contains(v_sid)) + { + //한번 계산했던 SID이다 + sidinfo = new FCOMMON.DBM.buyinfo(); + row.ForeColor = Color.Gray; + row.BackColor = Color.WhiteSmoke; + continue; + } + else + { + sidinfo = FCOMMON.DBM.GetPartBuyInfo(project, v_sid); + sidlist.Add(v_sid); + } + fpSpread1.ActiveSheet.Cells[i, col_buyqty].Value = sidinfo.Total_Request; fpSpread1.ActiveSheet.Cells[i, col_inqty].Value = sidinfo.Total_Buy; diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 9e186ed..7926571 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -57,8 +57,8 @@ System.Windows.Forms.Label label16; System.Windows.Forms.Label label17; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -314,7 +314,7 @@ // usersubLabel.AutoSize = true; usersubLabel.Font = new System.Drawing.Font("맑은 고딕", 12F); - usersubLabel.Location = new System.Drawing.Point(53, 141); + usersubLabel.Location = new System.Drawing.Point(53, 113); usersubLabel.Name = "usersubLabel"; usersubLabel.Size = new System.Drawing.Size(40, 21); usersubLabel.TabIndex = 26; @@ -428,7 +428,7 @@ // label8.AutoSize = true; label8.Font = new System.Drawing.Font("맑은 고딕", 12F); - label8.Location = new System.Drawing.Point(35, 113); + label8.Location = new System.Drawing.Point(35, 85); label8.Name = "label8"; label8.Size = new System.Drawing.Size(58, 21); label8.TabIndex = 87; @@ -448,11 +448,13 @@ // label7.AutoSize = true; label7.Font = new System.Drawing.Font("맑은 고딕", 12F); - label7.Location = new System.Drawing.Point(13, 87); + label7.ForeColor = System.Drawing.Color.Red; + label7.Location = new System.Drawing.Point(13, 145); label7.Name = "label7"; label7.Size = new System.Drawing.Size(80, 21); label7.TabIndex = 89; label7.Text = "Assembly"; + label7.Visible = false; // // label10 // @@ -616,7 +618,7 @@ this.usersubTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true)); this.usersubTextBox.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.usersubTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.usersubTextBox.Location = new System.Drawing.Point(353, 138); + this.usersubTextBox.Location = new System.Drawing.Point(353, 110); this.usersubTextBox.Name = "usersubTextBox"; this.usersubTextBox.Size = new System.Drawing.Size(185, 25); this.usersubTextBox.TabIndex = 27; @@ -678,7 +680,7 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(485, 327); + this.remark_reqTextBox.Size = new System.Drawing.Size(485, 304); this.remark_reqTextBox.TabIndex = 49; // // tbXdate @@ -722,7 +724,7 @@ this.btPath, this.btSendMail, this.toolStripButton8}); - this.bn.Location = new System.Drawing.Point(0, 726); + this.bn.Location = new System.Drawing.Point(0, 703); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -767,7 +769,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"; @@ -918,8 +919,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle5; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -1313,18 +1314,20 @@ this.panel5.Controls.Add(this.userManagerTextBox); this.panel5.Location = new System.Drawing.Point(6, 309); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(547, 168); + this.panel5.Size = new System.Drawing.Size(547, 139); this.panel5.TabIndex = 85; // // textBox10 // this.textBox10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userAssembly", true)); this.textBox10.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.textBox10.ForeColor = System.Drawing.Color.Red; this.textBox10.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox10.Location = new System.Drawing.Point(353, 83); + this.textBox10.Location = new System.Drawing.Point(353, 141); this.textBox10.Name = "textBox10"; this.textBox10.Size = new System.Drawing.Size(185, 25); this.textBox10.TabIndex = 96; + this.textBox10.Visible = false; // // cmbSW // @@ -1337,7 +1340,7 @@ this.cmbSW.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSW.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbSW.FormattingEnabled = true; - this.cmbSW.Location = new System.Drawing.Point(101, 138); + this.cmbSW.Location = new System.Drawing.Point(101, 110); this.cmbSW.Margin = new System.Windows.Forms.Padding(4); this.cmbSW.Name = "cmbSW"; this.cmbSW.Size = new System.Drawing.Size(249, 25); @@ -1365,7 +1368,7 @@ this.cmbEpanel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbEpanel.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbEpanel.FormattingEnabled = true; - this.cmbEpanel.Location = new System.Drawing.Point(101, 110); + this.cmbEpanel.Location = new System.Drawing.Point(101, 82); this.cmbEpanel.Margin = new System.Windows.Forms.Padding(4); this.cmbEpanel.Name = "cmbEpanel"; this.cmbEpanel.Size = new System.Drawing.Size(249, 25); @@ -1387,13 +1390,15 @@ this.cmbAssembly.DisplayMember = "IDName"; this.cmbAssembly.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbAssembly.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.cmbAssembly.ForeColor = System.Drawing.Color.Red; this.cmbAssembly.FormattingEnabled = true; - this.cmbAssembly.Location = new System.Drawing.Point(101, 82); + this.cmbAssembly.Location = new System.Drawing.Point(101, 140); this.cmbAssembly.Margin = new System.Windows.Forms.Padding(4); this.cmbAssembly.Name = "cmbAssembly"; this.cmbAssembly.Size = new System.Drawing.Size(249, 25); this.cmbAssembly.TabIndex = 93; this.cmbAssembly.ValueMember = "ID"; + this.cmbAssembly.Visible = false; // // bsAssembly // @@ -1451,7 +1456,7 @@ this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true)); this.textBox3.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.textBox3.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox3.Location = new System.Drawing.Point(353, 110); + this.textBox3.Location = new System.Drawing.Point(353, 82); this.textBox3.Name = "textBox3"; this.textBox3.Size = new System.Drawing.Size(185, 25); this.textBox3.TabIndex = 88; @@ -1520,7 +1525,7 @@ this.panel2.Controls.Add(this.tbXdate); this.panel2.Controls.Add(this.tbEdate); this.panel2.Controls.Add(this.tbODate); - this.panel2.Location = new System.Drawing.Point(6, 481); + this.panel2.Location = new System.Drawing.Point(6, 454); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(547, 126); this.panel2.TabIndex = 86; @@ -1706,7 +1711,7 @@ this.panel3.Controls.Add(costnLabel); this.panel3.Controls.Add(this.costoTextBox); this.panel3.Controls.Add(costoLabel); - this.panel3.Location = new System.Drawing.Point(6, 611); + this.panel3.Location = new System.Drawing.Point(6, 586); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(546, 86); this.panel3.TabIndex = 86; @@ -1825,7 +1830,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(487, 352); + this.arPanel1.Size = new System.Drawing.Size(487, 329); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1928,7 +1933,6 @@ // this.bindingNavigatorPositionItem1.AccessibleName = "위치"; this.bindingNavigatorPositionItem1.AutoSize = false; - this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem1.Text = "0"; @@ -2303,7 +2307,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1058, 726); + this.tabControl1.Size = new System.Drawing.Size(1058, 703); this.tabControl1.TabIndex = 93; // // tabPage1 @@ -2318,7 +2322,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1050, 700); + this.tabPage1.Size = new System.Drawing.Size(1050, 677); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "일반사항"; this.tabPage1.UseVisualStyleBackColor = true; @@ -2329,7 +2333,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); - this.tabControl2.Location = new System.Drawing.Point(559, 365); + this.tabControl2.Location = new System.Drawing.Point(559, 342); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; this.tabControl2.Size = new System.Drawing.Size(488, 329); @@ -2435,8 +2439,8 @@ // this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn5.DataPropertyName = "remark"; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle6; this.dataGridViewTextBoxColumn5.HeaderText = "비고"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.ReadOnly = true; @@ -2511,7 +2515,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"; @@ -2675,7 +2678,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1058, 751); + this.ClientSize = new System.Drawing.Size(1058, 728); this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); this.MinimizeBox = false; diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 7dbd4b3..d970018 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -201,6 +201,12 @@ 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -356,9 +362,30 @@ 449, 17 + + 449, 17 + 676, 56 + + 537, 56 + + + 398, 56 + + + 259, 56 + + + 120, 56 + + + 676, 56 + + + 17, 56 + 17, 56 @@ -377,6 +404,9 @@ 566, 17 + + 566, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -456,6 +486,12 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + 922, 17 + + + 722, 17 + 722, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 2f9dbac..15187ac 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -60,7 +60,6 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -166,6 +165,7 @@ this.label19 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); + this.label30 = new System.Windows.Forms.Label(); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.prb1 = new arCtl.arLabel(); @@ -660,7 +660,7 @@ this.fpSpread1.Size = new System.Drawing.Size(1585, 520); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; - this.fpSpread1.SetViewportLeftColumn(0, 0, 7); + this.fpSpread1.SetViewportLeftColumn(0, 0, 6); // // fpSpread1_Sheet1 // @@ -668,7 +668,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 = 32; + this.fpSpread1_Sheet1.ColumnCount = 31; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -688,13 +688,13 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 5; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 4; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "Ext.Info"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site"; @@ -717,15 +717,14 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "S/W"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "Design"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Assembly"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "ePanel"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "Champion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "History"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Memo"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Asset"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Model#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "Serial#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "자스민"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "ePanel"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "Champion"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "History"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Memo"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Asset"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Model#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Serial#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "자스민"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); @@ -873,53 +872,47 @@ this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_assembly"; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_epanel"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "Assembly"; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "ePanel"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel"; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_champion"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel"; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "Champion"; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion"; - this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion"; - this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory"; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "History"; this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "lasthistory"; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "History"; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo"; + this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F; this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "Memo"; - this.fpSpread1_Sheet1.Columns.Get(27).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset"; + this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).Label = "Asset"; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#"; this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).Label = "Model#"; + this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#"; this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType23; - this.fpSpread1_Sheet1.Columns.Get(30).DataField = "serial"; - this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(30).Label = "Serial#"; - this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType9.DecimalPlaces = 0; numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType9.MaximumValue = 2147483647D; numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(31).DataField = "jasmin"; - this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(31).Label = "자스민"; - this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "jasmin"; + this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(30).Label = "자스민"; + this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -1403,6 +1396,7 @@ this.panel2.Controls.Add(this.label19); this.panel2.Controls.Add(this.label18); this.panel2.Controls.Add(this.label28); + this.panel2.Controls.Add(this.label30); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(1, 47); this.panel2.Margin = new System.Windows.Forms.Padding(0); @@ -1414,7 +1408,7 @@ // this.button2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "jasmin", true)); this.button2.Dock = System.Windows.Forms.DockStyle.Left; - this.button2.Location = new System.Drawing.Point(1122, 0); + this.button2.Location = new System.Drawing.Point(1244, 0); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(100, 31); this.button2.TabIndex = 13; @@ -1428,7 +1422,7 @@ this.label29.Dock = System.Windows.Forms.DockStyle.Left; this.label29.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label29.ForeColor = System.Drawing.Color.Black; - this.label29.Location = new System.Drawing.Point(1048, 0); + this.label29.Location = new System.Drawing.Point(1170, 0); this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(74, 31); this.label29.TabIndex = 12; @@ -1441,7 +1435,7 @@ this.label27.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_software", true)); this.label27.Dock = System.Windows.Forms.DockStyle.Left; this.label27.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label27.Location = new System.Drawing.Point(928, 0); + this.label27.Location = new System.Drawing.Point(1050, 0); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(120, 31); this.label27.TabIndex = 10; @@ -1455,7 +1449,7 @@ this.label26.Dock = System.Windows.Forms.DockStyle.Left; this.label26.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label26.ForeColor = System.Drawing.Color.Black; - this.label26.Location = new System.Drawing.Point(854, 0); + this.label26.Location = new System.Drawing.Point(976, 0); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(74, 31); this.label26.TabIndex = 9; @@ -1468,7 +1462,7 @@ this.label25.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_epanel", true)); this.label25.Dock = System.Windows.Forms.DockStyle.Left; this.label25.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label25.Location = new System.Drawing.Point(734, 0); + this.label25.Location = new System.Drawing.Point(856, 0); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(120, 31); this.label25.TabIndex = 8; @@ -1482,7 +1476,7 @@ this.label24.Dock = System.Windows.Forms.DockStyle.Left; this.label24.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label24.ForeColor = System.Drawing.Color.Black; - this.label24.Location = new System.Drawing.Point(660, 0); + this.label24.Location = new System.Drawing.Point(782, 0); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(74, 31); this.label24.TabIndex = 7; @@ -1495,34 +1489,37 @@ this.label23.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_assembly", true)); this.label23.Dock = System.Windows.Forms.DockStyle.Left; this.label23.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label23.Location = new System.Drawing.Point(540, 0); + this.label23.ForeColor = System.Drawing.Color.Red; + this.label23.Location = new System.Drawing.Point(662, 0); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(120, 31); this.label23.TabIndex = 6; this.label23.Text = "(담당자이름)"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.toolTip1.SetToolTip(this.label23, "시작일"); + this.label23.Visible = false; // // label22 // this.label22.BackColor = System.Drawing.Color.Silver; this.label22.Dock = System.Windows.Forms.DockStyle.Left; this.label22.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label22.ForeColor = System.Drawing.Color.Black; - this.label22.Location = new System.Drawing.Point(466, 0); + this.label22.ForeColor = System.Drawing.Color.Red; + this.label22.Location = new System.Drawing.Point(588, 0); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(74, 31); this.label22.TabIndex = 5; this.label22.Text = "Assembly"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.toolTip1.SetToolTip(this.label22, "시작일"); + this.label22.Visible = false; // // label21 // this.label21.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_design", true)); this.label21.Dock = System.Windows.Forms.DockStyle.Left; this.label21.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label21.Location = new System.Drawing.Point(346, 0); + this.label21.Location = new System.Drawing.Point(468, 0); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(120, 31); this.label21.TabIndex = 4; @@ -1536,7 +1533,7 @@ this.label20.Dock = System.Windows.Forms.DockStyle.Left; this.label20.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label20.ForeColor = System.Drawing.Color.Black; - this.label20.Location = new System.Drawing.Point(272, 0); + this.label20.Location = new System.Drawing.Point(394, 0); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(74, 31); this.label20.TabIndex = 3; @@ -1549,7 +1546,7 @@ this.label19.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_champion", true)); this.label19.Dock = System.Windows.Forms.DockStyle.Left; this.label19.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label19.Location = new System.Drawing.Point(152, 0); + this.label19.Location = new System.Drawing.Point(274, 0); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(120, 31); this.label19.TabIndex = 2; @@ -1563,7 +1560,7 @@ this.label18.Dock = System.Windows.Forms.DockStyle.Left; this.label18.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label18.ForeColor = System.Drawing.Color.Black; - this.label18.Location = new System.Drawing.Point(78, 0); + this.label18.Location = new System.Drawing.Point(200, 0); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(74, 31); this.label18.TabIndex = 1; @@ -1573,17 +1570,32 @@ // // label28 // - this.label28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.label28.BackColor = System.Drawing.SystemColors.Control; + this.label28.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true)); this.label28.Dock = System.Windows.Forms.DockStyle.Left; - this.label28.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold); - this.label28.Location = new System.Drawing.Point(0, 0); + this.label28.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold); + this.label28.Location = new System.Drawing.Point(74, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(78, 31); + this.label28.Size = new System.Drawing.Size(126, 31); this.label28.TabIndex = 11; this.label28.Text = "담당자"; this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.toolTip1.SetToolTip(this.label28, "시작일"); // + // label30 + // + this.label30.BackColor = System.Drawing.Color.Silver; + this.label30.Dock = System.Windows.Forms.DockStyle.Left; + this.label30.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label30.ForeColor = System.Drawing.Color.Black; + this.label30.Location = new System.Drawing.Point(0, 0); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(74, 31); + this.label30.TabIndex = 14; + this.label30.Text = "Request"; + this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label30, "시작일"); + // // taHist // this.taHist.ClearBeforeFill = true; @@ -2038,8 +2050,9 @@ private System.Windows.Forms.Label label25; private System.Windows.Forms.Label label27; private System.Windows.Forms.Label label28; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Label label29; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.Label label30; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 8173c21..c412360 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -595,7 +595,8 @@ namespace FPJ0000 newdr.wdate = DateTime.Now; newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd"); newdr.sdate = DateTime.Now.ToString("yyyy-MM-dd"); - newdr.userManager = FCOMMON.info.Login.nameK; + //newdr.userManager = FCOMMON.info.Login.nameK; + newdr.championid = FCOMMON.info.Login.no; newdr.progress = 0; newdr.userprocess = FCOMMON.info.Login.process; newdr.costn = 0; diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs index 07438f8..829fba0 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs @@ -49,6 +49,7 @@ System.Windows.Forms.Label label10; System.Windows.Forms.Label label11; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSaveCostData)); + System.Windows.Forms.Label label12; this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -103,6 +104,7 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.arLabel7 = new arCtl.arLabel(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_SaveCostTableAdapter(); + this.textBox5 = new System.Windows.Forms.TextBox(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); userManagerLabel = new System.Windows.Forms.Label(); @@ -122,6 +124,7 @@ label9 = new System.Windows.Forms.Label(); label10 = new System.Windows.Forms.Label(); label11 = new System.Windows.Forms.Label(); + label12 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -426,7 +429,7 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(451, 327); + this.remark_reqTextBox.Size = new System.Drawing.Size(451, 355); this.remark_reqTextBox.TabIndex = 49; // // assetTextBox @@ -455,7 +458,7 @@ this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, this.btSave}); - this.bn.Location = new System.Drawing.Point(0, 508); + this.bn.Location = new System.Drawing.Point(0, 536); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -500,7 +503,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"; @@ -818,6 +820,8 @@ // panel3 // this.panel3.BackColor = System.Drawing.Color.Gainsboro; + this.panel3.Controls.Add(this.textBox5); + this.panel3.Controls.Add(label12); this.panel3.Controls.Add(this.textBox3); this.panel3.Controls.Add(label10); this.panel3.Controls.Add(this.textBox4); @@ -833,7 +837,7 @@ this.panel3.Controls.Add(costoLabel); this.panel3.Location = new System.Drawing.Point(6, 390); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(546, 85); + this.panel3.Size = new System.Drawing.Size(546, 113); this.panel3.TabIndex = 86; // // textBox3 @@ -967,7 +971,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(453, 352); + this.arPanel1.Size = new System.Drawing.Size(453, 380); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -982,6 +986,7 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; @@ -1002,7 +1007,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1026, 508); + this.tabControl1.Size = new System.Drawing.Size(1026, 536); this.tabControl1.TabIndex = 93; // // tabPage1 @@ -1015,7 +1020,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1018, 482); + this.tabPage1.Size = new System.Drawing.Size(1018, 510); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "일반사항"; this.tabPage1.UseVisualStyleBackColor = true; @@ -1112,11 +1117,29 @@ // this.ta.ClearBeforeFill = true; // + // textBox5 + // + this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sfi", true)); + this.textBox5.Location = new System.Drawing.Point(93, 86); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(88, 21); + this.textBox5.TabIndex = 92; + this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label12 + // + label12.AutoSize = true; + label12.Location = new System.Drawing.Point(62, 91); + label12.Name = "label12"; + label12.Size = new System.Drawing.Size(23, 12); + label12.TabIndex = 91; + label12.Text = "SFI"; + // // fSaveCostData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1026, 533); + this.ClientSize = new System.Drawing.Size(1026, 561); this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); this.MinimizeBox = false; @@ -1201,5 +1224,6 @@ private System.Windows.Forms.CheckBox fanoutCheckBox; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.TextBox textBox5; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.resx b/SubProject/FPJ0000/SaveCost/fSaveCostData.resx index 82c4262..3e6f79d 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.resx +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.resx @@ -245,10 +245,16 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + False + 164, 17 303, 17 + + False + \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs index e415ed1..17a4430 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs @@ -39,6 +39,7 @@ 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 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(); @@ -84,7 +85,6 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.엑셀파일로저장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); @@ -115,18 +115,19 @@ this.panel3 = new System.Windows.Forms.Panel(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_SaveCostTableAdapter(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -213,7 +214,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"; @@ -304,7 +304,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); @@ -437,172 +436,6 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 19; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "등록일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "항목"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청자"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "담당자"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "InHouse($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "완료일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Part"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Work Group"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "process/Equipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Site"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Category"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Sub Category"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Fan\r\nOut"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "High\r\nLight"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - 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 = "등록일"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "항목"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청파트"; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "reqstaff"; - 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 = 78F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "담당자"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "수량"; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Original\r\n($K)"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "InHouse($K)"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "effect"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "edate"; - 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).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "eepart"; - this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Part"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "workgroup"; - this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "Work Group"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "process/Equipment"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "site"; - this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "Site"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "category"; - this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "Category"; - 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)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "subcate"; - this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "Sub Category"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(17).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "fanout"; - this.fpSpread1_Sheet1.Columns.Get(17).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "Fan\r\nOut"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "fanout"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(18).CellType = checkBoxCellType2; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "weekly"; - this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "High\r\nLight"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "weekly"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -635,7 +468,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 27); this.dtSD.Text = "1982-11-23"; @@ -650,7 +482,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 27); this.dtED.Text = "1982-11-23"; @@ -671,7 +502,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, 27); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -937,6 +767,8 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; this.tam.JobReportTableAdapter = null; @@ -953,6 +785,180 @@ // this.ta.ClearBeforeFill = true; // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 20; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "등록일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "항목"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "담당자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "InHouse($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "SFI"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "완료일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Part"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Work Group"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "process/Equipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Site"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Category"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Sub Category"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Fan\r\nOut"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "High\r\nLight"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + 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 = "등록일"; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "항목"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청파트"; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "reqstaff"; + 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 = 78F; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "담당자"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "수량"; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Original\r\n($K)"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "InHouse($K)"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "effect"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sfi"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "SFI"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "완료일"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "eepart"; + this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "Part"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "workgroup"; + this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "Work Group"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "process/Equipment"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "site"; + this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "Site"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "category"; + this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "Category"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "subcate"; + this.fpSpread1_Sheet1.Columns.Get(17).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "Sub Category"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(18).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "fanout"; + this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "Fan\r\nOut"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "fanout"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(19).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "weekly"; + this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "High\r\nLight"; + this.fpSpread1_Sheet1.Columns.Get(19).Tag = "weekly"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // fSaveCostList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -973,13 +979,13 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); this.panel4.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1050,8 +1056,8 @@ private System.Windows.Forms.ToolStripTextBox dtSD; private System.Windows.Forms.ToolStripLabel lbEnd; private System.Windows.Forms.ToolStripTextBox dtED; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton toolStripButton2; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 3b44fe0..16b89e5 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -6101,6 +6101,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnaft_time; + private global::System.Data.DataColumn columnsfi; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_SaveCostDataTable() : @@ -6415,6 +6417,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 sfiColumn { + get { + return this.columnsfi; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -6485,7 +6495,8 @@ namespace FPJ0000 { bool fanout, bool weekly, double bef_time, - double aft_time) { + double aft_time, + double sfi) { EETGW_SaveCostRow rowEETGW_SaveCostRow = ((EETGW_SaveCostRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -6521,7 +6532,8 @@ namespace FPJ0000 { fanout, weekly, bef_time, - aft_time}; + aft_time, + sfi}; rowEETGW_SaveCostRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_SaveCostRow); return rowEETGW_SaveCostRow; @@ -6561,7 +6573,8 @@ namespace FPJ0000 { bool fanout, bool weekly, double bef_time, - double aft_time) { + double aft_time, + double sfi) { EETGW_SaveCostRow rowEETGW_SaveCostRow = ((EETGW_SaveCostRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -6597,7 +6610,8 @@ namespace FPJ0000 { fanout, weekly, bef_time, - aft_time}; + aft_time, + sfi}; rowEETGW_SaveCostRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_SaveCostRow); return rowEETGW_SaveCostRow; @@ -6661,6 +6675,7 @@ namespace FPJ0000 { this.columnweekly = base.Columns["weekly"]; this.columnbef_time = base.Columns["bef_time"]; this.columnaft_time = base.Columns["aft_time"]; + this.columnsfi = base.Columns["sfi"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6734,6 +6749,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnbef_time); this.columnaft_time = new global::System.Data.DataColumn("aft_time", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnaft_time); + this.columnsfi = new global::System.Data.DataColumn("sfi", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -17294,6 +17311,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double sfi { + get { + if (this.IssfiNull()) { + return 0D; + } + else { + return ((double)(this[this.tableEETGW_SaveCost.sfiColumn])); + } + } + set { + this[this.tableEETGW_SaveCost.sfiColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsisdelNull() { @@ -17653,6 +17686,18 @@ namespace FPJ0000 { public void Setaft_timeNull() { this[this.tableEETGW_SaveCost.aft_timeColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IssfiNull() { + return this.IsNull(this.tableEETGW_SaveCost.sfiColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetsfiNull() { + this[this.tableEETGW_SaveCost.sfiColumn] = global::System.Convert.DBNull; + } } /// @@ -31026,6 +31071,7 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e tableMapping.ColumnMappings.Add("weekly", "weekly"); tableMapping.ColumnMappings.Add("bef_time", "bef_time"); tableMapping.ColumnMappings.Add("aft_time", "aft_time"); + tableMapping.ColumnMappings.Add("sfi", "sfi"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -31058,7 +31104,8 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e "] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekl" + "y] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [be" + "f_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = " + - "1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time)))"; + "1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time)) AND ((@IsNull_sf" + + "i = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -31118,10 +31165,12 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_aft_time", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", 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_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly], [bef_time], [aft_time]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly, @bef_time, @aft_time); -SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly], [bef_time], [aft_time], [sfi]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly, @bef_time, @aft_time, @sfi); +SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate"; 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("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -31155,6 +31204,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@weekly", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", 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_SaveCost] SET [gcode] = @gcode, [isdel] = @isdel, [asset] = @asset," + @@ -31165,41 +31215,42 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma "] = @wuid, [wdate] = @wdate, [orderno] = @orderno, [userprocess] = @userprocess," + " [category] = @category, [status] = @status, [workgroup] = @workgroup, [site] = " + "@site, [subcate] = @subcate, [eepart] = @eepart, [fanout] = @fanout, [weekly] = " + - "@weekly, [bef_time] = @bef_time, [aft_time] = @aft_time WHERE (([idx] = @Origina" + - "l_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NU" + - "LL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL)" + - " OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL" + - ") OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL)" + - " OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR (" + - "[pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name" + - "] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR" + - " ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [userma" + - "in] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AN" + - "D [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_costo " + - "= 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1" + - " AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND " + - "[cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_edate = 1 AND [edate] I" + - "S NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress" + - "] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [mem" + - "o] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wd" + - "ate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([or" + - "derno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS " + - "NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND" + - " [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status " + - "= 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgr" + - "oup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@" + - "IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_" + - "subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@Is" + - "Null_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@I" + - "sNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@" + - "IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((" + - "@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time" + - ")) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original" + - "_aft_time)));\r\nSELECT idx, gcode, isdel, asset, process, part, pdate, name, user" + - "Manager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, p" + - "rogress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, s" + - "ite, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHE" + - "RE (idx = @idx) ORDER BY pdate"; + "@weekly, [bef_time] = @bef_time, [aft_time] = @aft_time, [sfi] = @sfi WHERE (([i" + + "dx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND" + + " [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [a" + + "sset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [pr" + + "ocess] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [" + + "part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate]" + + " IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS N" + + "ULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManage" + + "r] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain =" + + " 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_r" + + "eqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((" + + "@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@Is" + + "Null_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNul" + + "l_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_edate = 1" + + " AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1" + + " AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_mem" + + "o = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_" + + "wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS" + + " NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [us" + + "erprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_ca" + + "tegory = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@" + + "IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((" + + "@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workg" + + "roup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) " + + "AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subca" + + "te)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eep" + + "art)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fa" + + "nout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_w" + + "eekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Ori" + + "ginal_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_tim" + + "e] = @Original_aft_time)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @" + + "Original_sfi)));\r\nSELECT idx, gcode, isdel, asset, process, part, pdate, name, u" + + "serManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate" + + ", progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup" + + ", site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi FROM EETGW_Save" + + "Cost WHERE (idx = @idx) ORDER BY pdate"; 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("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -31233,6 +31284,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@weekly", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -31291,6 +31343,8 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_aft_time", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", 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, "", "", "")); } @@ -31308,7 +31362,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, - category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time + category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi FROM EETGW_SaveCost ORDER BY pdate"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -31402,7 +31456,8 @@ ORDER BY pdate"; global::System.Nullable Original_fanout, global::System.Nullable Original_weekly, global::System.Nullable Original_bef_time, - global::System.Nullable Original_aft_time) { + global::System.Nullable Original_aft_time, + global::System.Nullable Original_sfi) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); @@ -31633,6 +31688,14 @@ ORDER BY pdate"; this.Adapter.DeleteCommand.Parameters[56].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[57].Value = global::System.DBNull.Value; } + if ((Original_sfi.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[59].Value = ((double)(Original_sfi.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[59].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -31685,7 +31748,8 @@ ORDER BY pdate"; global::System.Nullable fanout, global::System.Nullable weekly, global::System.Nullable bef_time, - global::System.Nullable aft_time) { + global::System.Nullable aft_time, + global::System.Nullable sfi) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -31873,6 +31937,12 @@ ORDER BY pdate"; else { this.Adapter.InsertCommand.Parameters[31].Value = global::System.DBNull.Value; } + if ((sfi.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[32].Value = ((double)(sfi.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[32].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -31926,6 +31996,7 @@ ORDER BY pdate"; global::System.Nullable weekly, global::System.Nullable bef_time, global::System.Nullable aft_time, + global::System.Nullable sfi, int Original_idx, string Original_gcode, global::System.Nullable Original_isdel, @@ -31957,6 +32028,7 @@ ORDER BY pdate"; global::System.Nullable Original_weekly, global::System.Nullable Original_bef_time, global::System.Nullable Original_aft_time, + global::System.Nullable Original_sfi, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -32145,237 +32217,251 @@ ORDER BY pdate"; else { this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); + if ((sfi.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[32].Value = ((double)(sfi.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_gcode)); } if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((bool)(Original_isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_asset)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_process)); } if ((Original_part == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_part)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_part)); } if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_pdate)); } if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_name)); } if ((Original_userManager == null)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_userManager)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_userManager)); } if ((Original_usermain == null)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_usermain)); } if ((Original_reqstaff == null)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_reqstaff)); } if ((Original_costo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((double)(Original_costo.Value)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((double)(Original_costo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; } if ((Original_costn.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((double)(Original_costn.Value)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((double)(Original_costn.Value)); } else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; } if ((Original_cnt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_cnt.Value)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_cnt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_edate)); } if ((Original_progress.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((int)(Original_progress.Value)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((int)(Original_progress.Value)); } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[65].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((System.DateTime)(Original_wdate)); if ((Original_orderno == null)) { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_orderno)); } if ((Original_userprocess == null)) { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_userprocess)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_userprocess)); } if ((Original_category == null)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_category)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((string)(Original_category)); } if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_status)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((string)(Original_status)); } if ((Original_workgroup == null)) { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_workgroup)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((string)(Original_workgroup)); } if ((Original_site == null)) { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_site)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_site)); } if ((Original_subcate == null)) { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_subcate)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_subcate)); } if ((Original_eepart == null)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_eepart)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((string)(Original_eepart)); } if ((Original_fanout.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((bool)(Original_fanout.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((bool)(Original_fanout.Value)); } else { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value; } if ((Original_weekly.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((bool)(Original_weekly.Value)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((bool)(Original_weekly.Value)); } else { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[86].Value = global::System.DBNull.Value; } if ((Original_bef_time.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[87].Value = ((double)(Original_bef_time.Value)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((double)(Original_bef_time.Value)); } else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; } if ((Original_aft_time.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((double)(Original_aft_time.Value)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[90].Value = ((double)(Original_aft_time.Value)); } else { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[90].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[90].Value = ((int)(idx)); + if ((Original_sfi.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[92].Value = ((double)(Original_sfi.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[92].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[93].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)) { @@ -32429,6 +32515,7 @@ ORDER BY pdate"; global::System.Nullable weekly, global::System.Nullable bef_time, global::System.Nullable aft_time, + global::System.Nullable sfi, int Original_idx, string Original_gcode, global::System.Nullable Original_isdel, @@ -32459,8 +32546,9 @@ ORDER BY pdate"; global::System.Nullable Original_fanout, global::System.Nullable Original_weekly, global::System.Nullable Original_bef_time, - global::System.Nullable Original_aft_time) { - return this.Update(gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, Original_idx, Original_gcode, Original_isdel, Original_asset, Original_process, Original_part, Original_pdate, Original_name, Original_userManager, Original_usermain, Original_reqstaff, Original_costo, Original_costn, Original_cnt, Original_edate, Original_progress, Original_memo, Original_wuid, Original_wdate, Original_orderno, Original_userprocess, Original_category, Original_status, Original_workgroup, Original_site, Original_subcate, Original_eepart, Original_fanout, Original_weekly, Original_bef_time, Original_aft_time, Original_idx); + global::System.Nullable Original_aft_time, + global::System.Nullable Original_sfi) { + return this.Update(gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi, Original_idx, Original_gcode, Original_isdel, Original_asset, Original_process, Original_part, Original_pdate, Original_name, Original_userManager, Original_usermain, Original_reqstaff, Original_costo, Original_costn, Original_cnt, Original_edate, Original_progress, Original_memo, Original_wuid, Original_wdate, Original_orderno, Original_userprocess, Original_category, Original_status, Original_workgroup, Original_site, Original_subcate, Original_eepart, Original_fanout, Original_weekly, Original_bef_time, Original_aft_time, Original_sfi, Original_idx); } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 337fd42..c8719a4 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1523,7 +1523,7 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO - DELETE FROM [EETGW_SaveCost] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time))) + DELETE FROM [EETGW_SaveCost] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi))) @@ -1583,13 +1583,15 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO + + - INSERT INTO [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly], [bef_time], [aft_time]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly, @bef_time, @aft_time); -SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate + INSERT INTO [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly], [bef_time], [aft_time], [sfi]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly, @bef_time, @aft_time, @sfi); +SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate @@ -1623,13 +1625,14 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, - category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time + category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi FROM EETGW_SaveCost ORDER BY pdate @@ -1637,8 +1640,8 @@ ORDER BY pdate - UPDATE [EETGW_SaveCost] SET [gcode] = @gcode, [isdel] = @isdel, [asset] = @asset, [process] = @process, [part] = @part, [pdate] = @pdate, [name] = @name, [userManager] = @userManager, [usermain] = @usermain, [reqstaff] = @reqstaff, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [edate] = @edate, [progress] = @progress, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [orderno] = @orderno, [userprocess] = @userprocess, [category] = @category, [status] = @status, [workgroup] = @workgroup, [site] = @site, [subcate] = @subcate, [eepart] = @eepart, [fanout] = @fanout, [weekly] = @weekly, [bef_time] = @bef_time, [aft_time] = @aft_time WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time))); -SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHERE (idx = @idx) ORDER BY pdate + UPDATE [EETGW_SaveCost] SET [gcode] = @gcode, [isdel] = @isdel, [asset] = @asset, [process] = @process, [part] = @part, [pdate] = @pdate, [name] = @name, [userManager] = @userManager, [usermain] = @usermain, [reqstaff] = @reqstaff, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [edate] = @edate, [progress] = @progress, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [orderno] = @orderno, [userprocess] = @userprocess, [category] = @category, [status] = @status, [workgroup] = @workgroup, [site] = @site, [subcate] = @subcate, [eepart] = @eepart, [fanout] = @fanout, [weekly] = @weekly, [bef_time] = @bef_time, [aft_time] = @aft_time, [sfi] = @sfi WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi))); +SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi FROM EETGW_SaveCost WHERE (idx = @idx) ORDER BY pdate @@ -1672,6 +1675,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + @@ -1730,6 +1734,8 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + @@ -1770,6 +1776,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + @@ -2969,7 +2976,7 @@ WHERE (idx = @idx) - + @@ -3386,7 +3393,7 @@ WHERE (idx = @idx) - + @@ -3430,7 +3437,7 @@ WHERE (idx = @idx) - + @@ -3475,7 +3482,7 @@ WHERE (idx = @idx) - + @@ -3585,7 +3592,7 @@ WHERE (idx = @idx) - + @@ -3759,7 +3766,7 @@ WHERE (idx = @idx) - + @@ -3797,7 +3804,7 @@ WHERE (idx = @idx) - + @@ -3913,7 +3920,7 @@ WHERE (idx = @idx) - + @@ -3964,7 +3971,7 @@ WHERE (idx = @idx) - + @@ -3977,7 +3984,7 @@ WHERE (idx = @idx) - + @@ -4146,10 +4153,11 @@ WHERE (idx = @idx) + - + @@ -4355,7 +4363,7 @@ WHERE (idx = @idx) - + @@ -4400,7 +4408,7 @@ WHERE (idx = @idx) - + @@ -4477,7 +4485,7 @@ WHERE (idx = @idx) - + @@ -4668,7 +4676,7 @@ WHERE (idx = @idx) - + @@ -4807,7 +4815,7 @@ WHERE (idx = @idx) - + @@ -4874,7 +4882,7 @@ WHERE (idx = @idx) - + @@ -4920,7 +4928,7 @@ WHERE (idx = @idx) - +