From aff898194b710b21ff1be3222227ff4af81fce04 Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 28 Aug 2023 08:55:12 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=ED=8A=B8=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B5=AC=EB=A7=A4=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=88=98=EB=9F=89=EC=9D=B4=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FCOMMON/DataBaseManager.cs | 6 +- SubProject/FEQ0000/Purchase/fPurchase_Add.cs | 2 - .../FEQ0000/PurchaseCR/fPurchaseCR_Add.cs | 2 +- .../FPJ0000/Project/fPartList.Designer.cs | 196 +++++++++--------- SubProject/FPJ0000/Project/fPartList.cs | 13 +- SubProject/FPJ0000/Project/fPartList.resx | 87 ++++---- 7 files changed, 149 insertions(+), 161 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 0479722..f1353de 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.24.0830")] -[assembly: AssemblyFileVersion("23.08.24.0830")] +[assembly: AssemblyVersion("23.08.28.0900")] +[assembly: AssemblyFileVersion("23.08.28.0900")] diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 6c31d40..bb5c734 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -143,12 +143,12 @@ namespace FCOMMON { var sql = " select " + - " isnull(sum(case when[state] = 'PR' then 0 when[state] = 'PO' then 0 when[state] = 'Received' then 0 when[state] = 'Cancled' then 0 else pumqty end),0) as Request," + + " isnull(sum(case when[state] = 'PR' then 0 when[state] = 'PO' then 0 when[state] = 'Received' then 0 when[state] = 'Cancled' then 0 else pumqtyReq end),0) as Request," + " isnull(sum(case when[state] = 'PR' then pumqty else 0 end),0) as PR," + " isnull(sum(case when[state] = 'PO' then pumqty else 0 end),0) as PO," + " isnull(sum(case when[state] = 'Received' then inqty else 0 end),0) as Received," + - " isnull(sum(case when[state] = 'Cancled' then pumqty else 0 end),0) as Cancled," + - " isnull(sum(pumqty),0) as Total_Request," + + " isnull(sum(case when[state] = 'Cancled' then pumqtyReq else 0 end),0) as Cancled," + + " isnull(sum(isnull(pumqty,pumqtyreq)),0) as Total_Request," + " isnull(sum(inqty),0) as Total_Buy," + " isnull(sum(pumqty) - sum(inqty),0) as Total_Remain" + " from EETGW_PurchaseCR" + diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 553838b..82feff2 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -537,8 +537,6 @@ namespace FEQ0000 } } - - if (advInput == true) { if (tbOrderNo.Text.isEmpty() == false && tbProjectIndex.Text != "-1") diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 38c62b1..3431c9d 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -508,7 +508,7 @@ namespace FEQ0000 return false; } - if (tbSID.TextLength != 9) + if (tbSID.TextLength != 9 && tbSID.Text != "신규") { FCOMMON.Util.MsgE("SID(9자리)를 확인 하세요"); tbSID.Focus(); diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index b2a2171..ea1c90e 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -39,29 +39,29 @@ System.Windows.Forms.Label label1; System.Windows.Forms.Label label2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPartList)); - FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer2 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer3 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer4 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - 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.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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 numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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 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 textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.label3 = new System.Windows.Forms.Label(); this.button4 = new System.Windows.Forms.Button(); @@ -125,6 +125,7 @@ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton(); this.선택해제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.전체선택ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -134,7 +135,6 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); pdateLabel = new System.Windows.Forms.Label(); requestLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); @@ -1056,6 +1056,16 @@ this.toolStripButton4.Text = "CR구매요청"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(115, 44); + this.toolStripButton5.Text = "NR구매요청"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // toolStripButton1 // this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -1093,6 +1103,7 @@ this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_Project_LayoutTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; @@ -1107,6 +1118,7 @@ this.tam.ProjectsTableAdapter = this.ta; this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.vEETGW_Project_LayoutListTableAdapter = null; // // taPart // @@ -1121,12 +1133,12 @@ this.fpSpread1.ContextMenuStrip = this.cm1; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; - this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer2; + this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer1; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.HorizontalScrollBar.Name = ""; - flatScrollBarRenderer3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer3; + flatScrollBarRenderer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer1; this.fpSpread1.Location = new System.Drawing.Point(0, 170); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { @@ -1139,8 +1151,8 @@ this.fpSpread1.TitleInfo.Value = "PartList"; this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.VerticalScrollBar.Name = ""; - flatScrollBarRenderer4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer4; + flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); // // fpSpread1_Sheet1 @@ -1204,25 +1216,25 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 27F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 31F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ItemGroup"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "중"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 93F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "option1"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "소"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 93F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.NegativeRed = true; - numberCellType11.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType11; + numberCellType1.DecimalPlaces = 0; + numberCellType1.NegativeRed = true; + numberCellType1.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "no"; 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 = 93F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; @@ -1230,39 +1242,39 @@ this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 93F; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemName"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; 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 = 93F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemManu"; 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 = "manu"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemUnit"; 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 = "unit"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 93F; - numberCellType12.DecimalPlaces = 0; - numberCellType12.MaximumValue = 9999999999999.99D; - numberCellType12.MinimumValue = -9999999999999.99D; - numberCellType12.NegativeRed = true; - numberCellType12.NullDisplay = "0"; - numberCellType12.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType12; + numberCellType2.DecimalPlaces = 0; + numberCellType2.MaximumValue = 9999999999999.99D; + numberCellType2.MinimumValue = -9999999999999.99D; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "0"; + numberCellType2.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가"; @@ -1270,25 +1282,25 @@ this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 93F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - numberCellType13.DecimalPlaces = 0; - numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType13.MaximumValue = 2147483647D; - numberCellType13.MinimumValue = -2147483648D; - numberCellType13.NegativeRed = true; - numberCellType13.Separator = ","; - numberCellType13.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType13; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + numberCellType3.NegativeRed = true; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 93F; - numberCellType14.DecimalPlaces = 0; - numberCellType14.NegativeRed = true; - numberCellType14.Separator = ","; - numberCellType14.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType14; + numberCellType4.DecimalPlaces = 0; + numberCellType4.NegativeRed = true; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량(N)"; @@ -1296,14 +1308,14 @@ this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 93F; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType15.DecimalPlaces = 0; - numberCellType15.MaximumValue = 9999999999999.99D; - numberCellType15.MinimumValue = -9999999999999.99D; - numberCellType15.NegativeRed = true; - numberCellType15.NullDisplay = "--"; - numberCellType15.Separator = ","; - numberCellType15.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType15; + numberCellType5.DecimalPlaces = 0; + numberCellType5.MaximumValue = 9999999999999.99D; + numberCellType5.MinimumValue = -9999999999999.99D; + numberCellType5.NegativeRed = true; + numberCellType5.NullDisplay = "--"; + numberCellType5.Separator = ","; + numberCellType5.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-3]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -1312,7 +1324,7 @@ this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 93F; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType15; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amtn"; this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-4]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -1320,7 +1332,7 @@ this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amtn"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtyjago"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -1332,14 +1344,14 @@ this.fpSpread1_Sheet1.Columns.Get(14).Tag = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "memo"; this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType16.DecimalPlaces = 0; - numberCellType16.MaximumValue = 10000000D; - numberCellType16.MinimumValue = -10000000D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType16; + numberCellType6.DecimalPlaces = 0; + numberCellType6.MaximumValue = 10000000D; + numberCellType6.MinimumValue = -10000000D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; 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).Locked = false; @@ -1347,23 +1359,23 @@ this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 93F; this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType17.DecimalPlaces = 0; - numberCellType17.MaximumValue = 10000000D; - numberCellType17.MinimumValue = -10000000D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType17; + numberCellType7.DecimalPlaces = 0; + numberCellType7.MaximumValue = 10000000D; + numberCellType7.MinimumValue = -10000000D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(17).Label = "입고"; this.fpSpread1_Sheet1.Columns.Get(17).Tag = "구매입고"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType18; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "Item"; this.fpSpread1_Sheet1.Columns.Get(18).Tag = "item"; this.fpSpread1_Sheet1.Columns.Get(18).Visible = false; this.fpSpread1_Sheet1.Columns.Get(18).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType19; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "ItemSupplyidx"; this.fpSpread1_Sheet1.Columns.Get(19).Visible = false; this.fpSpread1_Sheet1.Columns.Get(19).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType20; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "idx"; @@ -1379,11 +1391,11 @@ this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; - noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo2.HardMarginX = 0F; - noPrinterPrintInfo2.HardMarginY = 0F; - noPrinterPrintInfo2.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; + noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo1.HardMarginX = 0F; + noPrinterPrintInfo1.HardMarginY = 0F; + noPrinterPrintInfo1.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -1397,16 +1409,6 @@ this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist"; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton5 - // - this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(115, 44); - this.toolStripButton5.Text = "NR구매요청"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); - // // fPartList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 41f19ba..7b636f0 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -140,8 +140,7 @@ namespace FPJ0000 this.ta.FillByIDX(this.dsPRJ.Projects, this.ProjectIndex); //order by 절은 다시 생성한다. - var SSQl = " SELECT * FROM ProjectsPart " + - " WHERE Project = @prj"; + var SSQl = " SELECT * FROM ProjectsPart WHERE Project = @prj"; if (radSortGrp.Checked) { sortkey = "itemgroup asc,option1 asc ,no asc,itemname asc"; @@ -207,10 +206,8 @@ namespace FPJ0000 var 구매완료 = 0; // 입고수량 >= 구매수량 //var 입력오류 = 0; - var project = int.Parse(tbIdx.Text); - - FCOMMON.DBM.buyinfo TotInfo = new FCOMMON.DBM.buyinfo(); + var TotInfo = new FCOMMON.DBM.buyinfo(); List sidlist = new List(); for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) @@ -250,7 +247,7 @@ namespace FPJ0000 } } - else if(v_sid.StartsWith("신규")) + else if (v_sid.StartsWith("신규")) { sidinfo = new FCOMMON.DBM.buyinfo(); row.ForeColor = Color.Gray; @@ -678,7 +675,7 @@ namespace FPJ0000 return; } - var f = new fProjectPartToPurchaseCR(ProjectIndex, idxlist,true); + var f = new fProjectPartToPurchaseCR(ProjectIndex, idxlist, true); f.ShowDialog(); //this.fpSpread1.ActiveSheet.ClearSelection(); } @@ -867,7 +864,7 @@ namespace FPJ0000 return; } - var f = new fProjectPartToPurchaseCR(ProjectIndex, idxlist,false); + var f = new fProjectPartToPurchaseCR(ProjectIndex, idxlist, false); f.ShowDialog(); //this.fpSpread1.ActiveSheet.ClearSelection(); } diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 970cc51..e45b013 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -148,7 +148,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAi - mQAAIpkBE2TaRwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGHSURBVFhH7ZUx + mAAAIpgBwSM4owAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGHSURBVFhH7ZUx SgNhFIT3aLaKB7CyVywEK7t4ASshjSA21jYWNmJhK3gEb6Ct1epn3vB+wiDBhZdd2IFpJjP/+wpNullD dXu8txizAezH7OkAvi3P+v7lehSGZQYc4hlwqC3gWD0JwNW39tHus8LHxeFWrPvBsvolkSL4Lbi/iwrr PiyBlSJUwY0rrPuwBFaKUAU3rrDuwxJYKUIV3LjCug9LYKUIVXDjdb/fXfSvV6cbma57Y926D0tgpQhV @@ -161,7 +161,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAkBJREFUSEvt1u9LE3EcB/B7XA/6U3rQv2AFouxBRVvD9EE9KbAHISwoC6IpDVx0 + wQAADsEBuJFr7QAAAkBJREFUSEvt1u9LE3EcB/B7XA/6U3rQv2AFouxBRVvD9EE9KbAHISwoC6IpDVx0 bm2IgkkxzMIfiaFECYp33o/9aC3O0+XImei2s83Vft19uru+F6tuxfTOHugb3tzY7njx/ex7x2EHM+cf 0m0XH7Gx/ejZB4tXEIthdi/b/TRcAh8tmlrFsOKUB7EHFR6PFWBiSTK1ivEHHP2UBbOjGIfwIQypbBGo FeHnZ0cgVneV66rz31ZM8Bk44yafIXb/4Al2A5pdBINY40cdWEiq1/0ecjkDvdPxOGLNWXE6V4S+twno @@ -177,7 +177,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG - 6wAABusBTDGeSgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFNSURBVFhH7ZLN + 6gAABuoBnnZ8rgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFNSURBVFhH7ZLN S8MwGIf7Z3sXvHSIIlU2u01oL0rXzTm/ceuGzM+rB0FchTEQbx1MwUrllbTLIV3bZUknyQPPpdD+HtIo kkVRXGsMm8YN0Xbj2QvdLDV9s977mUfDdnxwXbO/KoVWAU2nw65eD16evIBk/2IUuWd1grcPj0qj3g3u Ou5nRW1to/lkeAfCdzNFsghcUfVI/HkYCEJkWT3WUEY8eQWC9447SYzMMxC8bb/O/t15B4IzI5chEIyN @@ -189,7 +189,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG - 6wAABusBTDGeSgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVsSURBVFhH3VhZ + 6gAABuoBnnZ8rgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVsSURBVFhH3VhZ TxtXFJ6qfWr7Q1pVrSK1PyAvSaUWAqZsITg4tC8EUvWhUpUAqVMgYLOTsENMqzSYNSyChLAFSAqhNuAQ A0ElQMJOKPsYg8fTe8Z3wtg+GIOBh37SJ4/mnuXzzF3OGeZ/i7zob766l3QuvToj4NHD3NCnjzUKQ0dJ +CiwrVhhgHvV6QFNxCY1J/bsl9TteJGtPP2xNlmmbswN0Rvrflr+t0fJb/YluCTYvKj9cRl8ylL8VMk/ @@ -219,12 +219,6 @@ 100, 17 - - 100, 17 - - - 17, 17 - 17, 17 @@ -282,7 +276,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wQAADsEBuJFr7QAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -294,7 +288,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wQAADsEBuJFr7QAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -306,7 +300,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -317,7 +311,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -326,7 +320,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -335,7 +329,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -366,20 +360,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY - zVTMdDqnaGpDFwbZYhqZl9BEpQuidHlRoV10avM253TDGZnL1Ob9Ak6Xuss5bmf67TlnyxkI/eDD8+I5 - 3w/n9z2Hx07IXVXihRKtMrJU+ztUpqXISXOUsaeOjizpp8MfaQynpeoKv6i3e7jQzgl70Ks2WegVg8Hg - Mts2YLZ6WbGw0Pi5aEH+p1nElo7aBZmKvZ6oeyKKNCY23D/thG6GgW6WgXaagWbKAdWvDbSO2LDBAE2j - FPI/zCD5iYH6RxIqa6XW7Q4MzrnwdY4hJ4MBTuJAj3EDX0bsRLCJwUUXdAtOFCpmwb/T+YYLx5QFTV6T - RW2Jq68gueoqqtrqUdBQBr7MH0EEQeEphMiPo7ypnFvFSjNYWrUjJKGH4QTRJfz3ncPNaB5/gSptLidJ - qAxH7qt4ZNXHQlRzEUk1SWgaWkKzwYrP39exRnoKlffSnEBQIdjrJ8t2ace68XJYjmJVJidJrI4g4UtI - e5YKtdHGrdIxTkFJeli1ORFa0OcWsBNW1ENLaoXQGzWo0d3Gw/YcxJSdQ2JlFPTTduhJsWzB6gl3J2Yi - CJHvEJy5J3OeyDuI+AoBBif6UdidDrlCgtjHwahXfcS3eQZ6Umz/lBN9BJPFCf59j+Co1EccKD2ArLo4 - XK8OQ1z5eU4iUcRD2pBK3iQY7P3grAsD7CcmWEiRAdkatyBQum8+ULqfPOSDwFwfXC4ORsZzIdQjShQq - 85D+TghRdTT0RKAj/4aWCGjnJhGovCucze6lF9doDM27OHrGFnCrNg0pJCiuiUVO3c3tOxa7w0UEjV4B - a5szewX/w8aukLpDcFLSZX/6unFrt4d3o6ura/NwQpPVEydFprVPzqzbLezF5DKFSRMFo4dlq5ODbd5K - u8MURa353mj54YnzeMfS2jICRK3tR8RKc4C4kd4mxY3/X0SNtK+oZfVQUkuHv1CRzOPxeH8AEjGeJMnL - 9/8AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6WpTQ3s + ZjrMvM0pmprowiBbTCNTF5qoUSFK0osK7aJTmzq3ObfhjMxlanPeBS9L3eUc3Zl+e87ZUgOhH3x4Xjzn + ++H8vufw2Am9r0q8VKZXRJXrf4dJ9BQ5aQ4ZexroqDIdHfFEazor1lT6Rb/dx4V2T/ijXs2ijV42mUxu + q2MdVvsOyzYWGj/nbSj8NA1B+YiTnyXf7416JrJEu8iGdZMuGKYYGKYZ6CcZaCc2oPq1jvZhB9YZoGWE + QuGHKaQ8M1H/SMIk7dSacwMDM258nWHIyaCfk2xAbV7Hl2EnEWxiYN4Nw5wLxfJpBN/rfsOFY2VBlhuS + 6C1RzTWkVF9HdUcDippkCJb4I4jALz6DUOlJVLRUcKvYaQYLK06EJqgZThBTFvy+e6gVrWOvUK3P5yQJ + VRHIb4xHdoMAwtrLSK5NRsvgAlpNdnz+voZV0lOYtJfmBPxK/n4/SY5bP9qD10NSlKqyOEliTSQJX0H6 + izRozA5ula4xCgrSw4rDhbCiPo+AnfASNZ1blwSjWYtaw1087sxDrOwCEquiYZx0wkiKZQvWjHs6sRJB + qHSX4NwDietUwWHEV/IxMK5DcU8GpPJcCJ6GoEH1Ed9mGRhJsboJF/oIizYXgh96BcfFPqJA8SFk18fh + Zk044ioucpJceTzETWnkTULA3g9Mu9HPfmKCjRQZkKP1CALFB2YDxQfJQz4IzPfB1dIQZL5MgmZYgWJF + ATLeJUFYEwMjERjIv6EnAtq1SQSqnRXO5/TS86s0BmfdHOrROdypS0cqCYpqBcirv719x+LccBNB846A + tc1YdwT/w8GukLZLcDpX6Xze2LS118N7oVQqN48mtNi9cVJkeqdlas1pYy8sSxQsixTMXpbsLg62eTvt + CVMUtep7q+2HN87jnUjvyAwQtnceEymsAaJmeptUD/5/ETbTvsK2lSPJbV3+SfIUHo/H+wMQBp4hAxtM + QgAAAABJRU5ErkJggg== @@ -412,21 +406,6 @@ 4PP5KGnqmfqFyWSisPDEcgfLVReWv7hBcOReQMgN4abq6g/2gDQWZmd8fHzY4XB8lcjD7IOMe+/68LkW ZORzJCpe3FIpzsKcmJjQSr8lG1epVML8/DxLWqPRYGRkBLdfXYddfAaLOMjIlszgZQfnGB0dhdFohE6n u+SAVypMDx09cIrPmTLtdL7I4F/AK69Z+1SK72SbdjpzHMf9Asu3+BhNj8g8AAAAAElFTkSuQmCC - - - - - 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== @@ -451,6 +430,21 @@ dTVtOHAdQcU/0ec9yYFgz7Gsob9cEFxHUPEfnfmxRt2qmzAMcSVHZCwORM97rhs43QnDfgcfNTK35BJx OoVFHemLDk6YMYYkznY9rVHQcuYScTKmfXt4qsoVcIMsiPSodQUsSS/kN21kJSck8Etm4mYkpSNCaG8N BgGCOU5VYvilbNH5lf3kX6KTANNGykSfZM56Xqk9aojF/gULrkqYb3L8uAAAAABJRU5ErkJggg== + + + + + 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== @@ -465,7 +459,4 @@ 711, 18 - - 614, 18 - \ No newline at end of file