diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index f9ddd5f..c99e112 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.08.17.0900")] -[assembly: AssemblyFileVersion("23.08.17.0900")] +[assembly: AssemblyVersion("23.08.17.1150")] +[assembly: AssemblyFileVersion("23.08.17.1150")] diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs index 5349bb3..a444667 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs @@ -30,40 +30,40 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseNR)); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - 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.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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 numberCellType10 = 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.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType6 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.CheckBoxCellType checkBoxCellType3 = 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(); @@ -255,7 +255,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"; @@ -373,7 +372,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, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -647,7 +645,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, 37); this.dtSD.Text = "1982-11-23"; @@ -664,7 +661,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, 37); this.dtED.Text = "1982-11-23"; @@ -720,7 +716,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(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -896,17 +891,17 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 34).Value = "비고\r\n(담당자)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType4; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "요청\r\n검사"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 31F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType5; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "chk2"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "구매\r\n검사"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 35F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "등록일"; @@ -915,7 +910,7 @@ this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "상태"; @@ -923,37 +918,37 @@ 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 = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "Storage"; 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 = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(5).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 = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "requestName"; 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 = "requestName"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costcenter"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "Cost Center"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "linecode"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "LineCode"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "SC#"; @@ -961,7 +956,7 @@ this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "SCR/CF"; @@ -969,188 +964,188 @@ this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Visible = false; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "receiveName"; 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 = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType10; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType35; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumscale"; 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 = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(16).Label = "장비\r\n제조사"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(17).Label = "제조\r\n공정"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(18).Label = "장비\r\n모델"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.NegativeRed = true; - numberCellType11.NullDisplay = "--"; - numberCellType11.Separator = ","; - numberCellType11.ShowSeparator = true; - numberCellType11.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType11; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumqty"; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumqtyReq"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Label = "수량\r\n(요청)"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; - numberCellType12.DecimalPlaces = 0; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType12; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "pumqtyReq"; + numberCellType3.DecimalPlaces = 0; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "수량\r\n(구매)"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Width = 55F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType37; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "pumunit"; 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).Width = 51F; - numberCellType13.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType13; + numberCellType4.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(22).Label = "단가($)"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType14.DecimalPlaces = 0; - numberCellType14.MaximumValue = 9999999999999.99D; - numberCellType14.MinimumValue = -9999999999999.99D; - numberCellType14.NegativeRed = true; - numberCellType14.NullDisplay = "--"; - numberCellType14.Separator = ","; - numberCellType14.ShowSeparator = true; - numberCellType14.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType14; + 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(23).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(23).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - numberCellType15.DecimalPlaces = 0; - numberCellType15.MaximumValue = 9999999999999.99D; - numberCellType15.MinimumValue = -9999999999999.99D; - numberCellType15.NegativeRed = true; - numberCellType15.NullDisplay = "--"; - numberCellType15.Separator = ","; - numberCellType15.ShowSeparator = true; - numberCellType15.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType15; + numberCellType6.DecimalPlaces = 0; + numberCellType6.MaximumValue = 9999999999999.99D; + numberCellType6.MinimumValue = -9999999999999.99D; + numberCellType6.NegativeRed = true; + numberCellType6.NullDisplay = "--"; + numberCellType6.Separator = ","; + numberCellType6.ShowSeparator = true; + numberCellType6.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(24).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(24).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType38; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(25).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(25).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(26).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType16.DecimalPlaces = 0; - numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType16.MaximumValue = 2147483647D; - numberCellType16.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType16; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "supplyidx"; 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).Visible = false; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType39; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(27).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(28).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType17.DecimalPlaces = 0; - numberCellType17.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType17.MaximumValue = 2147483647D; - numberCellType17.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType17; + numberCellType8.DecimalPlaces = 0; + numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType8.MaximumValue = 2147483647D; + numberCellType8.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(28).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(28).Visible = false; this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType40; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(29).Label = "비고\r\n(요청자)"; this.fpSpread1_Sheet1.Columns.Get(29).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType41; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(30).DataField = "edate"; 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).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType42; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(31).DataField = "indate"; 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).Tag = "indate"; this.fpSpread1_Sheet1.Columns.Get(31).Width = 51F; - numberCellType18.DecimalPlaces = 0; - numberCellType18.NegativeRed = true; - numberCellType18.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = numberCellType18; + numberCellType9.DecimalPlaces = 0; + numberCellType9.NegativeRed = true; + numberCellType9.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(32).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(32).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(32).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(32).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType43; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(33).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(33).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(33).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(33).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType44; + this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(34).DataField = "chkremark"; this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(34).Label = "비고\r\n(담당자)"; this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType6; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType3; this.fpSpread1_Sheet1.Columns.Get(35).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(35).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(35).Tag = "isdel"; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs index 703c9d5..8b65261 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs @@ -93,7 +93,8 @@ namespace FEQ0000 e.Row["wdate"] = DateTime.Now; e.Row["pumunit"] = "EA"; e.Row["state"] = "---"; - e.Row["pumqty"] = 1; + e.Row["pumqty"] = 0; + e.Row["pumqtyreq"] = 0; e.Row["pumprice"] = 0; e.Row["pumamt"] = 0; e.Row["request"] = FCOMMON.info.Login.nameK; @@ -822,6 +823,7 @@ namespace FEQ0000 newdr.po = string.Empty; newdr.indate = string.Empty; newdr.edate = string.Empty; + newdr.pumqty = 0; //실구매수량은 제거 newdr.idx = -1; newdr.EndEdit(); diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx index db0c95b..e8bb864 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.resx @@ -279,35 +279,6 @@ 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= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -347,6 +318,35 @@ 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= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index c1a3976..08c4ae9 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -61,7 +61,7 @@ this.tbPumName = new System.Windows.Forms.TextBox(); this.tbPumModel = new System.Windows.Forms.TextBox(); this.tbPumUnit = new System.Windows.Forms.TextBox(); - this.tbPumQty = new System.Windows.Forms.TextBox(); + this.tbQtyReq = new System.Windows.Forms.TextBox(); this.tbPumPrice = new System.Windows.Forms.TextBox(); this.tbPumAmt = new System.Windows.Forms.TextBox(); this.tbSupply = new System.Windows.Forms.TextBox(); @@ -110,7 +110,7 @@ this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.tbBigoChk = new System.Windows.Forms.TextBox(); - this.tbpumqtyReq = new System.Windows.Forms.TextBox(); + this.tbQtyReal = new System.Windows.Forms.TextBox(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -444,16 +444,16 @@ this.tbPumUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbPumUnit, "단위"); // - // tbPumQty + // tbQtyReq // - this.tbPumQty.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbPumQty.Location = new System.Drawing.Point(93, 140); - this.tbPumQty.Margin = new System.Windows.Forms.Padding(4); - this.tbPumQty.Name = "tbPumQty"; - this.tbPumQty.Size = new System.Drawing.Size(135, 27); - this.tbPumQty.TabIndex = 13; - this.tbPumQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbPumQty.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); + this.tbQtyReq.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbQtyReq.Location = new System.Drawing.Point(93, 140); + this.tbQtyReq.Margin = new System.Windows.Forms.Padding(4); + this.tbQtyReq.Name = "tbQtyReq"; + this.tbQtyReq.Size = new System.Drawing.Size(135, 27); + this.tbQtyReq.TabIndex = 13; + this.tbQtyReq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbQtyReq.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); // // tbPumPrice // @@ -666,7 +666,7 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.tbpumqtyReq); + this.groupBox1.Controls.Add(this.tbQtyReal); this.groupBox1.Controls.Add(label15); this.groupBox1.Controls.Add(this.tbBigoChk); this.groupBox1.Controls.Add(label14); @@ -692,7 +692,7 @@ this.groupBox1.Controls.Add(this.tbPumIDX); this.groupBox1.Controls.Add(this.cmbState); this.groupBox1.Controls.Add(this.tbSID); - this.groupBox1.Controls.Add(this.tbPumQty); + this.groupBox1.Controls.Add(this.tbQtyReq); this.groupBox1.Controls.Add(pumqtyLabel); this.groupBox1.Controls.Add(sidLabel); this.groupBox1.Controls.Add(this.tbProject); @@ -1016,14 +1016,15 @@ label14.Text = "담당자비고"; this.toolTip1.SetToolTip(label14, resources.GetString("label14.ToolTip")); // - // tbpumqtyReq + // tbQtyReal // - this.tbpumqtyReq.Location = new System.Drawing.Point(339, 140); - this.tbpumqtyReq.Margin = new System.Windows.Forms.Padding(4); - this.tbpumqtyReq.Name = "tbpumqtyReq"; - this.tbpumqtyReq.Size = new System.Drawing.Size(135, 27); - this.tbpumqtyReq.TabIndex = 15; - this.tbpumqtyReq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbQtyReal.Location = new System.Drawing.Point(339, 140); + this.tbQtyReal.Margin = new System.Windows.Forms.Padding(4); + this.tbQtyReal.Name = "tbQtyReal"; + this.tbQtyReal.Size = new System.Drawing.Size(135, 27); + this.tbQtyReal.TabIndex = 15; + this.tbQtyReal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbQtyReal.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); // // label15 // @@ -1072,7 +1073,7 @@ private System.Windows.Forms.TextBox tbPumName; private System.Windows.Forms.TextBox tbPumModel; private System.Windows.Forms.TextBox tbPumUnit; - private System.Windows.Forms.TextBox tbPumQty; + private System.Windows.Forms.TextBox tbQtyReq; private System.Windows.Forms.TextBox tbPumPrice; private System.Windows.Forms.TextBox tbPumAmt; private System.Windows.Forms.TextBox tbSupply; @@ -1121,6 +1122,6 @@ private System.Windows.Forms.Button btEQManu; private System.Windows.Forms.Button btEQModel; private System.Windows.Forms.TextBox tbBigoChk; - private System.Windows.Forms.TextBox tbpumqtyReq; + private System.Windows.Forms.TextBox tbQtyReal; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 6117202..553838b 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -163,9 +163,12 @@ namespace FEQ0000 tbPumName.Tag = tbPumName.Text; tbPumModel.Text = dr.pumscale; - tbPumQty.Text = dr.pumqty.ToString(); - if (dr.IspumqtyReqNull()) tbpumqtyReq.Text = "0"; //230817 - else tbpumqtyReq.Text = dr.pumqtyReq.ToString(); + + if (dr.IspumqtyNull()) tbQtyReal.Text = "0"; //230817 + else tbQtyReal.Text = dr.pumqty.ToString(); + + if (dr.IspumqtyReqNull()) tbQtyReq.Text = "0"; //230817 + else tbQtyReq.Text = dr.pumqtyReq.ToString(); if (dr.IspumidxNull()) tbPumIDX.Text = "-1"; else tbPumIDX.Text = dr.pumidx.ToString(); @@ -239,12 +242,12 @@ namespace FEQ0000 groupBox2.Enabled = false; } tbBigoChk.Enabled = false; - tbpumqtyReq.Enabled = false; + tbQtyReal.Enabled = false; } else { tbBigoChk.Enabled = true; - tbpumqtyReq.Enabled = true; + tbQtyReal.Enabled = true; } if (advInput == false) @@ -395,7 +398,7 @@ namespace FEQ0000 if (oimage != null) oimage.Dispose(); } } - this.tbPumQty.Focus(); + this.tbQtyReq.Focus(); } void Lov_Project(string search, Boolean allowAll) { @@ -514,24 +517,26 @@ namespace FEQ0000 tbPumModel.Focus(); return false; } - if (tbPumQty.Text == "") + + if (tbQtyReq.Text == "") { FCOMMON.Util.MsgE("수량(요청)을 입력하세요."); - tbPumQty.Focus(); + tbQtyReq.Focus(); return false; } - if (tbBigoChk.Enabled && ( cmbState.Text == "PO" || cmbState.Text == "PR")) + //실수량은 구매담당자만 입력한다 + if (tbBigoChk.Enabled && (cmbState.Text == "PO" || cmbState.Text == "PR")) { - var qtycnv = int.TryParse(tbpumqtyReq.Text, out int qtyreq); - if(qtycnv ==false || qtyreq < 1) + var qtycnv = int.TryParse(tbQtyReal.Text, out int qtyreq); + if (qtycnv == false || qtyreq < 1) { FCOMMON.Util.MsgE("수량(실 구매)을 입력하세요."); - tbpumqtyReq.Focus(); + tbQtyReal.Focus(); return false; } } - + if (advInput == true) @@ -705,14 +710,25 @@ namespace FEQ0000 } } - if (int.TryParse(tbPumQty.Text, out int vqty) == false) - tbPumQty.Text = "0"; - if (int.TryParse(tbpumqtyReq.Text, out int vqtyreq) == false) - tbpumqtyReq.Text = "0"; + if (int.TryParse(tbQtyReq.Text, out int vqtyreq) == false) + tbQtyReq.Text = "0"; + if (int.TryParse(tbQtyReal.Text, out int vqtyreal) == false) + tbQtyReal.Text = "0"; if (decimal.TryParse(tbPumPrice.Text, out decimal vpumprice) == false) tbPumPrice.Text = "0"; - dr.pumqty = vqty;// int.Parse(tbPumQty.Text); + //요청 구매 수량이 다를경우 비고 입력이 필요함 + if (vqtyreal > 0 && vqtyreq > 0 && vqtyreq != vqtyreal) + { + if(tbBigoChk.Text.isEmpty()) + { + Util.MsgE("구매 요청/실 수량이 서로 다릅니다\n구매자 비고에 해당 사유를 입력하세요"); + tbBigoChk.Focus(); + return false; + } + } + + dr.pumqty = vqtyreal;// int.Parse(tbPumQty.Text); dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text); dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); @@ -723,7 +739,9 @@ namespace FEQ0000 } else dr.SetpumpriceDNull(); - dr.pumamt = dr.pumqty * dr.pumprice; + if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice; + else dr.pumamt = dr.pumqtyReq * dr.pumprice; + if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); dr.sid = tbSID.Text.Trim(); @@ -885,14 +903,15 @@ namespace FEQ0000 private void tbPumQty_TextChanged(object sender, EventArgs e) { - var strQty = this.tbPumQty.Text; - var strPrice = this.tbPumPrice.Text; + var b1 = int.TryParse(tbQtyReal.Text, out int qtyreal); + var b2 = int.TryParse(tbQtyReq.Text, out int qtyreq); + var b3 = double.TryParse(tbPumPrice.Text, out double price); + double amt = 0; + + //실구매수량이 잇으면 그걸로한다 + if (qtyreal > 0) amt = qtyreal * price; + else amt = qtyreq * price; - int qty = 0; - double price = 0; - if (strQty.IsNumeric()) qty = int.Parse(strQty); - if (strPrice.IsNumeric()) price = double.Parse(strPrice); - double amt = price * qty; tbPumAmt.Text = amt.ToString("N0"); } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs index 3743d6e..7a3ec2c 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs @@ -1041,14 +1041,14 @@ numberCellType2.ShowSeparator = true; numberCellType2.ShrinkToFit = true; this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqtyReq"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량\r\n(요청)"; this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; numberCellType3.DecimalPlaces = 0; this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqtyReq"; + 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 = "수량\r\n(구매)\r\n"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index 5184251..be01f38 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -93,7 +93,8 @@ namespace FEQ0000 e.Row["wdate"] = DateTime.Now; e.Row["pumunit"] = "EA"; e.Row["state"] = "---"; - e.Row["pumqty"] = 1; + e.Row["pumqty"] = 0; + e.Row["pumqtyreq"] = 0; e.Row["pumprice"] = 0; e.Row["pumamt"] = 0; e.Row["request"] = FCOMMON.info.Login.nameK; @@ -764,6 +765,7 @@ namespace FEQ0000 newdr.po = string.Empty; newdr.indate = string.Empty; newdr.edate = string.Empty; + newdr.pumqty = 0; //실구매수량은 제거 newdr.idx = -1; newdr.EndEdit(); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs index dd1a268..726326b 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs @@ -57,7 +57,7 @@ this.tbPumName = new System.Windows.Forms.TextBox(); this.tbPumModel = new System.Windows.Forms.TextBox(); this.tbPumUnit = new System.Windows.Forms.TextBox(); - this.tbPumQty = new System.Windows.Forms.TextBox(); + this.tbQtyReq = new System.Windows.Forms.TextBox(); this.tbPumPrice = new System.Windows.Forms.TextBox(); this.tbPumAmt = new System.Windows.Forms.TextBox(); this.tbSupply = new System.Windows.Forms.TextBox(); @@ -78,6 +78,7 @@ this.chkExp = new System.Windows.Forms.CheckBox(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.tbQtyReal = new System.Windows.Forms.TextBox(); this.btSIDChk = new System.Windows.Forms.Button(); this.tbLineCode = new System.Windows.Forms.TextBox(); this.tbStorage = new System.Windows.Forms.TextBox(); @@ -92,14 +93,13 @@ this.tbInQty = new System.Windows.Forms.TextBox(); this.tbOrderNo = new System.Windows.Forms.TextBox(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.tbBigoChk = new System.Windows.Forms.TextBox(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.chk2 = new System.Windows.Forms.CheckBox(); this.chk1 = new System.Windows.Forms.CheckBox(); this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.tbBigoChk = new System.Windows.Forms.TextBox(); - this.tbpumqtyReq = new System.Windows.Forms.TextBox(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -332,6 +332,27 @@ label11.TabIndex = 33; label11.Text = "Cost Center"; // + // label12 + // + label12.AutoSize = true; + label12.Location = new System.Drawing.Point(13, 564); + label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label12.Name = "label12"; + label12.Size = new System.Drawing.Size(119, 20); + label12.TabIndex = 5; + label12.Text = "구매담당자 비고"; + this.toolTip1.SetToolTip(label12, resources.GetString("label12.ToolTip")); + // + // label13 + // + label13.AutoSize = true; + label13.Location = new System.Drawing.Point(242, 152); + label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label13.Name = "label13"; + label13.Size = new System.Drawing.Size(89, 20); + label13.TabIndex = 14; + label13.Text = "실 구매수량"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(104, 61); @@ -384,16 +405,16 @@ this.tbPumUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbPumUnit, "단위"); // - // tbPumQty + // tbQtyReq // - this.tbPumQty.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbPumQty.Location = new System.Drawing.Point(94, 148); - this.tbPumQty.Margin = new System.Windows.Forms.Padding(4); - this.tbPumQty.Name = "tbPumQty"; - this.tbPumQty.Size = new System.Drawing.Size(133, 27); - this.tbPumQty.TabIndex = 13; - this.tbPumQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.tbPumQty.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); + this.tbQtyReq.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbQtyReq.Location = new System.Drawing.Point(94, 148); + this.tbQtyReq.Margin = new System.Windows.Forms.Padding(4); + this.tbQtyReq.Name = "tbQtyReq"; + this.tbQtyReq.Size = new System.Drawing.Size(133, 27); + this.tbQtyReq.TabIndex = 13; + this.tbQtyReq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbQtyReq.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); // // tbPumPrice // @@ -608,7 +629,7 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.tbpumqtyReq); + this.groupBox1.Controls.Add(this.tbQtyReal); this.groupBox1.Controls.Add(label13); this.groupBox1.Controls.Add(this.btSIDChk); this.groupBox1.Controls.Add(this.tbLineCode); @@ -632,7 +653,7 @@ this.groupBox1.Controls.Add(this.tbPumIDX); this.groupBox1.Controls.Add(this.cmbState); this.groupBox1.Controls.Add(this.tbSID); - this.groupBox1.Controls.Add(this.tbPumQty); + this.groupBox1.Controls.Add(this.tbQtyReq); this.groupBox1.Controls.Add(pumqtyLabel); this.groupBox1.Controls.Add(sidLabel); this.groupBox1.Controls.Add(this.tbProject); @@ -655,6 +676,16 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; // + // tbQtyReal + // + this.tbQtyReal.Location = new System.Drawing.Point(341, 148); + this.tbQtyReal.Margin = new System.Windows.Forms.Padding(4); + this.tbQtyReal.Name = "tbQtyReal"; + this.tbQtyReal.Size = new System.Drawing.Size(133, 27); + this.tbQtyReal.TabIndex = 15; + this.tbQtyReal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbQtyReal.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); + // // btSIDChk // this.btSIDChk.BackColor = System.Drawing.Color.Gray; @@ -800,6 +831,19 @@ this.tbOrderNo.Size = new System.Drawing.Size(286, 27); this.tbOrderNo.TabIndex = 7; // + // tbBigoChk + // + this.tbBigoChk.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbBigoChk.Location = new System.Drawing.Point(11, 591); + this.tbBigoChk.Margin = new System.Windows.Forms.Padding(4); + this.tbBigoChk.MaxLength = 500; + this.tbBigoChk.Multiline = true; + this.tbBigoChk.Name = "tbBigoChk"; + this.tbBigoChk.Size = new System.Drawing.Size(490, 77); + this.tbBigoChk.TabIndex = 6; + this.tbBigoChk.TabStop = false; + this.toolTip1.SetToolTip(this.tbBigoChk, resources.GetString("tbBigoChk.ToolTip")); + // // timer1 // this.timer1.Interval = 250; @@ -841,49 +885,6 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // tbBigoChk - // - this.tbBigoChk.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbBigoChk.Location = new System.Drawing.Point(11, 591); - this.tbBigoChk.Margin = new System.Windows.Forms.Padding(4); - this.tbBigoChk.MaxLength = 500; - this.tbBigoChk.Multiline = true; - this.tbBigoChk.Name = "tbBigoChk"; - this.tbBigoChk.Size = new System.Drawing.Size(490, 77); - this.tbBigoChk.TabIndex = 6; - this.tbBigoChk.TabStop = false; - this.toolTip1.SetToolTip(this.tbBigoChk, resources.GetString("tbBigoChk.ToolTip")); - // - // label12 - // - label12.AutoSize = true; - label12.Location = new System.Drawing.Point(13, 564); - label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label12.Name = "label12"; - label12.Size = new System.Drawing.Size(119, 20); - label12.TabIndex = 5; - label12.Text = "구매담당자 비고"; - this.toolTip1.SetToolTip(label12, resources.GetString("label12.ToolTip")); - // - // tbpumqtyReq - // - this.tbpumqtyReq.Location = new System.Drawing.Point(341, 148); - this.tbpumqtyReq.Margin = new System.Windows.Forms.Padding(4); - this.tbpumqtyReq.Name = "tbpumqtyReq"; - this.tbpumqtyReq.Size = new System.Drawing.Size(133, 27); - this.tbpumqtyReq.TabIndex = 15; - this.tbpumqtyReq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label13 - // - label13.AutoSize = true; - label13.Location = new System.Drawing.Point(242, 152); - label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label13.Name = "label13"; - label13.Size = new System.Drawing.Size(89, 20); - label13.TabIndex = 14; - label13.Text = "실 구매수량"; - // // fPurchaseCR_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -926,7 +927,7 @@ private System.Windows.Forms.TextBox tbPumName; private System.Windows.Forms.TextBox tbPumModel; private System.Windows.Forms.TextBox tbPumUnit; - private System.Windows.Forms.TextBox tbPumQty; + private System.Windows.Forms.TextBox tbQtyReq; private System.Windows.Forms.TextBox tbPumPrice; private System.Windows.Forms.TextBox tbPumAmt; private System.Windows.Forms.TextBox tbSupply; @@ -968,6 +969,6 @@ private System.Windows.Forms.TextBox tbCostCenter; private System.Windows.Forms.Button button7; private System.Windows.Forms.TextBox tbBigoChk; - private System.Windows.Forms.TextBox tbpumqtyReq; + private System.Windows.Forms.TextBox tbQtyReal; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 4a2a8b4..38c62b1 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -189,9 +189,12 @@ namespace FEQ0000 tbPumName.Tag = tbPumName.Text; tbPumModel.Text = dr.pumscale; - tbPumQty.Text = dr.pumqty.ToString(); - if (dr.IspumqtyReqNull()) tbpumqtyReq.Text = "0"; //230817 - else tbpumqtyReq.Text = dr.pumqtyReq.ToString(); + + if (dr.IspumqtyNull()) tbQtyReal.Text = "0"; //230817 + else tbQtyReal.Text = dr.pumqty.ToString(); + + if (dr.IspumqtyReqNull()) tbQtyReq.Text = "0"; //230817 + else tbQtyReq.Text = dr.pumqtyReq.ToString(); if (dr.IspumidxNull()) tbPumIDX.Text = "-1"; else tbPumIDX.Text = dr.pumidx.ToString(); @@ -275,12 +278,12 @@ namespace FEQ0000 groupBox2.Enabled = false; } tbBigoChk.Enabled = false; - tbpumqtyReq.Enabled = false; + tbQtyReal.Enabled = false; } else { tbBigoChk.Enabled = true; - tbpumqtyReq.Enabled = true; + tbQtyReal.Enabled = true; } if (advInput == false) @@ -429,7 +432,7 @@ namespace FEQ0000 //if (oimage != null) oimage.Dispose(); } } - this.tbPumQty.Focus(); + this.tbQtyReq.Focus(); } void Lov_Project(string search, Boolean allowAll) { @@ -557,20 +560,21 @@ namespace FEQ0000 tbPumModel.Focus(); return false; } - if (tbPumQty.Text == "") + if (tbQtyReq.Text == "") { FCOMMON.Util.MsgE("수량(요청)을 입력하세요."); - tbPumQty.Focus(); + tbQtyReq.Focus(); return false; } + //실수량은 구매담당자만 입력한다 if (tbBigoChk.Enabled && (cmbState.Text == "PO" || cmbState.Text == "PR")) { - var qtycnv = int.TryParse(tbpumqtyReq.Text, out int qtyreq); + var qtycnv = int.TryParse(tbQtyReal.Text, out int qtyreq); if (qtycnv == false || qtyreq < 1) { FCOMMON.Util.MsgE("수량(실 구매)을 입력하세요."); - tbpumqtyReq.Focus(); + tbQtyReal.Focus(); return false; } } @@ -740,14 +744,25 @@ namespace FEQ0000 } - if (int.TryParse(tbPumQty.Text, out int vqty) == false) - tbPumQty.Text = "0"; - if (int.TryParse(tbpumqtyReq.Text, out int vqtyreq) == false) - tbpumqtyReq.Text = "0"; + if (int.TryParse(tbQtyReq.Text, out int vqtyreq) == false) + tbQtyReq.Text = "0"; + if (int.TryParse(tbQtyReal.Text, out int vqtyreal) == false) + tbQtyReal.Text = "0"; if (decimal.TryParse(tbPumPrice.Text, out decimal vpumprice) == false) tbPumPrice.Text = "0"; - dr.pumqty = vqty;// int.Parse(tbPumQty.Text); + //요청 구매 수량이 다를경우 비고 입력이 필요함 + if (vqtyreal > 0 && vqtyreq > 0 && vqtyreq != vqtyreal) + { + if (tbBigoChk.Text.isEmpty()) + { + Util.MsgE("구매 요청/실 수량이 서로 다릅니다\n구매자 비고에 해당 사유를 입력하세요"); + tbBigoChk.Focus(); + return false; + } + } + + dr.pumqty = vqtyreal;// int.Parse(tbPumQty.Text); dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text); dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); @@ -763,7 +778,9 @@ namespace FEQ0000 } else dr.SetpumpriceDNull(); - dr.pumamt = dr.pumqty * dr.pumprice; + if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice; + else dr.pumamt = dr.pumqtyReq * dr.pumprice; + if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); dr.sid = tbSID.Text.Trim(); @@ -922,14 +939,15 @@ namespace FEQ0000 private void tbPumQty_TextChanged(object sender, EventArgs e) { - var strQty = this.tbPumQty.Text; - var strPrice = this.tbPumPrice.Text; + var b1 = int.TryParse(tbQtyReal.Text, out int qtyreal); + var b2 = int.TryParse(tbQtyReq.Text, out int qtyreq); + var b3 = double.TryParse(tbPumPrice.Text, out double price); + double amt = 0; + + //실구매수량이 잇으면 그걸로한다 + if (qtyreal > 0) amt = qtyreal * price; + else amt = qtyreq * price; - int qty = 0; - double price = 0; - if (strQty.IsNumeric()) qty = int.Parse(strQty); - if (strPrice.IsNumeric()) price = double.Parse(strPrice); - double amt = price * qty; tbPumAmt.Text = amt.ToString("N0"); } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx index a5b029d..57f4cc4 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx @@ -187,7 +187,10 @@ False - + + False + + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) * 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) @@ -197,6 +200,20 @@ False + + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) +* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) +* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) +* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) +* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + + + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) +* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) +* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) +* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) +* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) + 674, 17 @@ -209,23 +226,6 @@ 313, 17 - - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) -* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) -* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) -* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) -* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - - - False - - - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) -* 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) -* 공정 정비 파트 / 상세한 사유 작성 (본인 담당의 주, 보조 공정에서 사용되는 것들. Feeder wheel, O/H, 장비 교체 파트 등) -* 개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRench, Driver, Drill, Tab 등) -* 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - 58 diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index b85ca65..d5b938f 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -4458,11 +4458,11 @@ namespace FEQ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int pumqtyReq { get { - try { - return ((int)(this[this.tablePurchase.pumqtyReqColumn])); + if (this.IspumqtyReqNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'pumqtyReq\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tablePurchase.pumqtyReqColumn])); } } set { @@ -5721,11 +5721,11 @@ namespace FEQ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public int pumqtyReq { get { - try { - return ((int)(this[this.tableEETGW_PurchaseCR.pumqtyReqColumn])); + if (this.IspumqtyReqNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'EETGW_PurchaseCR\' 테이블의 \'pumqtyReq\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableEETGW_PurchaseCR.pumqtyReqColumn])); } } set { diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 5b47562..96d81a4 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -1109,22 +1109,22 @@ ORDER BY source DESC, request, wdate DESC - + - + - - + + @@ -1342,22 +1342,22 @@ ORDER BY source DESC, request, wdate DESC - + - + - - + +