From 06b0699bf7accce89b7d31ea7f1a868678371ae8 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 18 Oct 2023 13:09:25 +0900 Subject: [PATCH] .. --- .../FEQ0000/Purchase/fPurchaseNR.Designer.cs | 26 +- SubProject/FEQ0000/Purchase/fPurchaseNR.cs | 19 +- .../Purchase/fPurchase_Add.Designer.cs | 31 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 58 ++- SubProject/FEQ0000/dsPurchase.xsd | 24 +- SubProject/FEQ0000/fItemin.Designer.cs | 482 +++++++++--------- SubProject/FEQ0000/fItemin.cs | 2 +- SubProject/FEQ0000/fItemin.resx | 233 ++++----- 8 files changed, 489 insertions(+), 386 deletions(-) diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs index 3a2edba..67dc956 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs @@ -149,6 +149,7 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.엑셀에서열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -784,7 +785,8 @@ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.금일입고품목ToolStripMenuItem, this.내가등록한자료ToolStripMenuItem, - this.이번달자료ToolStripMenuItem}); + this.이번달자료ToolStripMenuItem, + this.엑셀에서열기ToolStripMenuItem}); this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; @@ -794,21 +796,21 @@ // 금일입고품목ToolStripMenuItem // this.금일입고품목ToolStripMenuItem.Name = "금일입고품목ToolStripMenuItem"; - this.금일입고품목ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.금일입고품목ToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.금일입고품목ToolStripMenuItem.Text = "금일 입고 품목"; this.금일입고품목ToolStripMenuItem.Click += new System.EventHandler(this.금일입고품목ToolStripMenuItem_Click); // // 내가등록한자료ToolStripMenuItem // this.내가등록한자료ToolStripMenuItem.Name = "내가등록한자료ToolStripMenuItem"; - this.내가등록한자료ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.내가등록한자료ToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.내가등록한자료ToolStripMenuItem.Text = "내가 등록한 자료"; this.내가등록한자료ToolStripMenuItem.Click += new System.EventHandler(this.내가등록한자료ToolStripMenuItem_Click); // // 이번달자료ToolStripMenuItem // this.이번달자료ToolStripMenuItem.Name = "이번달자료ToolStripMenuItem"; - this.이번달자료ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.이번달자료ToolStripMenuItem.Size = new System.Drawing.Size(213, 22); this.이번달자료ToolStripMenuItem.Text = "이번달 자료"; this.이번달자료ToolStripMenuItem.Click += new System.EventHandler(this.이번달자료ToolStripMenuItem_Click); // @@ -857,7 +859,7 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); - this.fpSpread1.SetViewportLeftColumn(0, 0, 9); + this.fpSpread1.SetViewportLeftColumn(0, 0, 10); // // label1 // @@ -883,6 +885,13 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // 엑셀에서열기ToolStripMenuItem + // + this.엑셀에서열기ToolStripMenuItem.Name = "엑셀에서열기ToolStripMenuItem"; + this.엑셀에서열기ToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.엑셀에서열기ToolStripMenuItem.Text = "Excel 파일로 저장 후 열기"; + this.엑셀에서열기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서열기ToolStripMenuItem_Click); + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -897,7 +906,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "구매\r\n검사"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "구매신청일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Storage"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "보관소"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Cost Center"; @@ -963,7 +972,7 @@ 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).Label = "보관소"; 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; @@ -1156,6 +1165,7 @@ this.fpSpread1_Sheet1.Columns.Get(29).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(29).Visible = false; this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F; + textCellType19.WordWrap = true; this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(30).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; @@ -1190,6 +1200,7 @@ this.fpSpread1_Sheet1.Columns.Get(34).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(34).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F; + textCellType23.WordWrap = true; this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(35).DataField = "chkremark"; this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; @@ -1332,6 +1343,7 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel7; private System.Windows.Forms.ToolStripComboBox cmbManager; private System.Windows.Forms.ToolStripComboBox cmbAdmin; + private System.Windows.Forms.ToolStripMenuItem 엑셀에서열기ToolStripMenuItem; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs index 9354f86..ed348fc 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs @@ -803,7 +803,7 @@ namespace FEQ0000 | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); var a = FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n\n" + sd.FileName + "\n파일을 확인 할까요?"); - if(a == DialogResult.Yes) + if (a == DialogResult.Yes) { FCOMMON.Util.RunExplorer(sd.FileName); } @@ -1402,5 +1402,22 @@ namespace FEQ0000 FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); } } + + private void 엑셀에서열기ToolStripMenuItem_Click(object sender, EventArgs e) + { + var fn = DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls"; + fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "temp", fn); + var fi = new System.IO.FileInfo(fn); + if (fi.Directory.Exists == false) fi.Directory.Create(); + + fpSpread1.SaveExcel(fi.FullName, + FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + | FarPoint.Excel.ExcelSaveFlags.NoFormulas + | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders + ); + + FCOMMON.Util.RunExplorer(fi.FullName); + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index b28c086..40b6383 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -92,7 +92,6 @@ this.chk2 = new System.Windows.Forms.CheckBox(); this.chk1 = new System.Windows.Forms.CheckBox(); this.btSIDChk = new System.Windows.Forms.Button(); - this.tbStorage = new System.Windows.Forms.TextBox(); this.tbPumPriceD = new System.Windows.Forms.TextBox(); this.button3 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); @@ -118,6 +117,7 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.tbStorage = new System.Windows.Forms.ComboBox(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -357,9 +357,9 @@ label10.Location = new System.Drawing.Point(287, 237); label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label10.Name = "label10"; - label10.Size = new System.Drawing.Size(75, 20); + label10.Size = new System.Drawing.Size(54, 20); label10.TabIndex = 23; - label10.Text = "STORAGE"; + label10.Text = "보관소"; // // label11 // @@ -729,6 +729,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.tbStorage); this.groupBox1.Controls.Add(label18); this.groupBox1.Controls.Add(this.cmbRemark); this.groupBox1.Controls.Add(this.cmbCurrency); @@ -739,7 +740,6 @@ this.groupBox1.Controls.Add(this.chk2); this.groupBox1.Controls.Add(this.chk1); this.groupBox1.Controls.Add(this.btSIDChk); - this.groupBox1.Controls.Add(this.tbStorage); this.groupBox1.Controls.Add(label10); this.groupBox1.Controls.Add(label9); this.groupBox1.Controls.Add(this.tbPumPriceD); @@ -860,14 +860,6 @@ this.btSIDChk.UseVisualStyleBackColor = false; this.btSIDChk.Click += new System.EventHandler(this.btSIDChk_Click); // - // tbStorage - // - this.tbStorage.Location = new System.Drawing.Point(370, 234); - this.tbStorage.Margin = new System.Windows.Forms.Padding(4); - this.tbStorage.Name = "tbStorage"; - this.tbStorage.Size = new System.Drawing.Size(104, 27); - this.tbStorage.TabIndex = 24; - // // tbPumPriceD // this.tbPumPriceD.ForeColor = System.Drawing.Color.Blue; @@ -1135,6 +1127,19 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // + // tbStorage + // + this.tbStorage.FormattingEnabled = true; + this.tbStorage.ImeMode = System.Windows.Forms.ImeMode.Alpha; + this.tbStorage.Items.AddRange(new object[] { + "NR", + "SPR"}); + this.tbStorage.Location = new System.Drawing.Point(345, 233); + this.tbStorage.Margin = new System.Windows.Forms.Padding(4); + this.tbStorage.Name = "tbStorage"; + this.tbStorage.Size = new System.Drawing.Size(129, 28); + this.tbStorage.TabIndex = 52; + // // fPurchase_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -1208,7 +1213,6 @@ private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button7; private System.Windows.Forms.TextBox tbPumPriceD; - private System.Windows.Forms.TextBox tbStorage; private System.Windows.Forms.TextBox tbInQty; private System.Windows.Forms.Button btSIDChk; private System.Windows.Forms.Timer timer1; @@ -1226,5 +1230,6 @@ private System.Windows.Forms.ComboBox tbManager; private System.Windows.Forms.ComboBox cmbCurrency; private System.Windows.Forms.ComboBox cmbRemark; + private System.Windows.Forms.ComboBox tbStorage; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index ccb3dd7..afef808 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -2798,6 +2798,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnpurchase_admin; + private global::System.Data.DataColumn columnplace; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public IpkolistDataTable() { @@ -3023,6 +3025,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn placeColumn { + get { + return this.columnplace; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3084,7 +3094,8 @@ namespace FEQ0000 { string orderno, int sortkey, string purchase_manager, - string purchase_admin) { + string purchase_admin, + string place) { IpkolistRow rowIpkolistRow = ((IpkolistRow)(this.NewRow())); object[] columnValuesArray = new object[] { source, @@ -3110,7 +3121,8 @@ namespace FEQ0000 { orderno, sortkey, purchase_manager, - purchase_admin}; + purchase_admin, + place}; rowIpkolistRow.ItemArray = columnValuesArray; this.Rows.Add(rowIpkolistRow); return rowIpkolistRow; @@ -3165,6 +3177,7 @@ namespace FEQ0000 { this.columnsortkey = base.Columns["sortkey"]; this.columnpurchase_manager = base.Columns["purchase_manager"]; this.columnpurchase_admin = base.Columns["purchase_admin"]; + this.columnplace = base.Columns["place"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3218,6 +3231,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnpurchase_manager); this.columnpurchase_admin = new global::System.Data.DataColumn("purchase_admin", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpurchase_admin); + this.columnplace = new global::System.Data.DataColumn("place", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnplace); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnsource, this.columnidx}, true)); @@ -3261,6 +3276,8 @@ namespace FEQ0000 { this.columnpurchase_manager.MaxLength = 50; this.columnpurchase_admin.ReadOnly = true; this.columnpurchase_admin.MaxLength = 50; + this.columnplace.ReadOnly = true; + this.columnplace.MaxLength = 20; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7258,6 +7275,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string place { + get { + if (this.IsplaceNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableIpkolist.placeColumn])); + } + } + set { + this[this.tableIpkolist.placeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -7521,6 +7554,18 @@ namespace FEQ0000 { public void Setpurchase_adminNull() { this[this.tableIpkolist.purchase_adminColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsplaceNull() { + return this.IsNull(this.tableIpkolist.placeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetplaceNull() { + this[this.tableIpkolist.placeColumn] = global::System.Convert.DBNull; + } } /// @@ -13380,6 +13425,7 @@ ORDER BY pdate DESC, idx DESC"; tableMapping.ColumnMappings.Add("sortkey", "sortkey"); tableMapping.ColumnMappings.Add("purchase_manager", "purchase_manager"); tableMapping.ColumnMappings.Add("purchase_admin", "purchase_admin"); + tableMapping.ColumnMappings.Add("place", "place"); this._adapter.TableMappings.Add(tableMapping); } @@ -13397,13 +13443,13 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM Purchase WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM EETGW_PurchaseCR WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) @@ -13416,13 +13462,13 @@ ORDER BY sortkey, wdate DESC"; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM Purchase WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM EETGW_PurchaseCR WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index fd8b225..c97aeb2 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -871,13 +871,13 @@ ORDER BY pdate DESC, idx DESC SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM Purchase WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM EETGW_PurchaseCR WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) @@ -917,19 +917,20 @@ ORDER BY sortkey, wdate DESC + SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM Purchase WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey, purchase_manager, purchase_admin, place FROM EETGW_PurchaseCR WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(purchase_manager, '') LIKE @search_manager) AND (ISNULL(purchase_admin, '') LIKE @search_admin) @@ -1509,14 +1510,14 @@ GROUP BY purchase_admin - + - + @@ -1617,6 +1618,13 @@ GROUP BY purchase_admin + + + + + + + @@ -1710,10 +1718,10 @@ GROUP BY purchase_admin - + - + diff --git a/SubProject/FEQ0000/fItemin.Designer.cs b/SubProject/FEQ0000/fItemin.Designer.cs index 8de8e37..95c11b5 100644 --- a/SubProject/FEQ0000/fItemin.Designer.cs +++ b/SubProject/FEQ0000/fItemin.Designer.cs @@ -31,16 +31,16 @@ namespace FEQ0000 { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItemin)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.button1 = new System.Windows.Forms.Button(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); @@ -54,8 +54,12 @@ namespace FEQ0000 this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.tbman = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.tbadm = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.ipkolistDataGridView = new System.Windows.Forms.DataGridView(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -72,6 +76,9 @@ namespace FEQ0000 this.btFind = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.lbSum = new System.Windows.Forms.ToolStripLabel(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.label3 = new System.Windows.Forms.Label(); @@ -102,28 +109,6 @@ namespace FEQ0000 this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.tbindate = new System.Windows.Forms.ToolStripTextBox(); this.btRefreshIn = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); - this.lbSum = new System.Windows.Forms.ToolStripLabel(); - this.dvc_in = new System.Windows.Forms.DataGridViewButtonColumn(); - this.dvc_manager = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_admin = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); - this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); - this.tbadm = new System.Windows.Forms.ToolStripComboBox(); - this.tbman = new System.Windows.Forms.ToolStripComboBox(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPurchase = new FEQ0000.dsPurchase(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -142,6 +127,23 @@ namespace FEQ0000 this.dsPurchase1 = new FEQ0000.dsPurchase(); this.ta = new FEQ0000.dsPurchaseTableAdapters.IpkolistTableAdapter(); this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.dvc_in = new System.Windows.Forms.DataGridViewButtonColumn(); + this.dvc_manager = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_admin = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.place = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ipkolistDataGridView)).BeginInit(); @@ -287,6 +289,37 @@ namespace FEQ0000 this.toolStripButton2.Text = "QR지우기"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47); + // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(55, 44); + this.toolStripLabel6.Text = "구매담당"; + this.toolStripLabel6.Click += new System.EventHandler(this.toolStripLabel6_Click); + // + // tbman + // + this.tbman.Font = new System.Drawing.Font("맑은 고딕", 17F); + this.tbman.Name = "tbman"; + this.tbman.Size = new System.Drawing.Size(150, 47); + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(55, 44); + this.toolStripLabel7.Text = "구매승인"; + this.toolStripLabel7.Click += new System.EventHandler(this.toolStripLabel7_Click); + // + // tbadm + // + this.tbadm.Font = new System.Drawing.Font("맑은 고딕", 17F); + this.tbadm.Name = "tbadm"; + this.tbadm.Size = new System.Drawing.Size(150, 47); + // // toolStripButton3 // this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); @@ -296,11 +329,6 @@ namespace FEQ0000 this.toolStripButton3.Text = "새로고침"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47); - // // ipkolistDataGridView // this.ipkolistDataGridView.AllowUserToAddRows = false; @@ -316,6 +344,7 @@ namespace FEQ0000 this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4, + this.place, this.dataGridViewTextBoxColumn5, this.dataGridViewTextBoxColumn6, this.dataGridViewTextBoxColumn7, @@ -326,22 +355,22 @@ namespace FEQ0000 this.dataGridViewTextBoxColumn13, this.dataGridViewTextBoxColumn12}); this.ipkolistDataGridView.DataSource = this.bs; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle14.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle14.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.ipkolistDataGridView.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.ipkolistDataGridView.DefaultCellStyle = dataGridViewCellStyle4; this.ipkolistDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.ipkolistDataGridView.Location = new System.Drawing.Point(0, 98); this.ipkolistDataGridView.Name = "ipkolistDataGridView"; this.ipkolistDataGridView.ReadOnly = true; this.ipkolistDataGridView.RowHeadersVisible = false; this.ipkolistDataGridView.RowTemplate.Height = 23; - this.ipkolistDataGridView.Size = new System.Drawing.Size(1282, 539); + this.ipkolistDataGridView.Size = new System.Drawing.Size(1282, 499); this.ipkolistDataGridView.TabIndex = 0; this.ipkolistDataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.ipkolistDataGridView_CellClick); this.ipkolistDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.ipkolistDataGridView_DataError); @@ -495,9 +524,28 @@ namespace FEQ0000 this.toolStripButton5.Text = "검색지우기"; this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39); + // + // toolStripLabel5 + // + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(55, 36); + this.toolStripLabel5.Text = "합계금액"; + // + // lbSum + // + this.lbSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold); + this.lbSum.Name = "lbSum"; + this.lbSum.Size = new System.Drawing.Size(30, 36); + this.lbSum.Text = "0"; + // // panel2 // this.panel2.Controls.Add(this.ipkolistDataGridView); + this.panel2.Controls.Add(this.textBox1); this.panel2.Controls.Add(this.bn); this.panel2.Controls.Add(this.statusStrip1); this.panel2.Controls.Add(this.panel3); @@ -592,15 +640,15 @@ namespace FEQ0000 this.dataGridViewTextBoxColumn23, this.dataGridViewTextBoxColumn24}); this.dv2.DataSource = this.bs2; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle20.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); - dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv2.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle10.Font = new System.Drawing.Font("맑은 고딕", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(1, 5, 1, 5); + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv2.DefaultCellStyle = dataGridViewCellStyle10; this.dv2.Dock = System.Windows.Forms.DockStyle.Fill; this.dv2.Location = new System.Drawing.Point(3, 50); this.dv2.Name = "dv2"; @@ -823,161 +871,6 @@ namespace FEQ0000 this.btRefreshIn.Text = "새로고침"; this.btRefreshIn.Click += new System.EventHandler(this.btRefreshIn_Click); // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39); - // - // toolStripLabel5 - // - this.toolStripLabel5.Name = "toolStripLabel5"; - this.toolStripLabel5.Size = new System.Drawing.Size(55, 36); - this.toolStripLabel5.Text = "합계금액"; - // - // lbSum - // - this.lbSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold); - this.lbSum.Name = "lbSum"; - this.lbSum.Size = new System.Drawing.Size(30, 36); - this.lbSum.Text = "0"; - // - // dvc_in - // - this.dvc_in.DataPropertyName = "request"; - this.dvc_in.HeaderText = "요청자"; - this.dvc_in.Name = "dvc_in"; - this.dvc_in.ReadOnly = true; - // - // dvc_manager - // - this.dvc_manager.DataPropertyName = "purchase_manager"; - this.dvc_manager.HeaderText = "구매담당"; - this.dvc_manager.Name = "dvc_manager"; - this.dvc_manager.ReadOnly = true; - // - // dvc_admin - // - this.dvc_admin.DataPropertyName = "purchase_admin"; - this.dvc_admin.HeaderText = "구매승인"; - this.dvc_admin.Name = "dvc_admin"; - this.dvc_admin.ReadOnly = true; - // - // toolStripLabel6 - // - this.toolStripLabel6.Name = "toolStripLabel6"; - this.toolStripLabel6.Size = new System.Drawing.Size(55, 44); - this.toolStripLabel6.Text = "구매담당"; - this.toolStripLabel6.Click += new System.EventHandler(this.toolStripLabel6_Click); - // - // toolStripLabel7 - // - this.toolStripLabel7.Name = "toolStripLabel7"; - this.toolStripLabel7.Size = new System.Drawing.Size(55, 44); - this.toolStripLabel7.Text = "구매승인"; - this.toolStripLabel7.Click += new System.EventHandler(this.toolStripLabel7_Click); - // - // tbadm - // - this.tbadm.Font = new System.Drawing.Font("맑은 고딕", 17F); - this.tbadm.Name = "tbadm"; - this.tbadm.Size = new System.Drawing.Size(150, 47); - // - // tbman - // - this.tbman.Font = new System.Drawing.Font("맑은 고딕", 17F); - this.tbman.Name = "tbman"; - this.tbman.Size = new System.Drawing.Size(150, 47); - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "source"; - this.dataGridViewTextBoxColumn1.HeaderText = "위치"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "pdate"; - this.dataGridViewTextBoxColumn3.HeaderText = "등록일"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.ReadOnly = true; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "state"; - this.dataGridViewTextBoxColumn4.HeaderText = "상태"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "sid"; - this.dataGridViewTextBoxColumn5.HeaderText = "SID"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "pumname"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle11; - this.dataGridViewTextBoxColumn6.HeaderText = "품명"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.DataPropertyName = "pumscale"; - this.dataGridViewTextBoxColumn7.HeaderText = "모델"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; - // - // dataGridViewTextBoxColumn8 - // - this.dataGridViewTextBoxColumn8.DataPropertyName = "pumqty"; - this.dataGridViewTextBoxColumn8.HeaderText = "수량"; - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.ReadOnly = true; - // - // dataGridViewTextBoxColumn9 - // - this.dataGridViewTextBoxColumn9.DataPropertyName = "pumprice"; - dataGridViewCellStyle12.Format = "N0"; - this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle12; - this.dataGridViewTextBoxColumn9.HeaderText = "단가"; - this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; - this.dataGridViewTextBoxColumn9.ReadOnly = true; - // - // dataGridViewTextBoxColumn10 - // - this.dataGridViewTextBoxColumn10.DataPropertyName = "pumamt"; - dataGridViewCellStyle13.Format = "N0"; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle13; - this.dataGridViewTextBoxColumn10.HeaderText = "금액"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; - // - // dataGridViewTextBoxColumn11 - // - this.dataGridViewTextBoxColumn11.DataPropertyName = "supply"; - this.dataGridViewTextBoxColumn11.HeaderText = "공급"; - this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; - this.dataGridViewTextBoxColumn11.ReadOnly = true; - // - // dataGridViewTextBoxColumn13 - // - this.dataGridViewTextBoxColumn13.DataPropertyName = "bigo"; - this.dataGridViewTextBoxColumn13.HeaderText = "비고"; - this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; - this.dataGridViewTextBoxColumn13.ReadOnly = true; - // - // dataGridViewTextBoxColumn12 - // - this.dataGridViewTextBoxColumn12.DataPropertyName = "project"; - this.dataGridViewTextBoxColumn12.HeaderText = "연관프로젝트"; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.ReadOnly = true; - // // bs // this.bs.DataMember = "Ipkolist"; @@ -1019,8 +912,8 @@ namespace FEQ0000 // dataGridViewTextBoxColumn17 // this.dataGridViewTextBoxColumn17.DataPropertyName = "pumname"; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn17.DefaultCellStyle = dataGridViewCellStyle5; this.dataGridViewTextBoxColumn17.HeaderText = "품명"; this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; this.dataGridViewTextBoxColumn17.ReadOnly = true; @@ -1028,8 +921,8 @@ namespace FEQ0000 // dataGridViewTextBoxColumn18 // this.dataGridViewTextBoxColumn18.DataPropertyName = "pumscale"; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle6; this.dataGridViewTextBoxColumn18.HeaderText = "모델"; this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18"; this.dataGridViewTextBoxColumn18.ReadOnly = true; @@ -1037,9 +930,9 @@ namespace FEQ0000 // dataGridViewTextBoxColumn19 // this.dataGridViewTextBoxColumn19.DataPropertyName = "pumqty"; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle17.Format = "N0"; - this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle7.Format = "N0"; + this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle7; this.dataGridViewTextBoxColumn19.HeaderText = "수량"; this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19"; this.dataGridViewTextBoxColumn19.ReadOnly = true; @@ -1047,9 +940,9 @@ namespace FEQ0000 // dataGridViewTextBoxColumn20 // this.dataGridViewTextBoxColumn20.DataPropertyName = "pumprice"; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle18.Format = "N0"; - this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle8.Format = "N0"; + this.dataGridViewTextBoxColumn20.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn20.HeaderText = "단가"; this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; this.dataGridViewTextBoxColumn20.ReadOnly = true; @@ -1057,9 +950,9 @@ namespace FEQ0000 // dataGridViewTextBoxColumn21 // this.dataGridViewTextBoxColumn21.DataPropertyName = "pumamt"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle19.Format = "N0"; - this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle9.Format = "N0"; + this.dataGridViewTextBoxColumn21.DefaultCellStyle = dataGridViewCellStyle9; this.dataGridViewTextBoxColumn21.HeaderText = "금액"; this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; this.dataGridViewTextBoxColumn21.ReadOnly = true; @@ -1107,6 +1000,135 @@ namespace FEQ0000 this.tam.PurchaseTableAdapter = null; this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "bigo", true)); + this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.textBox1.Location = new System.Drawing.Point(0, 597); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(1282, 40); + this.textBox1.TabIndex = 7; + // + // dvc_in + // + this.dvc_in.DataPropertyName = "request"; + this.dvc_in.HeaderText = "요청자"; + this.dvc_in.Name = "dvc_in"; + this.dvc_in.ReadOnly = true; + // + // dvc_manager + // + this.dvc_manager.DataPropertyName = "purchase_manager"; + this.dvc_manager.HeaderText = "구매담당"; + this.dvc_manager.Name = "dvc_manager"; + this.dvc_manager.ReadOnly = true; + // + // dvc_admin + // + this.dvc_admin.DataPropertyName = "purchase_admin"; + this.dvc_admin.HeaderText = "구매승인"; + this.dvc_admin.Name = "dvc_admin"; + this.dvc_admin.ReadOnly = true; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "source"; + this.dataGridViewTextBoxColumn1.HeaderText = "입력"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.DataPropertyName = "pdate"; + this.dataGridViewTextBoxColumn3.HeaderText = "등록일"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.DataPropertyName = "state"; + this.dataGridViewTextBoxColumn4.HeaderText = "상태"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; + // + // place + // + this.place.DataPropertyName = "place"; + this.place.HeaderText = "보관소"; + this.place.Name = "place"; + this.place.ReadOnly = true; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "sid"; + this.dataGridViewTextBoxColumn5.HeaderText = "SID"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.DataPropertyName = "pumname"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewTextBoxColumn6.HeaderText = "품명"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.DataPropertyName = "pumscale"; + this.dataGridViewTextBoxColumn7.HeaderText = "모델"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.ReadOnly = true; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.DataPropertyName = "pumqty"; + this.dataGridViewTextBoxColumn8.HeaderText = "수량"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; + // + // dataGridViewTextBoxColumn9 + // + this.dataGridViewTextBoxColumn9.DataPropertyName = "pumprice"; + dataGridViewCellStyle2.Format = "N0"; + this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle2; + this.dataGridViewTextBoxColumn9.HeaderText = "단가"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + // + // dataGridViewTextBoxColumn10 + // + this.dataGridViewTextBoxColumn10.DataPropertyName = "pumamt"; + dataGridViewCellStyle3.Format = "N0"; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewTextBoxColumn10.HeaderText = "금액"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + // + // dataGridViewTextBoxColumn11 + // + this.dataGridViewTextBoxColumn11.DataPropertyName = "supply"; + this.dataGridViewTextBoxColumn11.HeaderText = "공급"; + this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; + this.dataGridViewTextBoxColumn11.ReadOnly = true; + // + // dataGridViewTextBoxColumn13 + // + this.dataGridViewTextBoxColumn13.DataPropertyName = "bigo"; + this.dataGridViewTextBoxColumn13.HeaderText = "비고"; + this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; + this.dataGridViewTextBoxColumn13.ReadOnly = true; + // + // dataGridViewTextBoxColumn12 + // + this.dataGridViewTextBoxColumn12.DataPropertyName = "project"; + this.dataGridViewTextBoxColumn12.HeaderText = "연관프로젝트"; + this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; + this.dataGridViewTextBoxColumn12.ReadOnly = true; + // // fItemin // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1230,12 +1252,18 @@ namespace FEQ0000 private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripLabel toolStripLabel5; private System.Windows.Forms.ToolStripLabel lbSum; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripComboBox tbman; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripComboBox tbadm; + private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.DataGridViewButtonColumn dvc_in; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_manager; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_admin; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.DataGridViewTextBoxColumn place; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; @@ -1245,9 +1273,5 @@ namespace FEQ0000 private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; - private System.Windows.Forms.ToolStripLabel toolStripLabel6; - private System.Windows.Forms.ToolStripComboBox tbman; - private System.Windows.Forms.ToolStripLabel toolStripLabel7; - private System.Windows.Forms.ToolStripComboBox tbadm; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.cs b/SubProject/FEQ0000/fItemin.cs index eba7486..daf2f14 100644 --- a/SubProject/FEQ0000/fItemin.cs +++ b/SubProject/FEQ0000/fItemin.cs @@ -102,7 +102,7 @@ namespace FEQ0000 { try { - var list = new string[] { "sid", "pumname", "bigo" }; + var list = new string[] { "sid","request", "pumname", "bigo","place", "purchase_manager", "purchase_admin" }; var filter = string.Join(" like '%{0}%' or ", list); filter += " like '%{0}%'"; filter = string.Format(filter, search); diff --git a/SubProject/FEQ0000/fItemin.resx b/SubProject/FEQ0000/fItemin.resx index 693460b..d97b74a 100644 --- a/SubProject/FEQ0000/fItemin.resx +++ b/SubProject/FEQ0000/fItemin.resx @@ -127,24 +127,24 @@ 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 @@ -161,31 +161,31 @@ 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 - 81qy7MgAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAV/SURBVFhH3VjZU1tVGL8zbg8uL65/gAuOPLg8O1q1I6MF + CU52oAVKoI6lTBOmUMDLkh1kCYpKQeiDLdN2lEISQksSEmgIEArDsAVRaEu1BVlcXmyl8X7lI7m5uUmA + EB76m/lmcuf73XN+Ofd8yznEA4uEE8Y3RMoe7UHNFWNGzYDzsG5oIqvO9WuGbmhGonONiFQ2B1L3Dgl5 + bU+KVFZ1WpXTldcw9qeyY8lT0bnGatl1Q3P4WvTxDml9WKC0KmB1yNZr99gEMW3PBPLIrthkTZ+r9Ie5 + u2xCghmbQD5pWaD+5FwwE5Ldi5wvLmmQHh5CuTn1yFcj17TGVVYRYCr9skfW6l7PbXKvZNeP3QCD36la + +y0cxgsQzTYGWGHr7D9CRW8tUsNDqLAcy2mcvM02mNa44sn9ZnwxrWqgX6S01ScV6/clFHW+sl/a9Xjc + UeNj8QUXn/+ksONdHMqLYAI3xNm2Lo5fYk451jD1O3MgrXHNIzs9s5yq6TXxiy69ivQtI5jAnFOTt/ll + 5iSkhQbsOfiszEHU+hVPWoVjnF/a+TZSt41Qnxh8fPLyy0hlB0QrBARzz5Ft1/8Ta/p6E/N/fBqpO4K/ + QP85tIZVT4q6z8nlnnsI6YGAVMKMVli5FJXdLpG4HkHajrEpUNYy97dYaZuFselzkRdu3hEorEVI9wck + YSrUZ+gvwL+Ezxrpym0CBII4qgLpDpDtz6RXO6f851vzZNYOTUOw4Ss+QIVgJmFZi3s5kj3HhEjZvQji + 8JHgyS0fyppnluhzlv80v059yVKk+EClDBedCKkkVdvXge5dAafYpMWfXqRqe03MPX+wwjGE7g1A4Yfa + SidBDtxJKtkuOGT3m9Jmt98qQqLnFHTFIoVKyuXWSmbhP1TZv2fdSJrW0U+fW9m+5BEqepToppa5wmGg + E6B8QYVAd9QhUthPaQz+EZ1S6dCjmyAOVTsH6E7pWfc6p9DwHrqjDmpv7pc2+6e3tOrBfnQThKR2cJLu + hD2QmG8IndV3ER8Xdbwka5lZpmsATegmiKy6q7N0Z3a96waXtD6B7qgD5oI56RpAE7oJIlM3/AvdudcC + 40jjU5L60Zt0DVl1wz6B6dXDfhmdCvvl+HzTi+iOOqBVy2kaX6NrgDMOulmCpGXubhLZ+QG6o454KkiO + n3Gv0zVkfDngRDdBwMmM7oQiDqGP7qhDpLR+y2wcUjS9vjQjlFsqVFRypBP2MlHDatHn3kjUFl+i5pJd + r8tOT63SSccb3H8kFlveQkrUwFN0xUqbxvxKnbRlapVDNc5I2UBgs7BKNQu9JnR7wVbwI4FYbbsMjQl9 + 7oBmAcCnlpQ8699u5VGtkKDcGocUaq/06KBlwseIwS+1vA9FgT4ntFugBSk+QMOaWeNy08lgh2uGpqnl + fg7EQbMJTSe+EhHiCozPplcNTMBBjD5f0IYVIJBbS0tYWn5oz0EcPO+GQC557tFkdV9fQMt/fuEOv9xW + grRAwKEpRWMfDDyo+54jFQgrB+IUbdf98t79QxM1d8hDEyBJYYo5Ujca8niI1G0D9hx8VubKgUmqr84n + kaYYpIYGt8zMC3arsBOBnxZ1viZW2w0QEMw9BwZz8cotYqSHh7DMWnvyzNxfzIHA2AQmFOj3fSTTvwDX + HtBkHChoj4HyJVbYvkunkvDn348tMVPJpuU2TtziKcxHcajwCCUOjE0gXBTB6sDF0We60YWcxvG1k83T + 99g+5abBnoPPKig3C3GY8ICrr2S1/TfJ1yM/BzOe3DqPdC9ANJuIYHbi/MK/EBBb3nORYqsCIQlDnhPI + e8iw0bqbCCVQcXHxfm2F8gUVYi8bYS/gwhwuzuHqBLpzaDbh0JNaccUgUlpUEMVIfdBAEP8D39eedx6G + CawAAAAASUVORK5CYII= @@ -197,6 +197,9 @@ True + + True + 354, 17 @@ -209,7 +212,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/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 @@ -220,7 +223,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -229,7 +232,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -238,7 +241,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/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 @@ -283,12 +286,6 @@ Kw/6HydJHj5byGPQIkKNAAAAAElFTkSuQmCC - - 917, 17 - - - 619, 17 - True @@ -307,7 +304,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/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 @@ -318,7 +315,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -327,7 +324,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -336,7 +333,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/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 @@ -369,21 +366,21 @@ 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 @@ -392,62 +389,56 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPsSURBVFhH3VhLTxpRFCZpd7U/o4+0TbtxoxsDw8wAbdOY - iIlJU+APqFXsyrduXPj6G903XXYjZUZjrBEpNOk7cVPFRB4uOmZ6vvGggFeY4VGJX/IlBO495+Pec885 - 97quLTS3+0nc6x3d8Pne67L840NPTz7e2WmA+Kz7fN/xW1yWRzCWp7UWa93dtzVZfqN7vb/1QCC7FYkc - 70WjZmZmxswtLJiFxUWL+Izv9sbGzEQ4XMDYmKr+0rzeKInvYHPNAxm9qSlKlFYqmxwYyO9PTJjHy8v2 - ubRkYk6ytzdHfzCLlYdNNt8YYopyf11Rvuj9/dnDuTmxAAeEDawo2Uyvud332E190CTpBQnMJSKRE5Gz - RrgTCp3EurpyHz2e5+zOGXRJCiHYM9PTQgfN4MHUlAkftBCv2K09YOUw8XB+Xmi4mcSWw1dMkp6x++pA - zGFbW7lylTyYnDSx3bRrd1mGGDhZOBCtiLlaTAwNGXS6U9DAci4Cx38zGDwSGfgf3KY0RKlshOWUA0kY - ec5WKllZOaXoNxFtjj+cnTWpCBzRKl5M5qgQSMKiiWUkR0YyaRqJhG2Rxva2aaTT5vHqqvD3UlrJnCoO - yzoHytc+Bato0hlZXBF2REJcEXZEouLEVfUnyzoFijmyO0qSaFIpSx0C1UQ6GXtG0hALBHIxWX7E8kgg - LSkKv3CCgHYc1yWOiQaDNA2zPJcLbRG6EtHgy1hNQCPiQGjRFeUdy6P4o34O7ZFocDWKhDQqDsxQCdxQ - 1a8sz6oeOfRwosG1WCmoFPWIA7Okhdq7LMujBE1dcMHGAbmMIpH1igPz1PRSDP5leS0SuLvbPIFtv8Vt - f0isNEMXHNHgy1hNSKMi90ZHy9MMupitcLh9EnUoVCBNQyyPBHo8j9uq1Pn9Od3tfsjyToE4rHmdJOM4 - nUXYcVgq0kilajYLf8bHLzYLAOoxWh3RpDKySCdbBpF2xIHQgJBjWedAk4hL9VU2rBlqWGmhjj7J8i2W - VY64JI1s9vVdTctPsYeWn/LfeRdTCb40pXGpFhppIRODg4amqp/fBoM3WI4YeI7AFRCXapGhVhCdPKoZ - xd4dllEdeI6g1cw34y2mFq2LkqIUNEl6yu7tAc8REIlLtchwM4iVg4+4LL9kt86A5whs90443NyYpAOB - mMO2Ol65SuA5gmIjhUqD7RA6dECkEtjCgbAdc7WA003/9DUu1UikVsVx0j/S2LMHTLKBOlvztNYDEtqB - ioNSpPv9Wdy+rCdgOvHWEzAJAa0nYPoOXQkKP66RKKWoELDB5loLFHMSO4y2aF1VvyFWi4/o+Izv8BvG - aB7PA5523eBy/QMdOvFDuzyddQAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAPsSURBVFhH3VhLSxtRFA60u9qf0QdtaXGpG0kmM5OkLUUw + guAj/gG1GrvyrRsXvv5G96XLbkwzo4gGYpoU+gY31Qjm4aIj0/ONJ5rEazKTRxv84IOQ3HvOl3vPPefc + 67qx0NzuZ1Gvd2Lb53uvy/L3D11duWh7uwHis+7zfcNvUVkex1ie1lxsdnbe1WT5je71/tIDgczu8PDp + QThspufnzezysplfWbGIz/juYHLSjIdCeYyNqOpPzesNk/g2Ntc4kNHbmqKEaaUyib6+3OH0tHm6tmaf + q6sm5iS6u7P0BzNYedhk8/UhoigPtxTls97bmzleXBQLcEDYwIqSzdSm2/2A3dQGTZJekcBsbHDwTOSs + Hu71959FOjqyHz2el+zOGXRJGkKwp+fmhA4awaPZWRM+aCEG2a09YOUw8XhpSWi4kcSWw1dEkl6w+8pA + zGFbm7ly5TyamTGx3bRr91mGGDhZOBDNiLlqjI+OGnS6k9DAcq4Cx38nGDwRGfgXjFEaolQ2znJKgSSM + PGcrlayvn1P0m4g2xx8vLJhUBE5oFa8mc1QIJGHRxBKSIyORMI143LZIIxYzjVTKPN3YEP5eTCuZU8Vh + WZdA+TqkYBVNuiCLK8COSIgrwI5IVJyoqv5gWedAMUd2R0kSTSpmsUOgkkgnYy9IGiKBQDYiy09YHgmk + JUXhF04Q0I7jmsQx0WCQpjGW53KhLUJXIhp8HSsJqEccCC26orxjeRR/1M+hPRINrkSRkHrFgWkqgduq + +oXlWdUjix5ONLgaywUVoxZxYIa0UHuXYXmUoKkLzts4INdRJLJWcWCOml6KwT8sr0kC9/cbJ7Dlt7jl + D4mVZuiCIxp8HSsJqVfkwcREaZpBF7MbCrVOoh4aypOmUZZHAj2epy1V6vz+rO52P2Z550AcVr1OknGc + zgLsOCwWaSSTVZuF31NTV5sFAPUYrY5oUglZpJMtg0g74kBoQMixrEugScSl+n82rGlqWGmhTvZk+Q7L + KkVUksZ3enr+T8tPsYeWn/LfZRdTDr40pXCpFhppIuMjI4amqp/eBoO3WI4YeI7AFRCXapGhZhCdPKoZ + xd49llEZeI6g1cw14i2mGq2LkqLkNUl6zu7tAc8REIlLtchwI4iVg4+oLPezW2fAcwS2e29goLExSQcC + MYdtdbxy5cBzBMVGEpUG2yF06IBIJbCFA2E75qoBp5v+6WtcqpFIrYrjpH+ksRcPmGQDdbbqaa0FJLQN + FQelSPf7M7h9WU/AdOKtJ2ASAlpPwPQduhIUflwjUUpRIWCDzTUXKOYkdgxt0ZaqfkWsFh7R8Rnf4TeM + 0TyeRzztpsHl+gvG7PDyminEIgAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWCSURBVFhH3VhZTxtXFB6p20OXl64/oAtVeejyXLVpGxW1 - gWIqvIITSDCkEgQVQ1g7gHdDWUyL0gQakkgpgqolgI1JsI1tAgabgBqWQEhJBLQJlKXLS5MSd0442OPx - 2AaMecgnHcmj8829n+/cs9xLPLSIO254S6js1R7UXDYcrhl0HNE5x9PrXL8e1jmnJTrXiFBl7Ufq3iEu - t+1pocqiTqlyuHIbxv9Udiy5K7rWWC2jzjmLr0Ue75GWR/lKiwJWh2ydv88miGl7JpBLdkcnafpcZc23 - 7rEJCWRsAnmkeZ76k7OBTFDas8j56qIG6aEhkJvER78ZuaU1rLKKAFN1LruPN8+sZzdOrWTU/zIHBr/F - WtttHMYDEM02BlhR841/BAp7LVJDQ6AwH8tqmLjDNpjWsOLOPjG2mFI1OCBUWusTSjr3xRV3vbY/p/vJ - mEzDE7EFF178rKjjfRzKg0ACN8RZty6OV2pKPnZy8nfmQFrDmlt6ZnpZrLEbecUXX0f6lhFIYNapiTu8 - clMC0oID9hx8VuYg6s4Vd0pF/xivrOtdpG4bwT4x+HjkpVeRyg6IVggI5p4j2xb+E2n67PH5Pz2L1B3B - V6DvHFr9qjtZ3edITGx5BOn+gFTCjFZYuWSVzSaRuB5D2o6xKTDv3OzfIqV1Bsamz0X+uHCXr7AUI90X - kISpUJ+mvwD/Ej5ruCu3CRAI4qgKpDtAtj+XWu2Y9J1vzZ1W67wGwYaveAEVgpmEpU1Ty+HsOSaEyp5F - EIePBFdu/lh6enqJPqfs57l16kuWIcULKmW46ERIJWJtXwe6dwWcEqMWf3og1tqNzD1/sKLfie4NQOGH - 2konQQ7cSSrZLjhkz9s5p6d8VhESPaegOxopVFKWWSqZhf9Q5cCedSMp2v4B+tzK9iW3QNGrRDe1zBX9 - ejoByhdUCHRHHEKF7ZRG7xvRyZX9negmiEPVjkG6M++HmXVOkf4DdEcc1N7cn3d21ie9pVQPDaCbICS1 - QxN0J+yB+Hx98Ky+i/i0uOMVadP0Ml0DaEI3QaTXXZmhOzPqXXOJpOUpdEccMBfMSdcAmtBNEGm64Rt0 - 514LjCENz0jqRxfoGtLrhr0CU6uHfTI6FfbLsfnGl9EdcUCrltU4tkbXAGccdLMEybnZewlk10fojjhi - qSDJPT+zTtdw+OtBB7oJAk5mdCcUcQh9dEccQqXlBLNxSNbYvWlGIDdXqKjkSCfsZaKG1aLPvZGozd5E - nUh2vyk9M7lKJ315cuqP+BLzO0iJGLiK7uicxqs+pS6naXKVQzXOSNmAf7OwSjULdiO6PWAr+OFApLZe - gsaEPrdfswDgUUtKtvi2W7lUK8SXWWKQQu2VXh20TPgYNnhl5g+hKNDnhHYLtCDFC2hY02pcU3Qy2JEa - 5zVquV8AcdBsQtOJr4SFmALD86lVg+NwEKPPF7BhBfDllrJSlpYf2nMQB8+7ITCRbHk8Sd3X59fyt87f - 5cmspUjzBxyakjW2If+Duvc5XIGwciBO0bbgk/ceHJqouYMemgAJCmPU0brRoMdDpG4bsOfgszJXDkxS - feVmAmmMQmpwJJabuIFuFXYi8PPirjdEapseAoK558BgLq7MLEJ6aAjKLbWF52f/Yg4ExiYwrqBz3yfS - zpfg2gOajAMF7VFQvkQK63epVBLO/P7qEjOVbFp2w/htrsKUiUOFRjBxYGwC4aIIVgcujr7Qjc5nNYyt - FZ69fp/tU24a7Dn4rHyZSYDDhAZcfSWpbb9Jvh25Hsi4cstNpHsAotlEBLLC1vl/ISC2vOfCxVYFQhKG - PMeX95Iho3U3EUyg4sLig9oK5QsqxF42wh7AhTlcnMPVCXTn0GzCoUdccVkvVJpVEMVIfdhAEP8Dh+Ge - 81qy7MgAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAV/SURBVFhH3VjZU1tVGL8zbg8uL65/gAuOPLg8O1q1I6MF + CU52oAVKoI6lTBOmUMDLkh1kCYpKQeiDLdN2lEISQksSEmgIEArDsAVRaEu1BVlcXmyl8X7lI7m5uUmA + EB76m/lmcuf73XN+Ofd8yznEA4uEE8Y3RMoe7UHNFWNGzYDzsG5oIqvO9WuGbmhGonONiFQ2B1L3Dgl5 + bU+KVFZ1WpXTldcw9qeyY8lT0bnGatl1Q3P4WvTxDml9WKC0KmB1yNZr99gEMW3PBPLIrthkTZ+r9Ie5 + u2xCghmbQD5pWaD+5FwwE5Ldi5wvLmmQHh5CuTn1yFcj17TGVVYRYCr9skfW6l7PbXKvZNeP3QCD36la + +y0cxgsQzTYGWGHr7D9CRW8tUsNDqLAcy2mcvM02mNa44sn9ZnwxrWqgX6S01ScV6/clFHW+sl/a9Xjc + UeNj8QUXn/+ksONdHMqLYAI3xNm2Lo5fYk451jD1O3MgrXHNIzs9s5yq6TXxiy69ivQtI5jAnFOTt/ll + 5iSkhQbsOfiszEHU+hVPWoVjnF/a+TZSt41Qnxh8fPLyy0hlB0QrBARzz5Ft1/8Ta/p6E/N/fBqpO4K/ + QP85tIZVT4q6z8nlnnsI6YGAVMKMVli5FJXdLpG4HkHajrEpUNYy97dYaZuFselzkRdu3hEorEVI9wck + YSrUZ+gvwL+Ezxrpym0CBII4qgLpDpDtz6RXO6f851vzZNYOTUOw4Ss+QIVgJmFZi3s5kj3HhEjZvQji + 8JHgyS0fyppnluhzlv80v059yVKk+EClDBedCKkkVdvXge5dAafYpMWfXqRqe03MPX+wwjGE7g1A4Yfa + SidBDtxJKtkuOGT3m9Jmt98qQqLnFHTFIoVKyuXWSmbhP1TZv2fdSJrW0U+fW9m+5BEqepToppa5wmGg + E6B8QYVAd9QhUthPaQz+EZ1S6dCjmyAOVTsH6E7pWfc6p9DwHrqjDmpv7pc2+6e3tOrBfnQThKR2cJLu + hD2QmG8IndV3ER8Xdbwka5lZpmsATegmiKy6q7N0Z3a96waXtD6B7qgD5oI56RpAE7oJIlM3/AvdudcC + 40jjU5L60Zt0DVl1wz6B6dXDfhmdCvvl+HzTi+iOOqBVy2kaX6NrgDMOulmCpGXubhLZ+QG6o454KkiO + n3Gv0zVkfDngRDdBwMmM7oQiDqGP7qhDpLR+y2wcUjS9vjQjlFsqVFRypBP2MlHDatHn3kjUFl+i5pJd + r8tOT63SSccb3H8kFlveQkrUwFN0xUqbxvxKnbRlapVDNc5I2UBgs7BKNQu9JnR7wVbwI4FYbbsMjQl9 + 7oBmAcCnlpQ8699u5VGtkKDcGocUaq/06KBlwseIwS+1vA9FgT4ntFugBSk+QMOaWeNy08lgh2uGpqnl + fg7EQbMJTSe+EhHiCozPplcNTMBBjD5f0IYVIJBbS0tYWn5oz0EcPO+GQC557tFkdV9fQMt/fuEOv9xW + grRAwKEpRWMfDDyo+54jFQgrB+IUbdf98t79QxM1d8hDEyBJYYo5Ujca8niI1G0D9hx8VubKgUmqr84n + kaYYpIYGt8zMC3arsBOBnxZ1viZW2w0QEMw9BwZz8cotYqSHh7DMWnvyzNxfzIHA2AQmFOj3fSTTvwDX + HtBkHChoj4HyJVbYvkunkvDn348tMVPJpuU2TtziKcxHcajwCCUOjE0gXBTB6sDF0We60YWcxvG1k83T + 99g+5abBnoPPKig3C3GY8ICrr2S1/TfJ1yM/BzOe3DqPdC9ANJuIYHbi/MK/EBBb3nORYqsCIQlDnhPI + e8iw0bqbCCVQcXHxfm2F8gUVYi8bYS/gwhwuzuHqBLpzaDbh0JNaccUgUlpUEMVIfdBAEP8D39eedx6G + CawAAAAASUVORK5CYII= - - 240, 17 - - - 725, 17 - 418, 17