From aca27c548421874b26f73cc4d0df5425a69a5fc7 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 4 Jan 2024 15:09:43 +0900 Subject: [PATCH] .. --- .../PurchaseEB/fPurchaseEB.Designer.cs | 36 +- SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs | 45 +- SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs | 34 + .../FEQ0000/fPurchaseConfirm.Designer.cs | 812 +++++++++--------- SubProject/FEQ0000/fPurchaseConfirm.cs | 68 +- SubProject/FEQ0000/fPurchaseConfirm.resx | 20 - .../Project/fProjectListUser.Designer.cs | 294 +++---- .../FPJ0000/Project/fProjectListUser.cs | 3 + .../FPJ0000/Project/fProjectListUser.resx | 12 +- 9 files changed, 695 insertions(+), 629 deletions(-) diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs index 33e5551..69c6d00 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs @@ -96,6 +96,8 @@ this.입고품목메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.현재목록메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -139,8 +141,7 @@ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.현재목록메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -474,6 +475,18 @@ this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기"; this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click); // + // 현재목록메일전송ToolStripMenuItem + // + this.현재목록메일전송ToolStripMenuItem.Name = "현재목록메일전송ToolStripMenuItem"; + this.현재목록메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.현재목록메일전송ToolStripMenuItem.Text = "현재 목록 메일 전송"; + this.현재목록메일전송ToolStripMenuItem.Click += new System.EventHandler(this.현재목록메일전송ToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(179, 6); + // // cm1 // this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); @@ -482,6 +495,7 @@ this.toolStripMenuItem3, this.exportDataToolStripMenuItem, this.toolStripMenuItem4, + this.상태일괄변경ToolStripMenuItem, this.입고ToolStripMenuItem, this.추가ToolStripMenuItem, this.makeRepeatToolStripMenuItem, @@ -491,7 +505,7 @@ this.sC검색ToolStripMenuItem, this.cRCF검색ToolStripMenuItem}); this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(314, 400); + this.cm1.Size = new System.Drawing.Size(314, 464); // // columnSizeToolStripMenuItem // @@ -1137,17 +1151,12 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // toolStripMenuItem2 + // 상태일괄변경ToolStripMenuItem // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(179, 6); - // - // 현재목록메일전송ToolStripMenuItem - // - this.현재목록메일전송ToolStripMenuItem.Name = "현재목록메일전송ToolStripMenuItem"; - this.현재목록메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.현재목록메일전송ToolStripMenuItem.Text = "현재 목록 메일 전송"; - this.현재목록메일전송ToolStripMenuItem.Click += new System.EventHandler(this.현재목록메일전송ToolStripMenuItem_Click); + this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem"; + this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); + this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경"; + this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click); // // fPurchaseEB // @@ -1261,5 +1270,6 @@ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem 현재목록메일전송ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem; } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs index 0c3395d..8cb53c6 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs @@ -129,12 +129,13 @@ namespace FEQ0000 if (curLevel >= 5) { btSave.Visible = true; - 엑셀에서가져오기ToolStripMenuItem.Visible = true; - + 엑셀에서가져오기ToolStripMenuItem.Enabled = true; + 상태일괄변경ToolStripMenuItem.Enabled = true; } else { - 엑셀에서가져오기ToolStripMenuItem.Visible = false; + 상태일괄변경ToolStripMenuItem.Enabled = false; + 엑셀에서가져오기ToolStripMenuItem.Enabled = false; btSave.Visible = false; btViewDel.Visible = false; fpSpread1.EditMode = false; @@ -1531,5 +1532,43 @@ namespace FEQ0000 "아웃룩의 설정이 정상인지 확인하세요"); } } + + private void 상태일괄변경ToolStripMenuItem_Click(object sender, EventArgs e) + { + + var selected = this.fpSpread1_Sheet1.GetSelections(); //선택된 개체확인 + List rows = new List(); + foreach (var item in selected) + { + for (int i = item.Row; i < item.Row + item.RowCount; i++) + { + if (rows.Contains(i) == false) + { + if (fpSpread1_Sheet1.IsRowBound(i)) + { + rows.Add(i); + } + + } + + } + } + + //이대상의 실제 데이터베이스 인덱스값을 생성해서 폼에 전송한다. + var codlist = DBM.getCodeList("04"); + + var f = new FEQ0000.Purchase.fBatchUpdate(rows); + if (f.ShowDialog() != DialogResult.OK) return; + + var colstat = fpSpread1_Sheet1.Columns["state"]; + var value = f.cmbState.Text; + + foreach (var rowindex in rows) + { + fpSpread1_Sheet1.SetValue(rowindex, colstat.Index, value); + } + + FCOMMON.Util.MsgI($"{rows.Count} 건의 자료가 변경되었습니다\n저장 버튼을 누르면 적용 됩니다\n취소하려면 새로고침을 누르세요"); + } } } diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs index 01e0859..8ba5bb6 100644 --- a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs @@ -75,6 +75,40 @@ namespace FEQ0000.Purchase this.dsPurchase.PurchaseCheck.AcceptChanges(); this.Text = $"CR구매품목 SID재고 검사"; } + + public fSIDCheckNR(List items) + { + InitializeComponent(); + + //자료를 추가한다 + this.dsPurchase.PurchaseCheck.Clear(); + foreach (var item in items) + { + var newdr = dsPurchase.PurchaseCheck.NewPurchaseCheckRow(); + newdr.idx = item.idx; + newdr.pdate = item.pdate; + newdr.sid = item.sid; + newdr.pumname = item.pumname; + newdr.pumscale = item.pumscale; + newdr.pumunit = item.pumunit; + newdr.pumqty = item.pumqtyReq; + newdr.pumprice = item.pumprice; + newdr.pumamt = item.pumamt; + newdr.supply = item.supply; + newdr.project = item.project; + newdr.bigo = item.bigo; + newdr.gcode = item.gcode; + newdr.requestName = item.requestName; + newdr.chk1 = item.chk1; + newdr.chk2 = item.chk2; + newdr.EndEdit(); + this.dsPurchase.PurchaseCheck.AddPurchaseCheckRow(newdr); + } + this.dsPurchase.PurchaseCheck.AcceptChanges(); + this.Text = $"EB구매품목 SID재고 검사"; + } + + private void fSIDCheckNR_Load(object sender, EventArgs e) { dv1.AutoResizeColumns(); diff --git a/SubProject/FEQ0000/fPurchaseConfirm.Designer.cs b/SubProject/FEQ0000/fPurchaseConfirm.Designer.cs index a571025..ae3baab 100644 --- a/SubProject/FEQ0000/fPurchaseConfirm.Designer.cs +++ b/SubProject/FEQ0000/fPurchaseConfirm.Designer.cs @@ -31,18 +31,18 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseConfirm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -52,6 +52,8 @@ this.bsNR = new System.Windows.Forms.BindingSource(this.components); this.taNR = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); + this.taCR = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); + this.taEB = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -65,24 +67,14 @@ this.btReject = new System.Windows.Forms.ToolStripButton(); this.btConfirm = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton(); - this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.구매승인양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.dvNR = new System.Windows.Forms.DataGridView(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.dvCR = new System.Windows.Forms.DataGridView(); - this.bsCR = new System.Windows.Forms.BindingSource(this.components); - this.tabPage3 = new System.Windows.Forms.TabPage(); - this.dvEB = new System.Windows.Forms.DataGridView(); - this.bsEB = new System.Windows.Forms.BindingSource(this.components); - this.taCR = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); - this.taEB = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter(); this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.requestNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -96,6 +88,16 @@ this.supplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bigo2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bigoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel3 = new System.Windows.Forms.Panel(); + this.lbSumNR = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.richTextBox5 = new System.Windows.Forms.RichTextBox(); + this.richTextBox6 = new System.Windows.Forms.RichTextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.dvCR = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -109,6 +111,17 @@ this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn25 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn26 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bsCR = new System.Windows.Forms.BindingSource(this.components); + this.panel2 = new System.Windows.Forms.Panel(); + this.lbSumCR = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.richTextBox3 = new System.Windows.Forms.RichTextBox(); + this.richTextBox4 = new System.Windows.Forms.RichTextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.dvEB = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -122,31 +135,15 @@ this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.bsEB = new System.Windows.Forms.BindingSource(this.components); + this.panel1 = new System.Windows.Forms.Panel(); + this.lbSumEB = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.richTextBox3 = new System.Windows.Forms.RichTextBox(); - this.richTextBox4 = new System.Windows.Forms.RichTextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.richTextBox5 = new System.Windows.Forms.RichTextBox(); - this.richTextBox6 = new System.Windows.Forms.RichTextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label7 = new System.Windows.Forms.Label(); - this.lbSumEB = new System.Windows.Forms.Label(); - this.panel2 = new System.Windows.Forms.Panel(); - this.lbSumCR = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.panel3 = new System.Windows.Forms.Panel(); - this.lbSumNR = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsNR)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -155,18 +152,18 @@ this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dvNR)).BeginInit(); + this.panel3.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); this.tabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dvCR)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsCR)).BeginInit(); + this.panel2.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); this.tabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dvEB)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsEB)).BeginInit(); - this.tableLayoutPanel1.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); - this.panel3.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // dsPurchase @@ -192,6 +189,14 @@ this.tam.PurchaseTableAdapter = this.taNR; this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // taCR + // + this.taCR.ClearBeforeFill = true; + // + // taEB + // + this.taEB.ClearBeforeFill = true; + // // bn // this.bn.AddNewItem = null; @@ -213,7 +218,6 @@ this.btReject, this.btConfirm, this.toolStripSeparator1, - this.toolStripButton1, this.toolStripButton5, this.toolStripButton2}); this.bn.Location = new System.Drawing.Point(0, 662); @@ -318,31 +322,6 @@ this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); // - // toolStripButton1 - // - this.toolStripButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.집계표ToolStripMenuItem, - this.구매승인양식ToolStripMenuItem}); - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(80, 28); - this.toolStripButton1.Text = "보고서"; - // - // 집계표ToolStripMenuItem - // - this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem"; - this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.집계표ToolStripMenuItem.Text = "집계표"; - this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click); - // - // 구매승인양식ToolStripMenuItem - // - this.구매승인양식ToolStripMenuItem.Name = "구매승인양식ToolStripMenuItem"; - this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식"; - this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click); - // // toolStripButton5 // this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); @@ -384,6 +363,15 @@ this.toolStripButton3.Text = "닫기"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // + // toolStripButton4 + // + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(104, 34); + this.toolStripButton4.Text = "새로고침(&R)"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -446,124 +434,6 @@ this.dvNR.Size = new System.Drawing.Size(1320, 425); this.dvNR.TabIndex = 9; // - // tabPage2 - // - this.tabPage2.Controls.Add(this.dvCR); - this.tabPage2.Controls.Add(this.panel2); - this.tabPage2.Controls.Add(this.tableLayoutPanel2); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1326, 599); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "CR구매"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // dvCR - // - this.dvCR.AllowUserToAddRows = false; - this.dvCR.AllowUserToDeleteRows = false; - this.dvCR.AutoGenerateColumns = false; - this.dvCR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dvCR.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn14, - this.dataGridViewTextBoxColumn15, - this.dataGridViewTextBoxColumn16, - this.dataGridViewTextBoxColumn17, - this.dataGridViewTextBoxColumn18, - this.dataGridViewTextBoxColumn19, - this.dataGridViewTextBoxColumn20, - this.dataGridViewTextBoxColumn21, - this.dataGridViewTextBoxColumn22, - this.dataGridViewTextBoxColumn23, - this.dataGridViewTextBoxColumn24, - this.dataGridViewTextBoxColumn25, - this.dataGridViewTextBoxColumn26}); - this.dvCR.DataSource = this.bsCR; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle12.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dvCR.DefaultCellStyle = dataGridViewCellStyle12; - this.dvCR.Dock = System.Windows.Forms.DockStyle.Fill; - this.dvCR.Location = new System.Drawing.Point(3, 3); - this.dvCR.Name = "dvCR"; - this.dvCR.ReadOnly = true; - this.dvCR.RowTemplate.Height = 23; - this.dvCR.Size = new System.Drawing.Size(1320, 425); - this.dvCR.TabIndex = 9; - // - // bsCR - // - this.bsCR.DataMember = "EETGW_PurchaseCR"; - this.bsCR.DataSource = this.dsPurchase; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.dvEB); - this.tabPage3.Controls.Add(this.panel1); - this.tabPage3.Controls.Add(this.tableLayoutPanel1); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(1326, 599); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "전자실구매"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // dvEB - // - this.dvEB.AllowUserToAddRows = false; - this.dvEB.AllowUserToDeleteRows = false; - this.dvEB.AutoGenerateColumns = false; - this.dvEB.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dvEB.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2, - this.dataGridViewTextBoxColumn3, - this.dataGridViewTextBoxColumn4, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7, - this.dataGridViewTextBoxColumn8, - this.dataGridViewTextBoxColumn9, - this.dataGridViewTextBoxColumn10, - this.dataGridViewTextBoxColumn11, - this.dataGridViewTextBoxColumn12, - this.dataGridViewTextBoxColumn13}); - this.dvEB.DataSource = this.bsEB; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dvEB.DefaultCellStyle = dataGridViewCellStyle18; - this.dvEB.Dock = System.Windows.Forms.DockStyle.Fill; - this.dvEB.Location = new System.Drawing.Point(0, 0); - this.dvEB.Name = "dvEB"; - this.dvEB.RowTemplate.Height = 23; - this.dvEB.Size = new System.Drawing.Size(1326, 431); - this.dvEB.TabIndex = 9; - // - // bsEB - // - this.bsEB.DataMember = "EETGW_PurchaseEB"; - this.bsEB.DataSource = this.dsPurchase; - // - // taCR - // - this.taCR.ClearBeforeFill = true; - // - // taEB - // - this.taEB.ClearBeforeFill = true; - // // pdateDataGridViewTextBoxColumn // this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; @@ -665,6 +535,152 @@ this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn"; this.bigoDataGridViewTextBoxColumn.ReadOnly = true; // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.lbSumNR); + this.panel3.Controls.Add(this.label10); + this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel3.Location = new System.Drawing.Point(3, 428); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1320, 30); + this.panel3.TabIndex = 12; + // + // lbSumNR + // + this.lbSumNR.BackColor = System.Drawing.Color.White; + this.lbSumNR.Dock = System.Windows.Forms.DockStyle.Left; + this.lbSumNR.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbSumNR.Location = new System.Drawing.Point(142, 0); + this.lbSumNR.Name = "lbSumNR"; + this.lbSumNR.Size = new System.Drawing.Size(142, 28); + this.lbSumNR.TabIndex = 1; + this.lbSumNR.Text = "0"; + this.lbSumNR.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label10 + // + this.label10.BackColor = System.Drawing.Color.Gainsboro; + this.label10.Dock = System.Windows.Forms.DockStyle.Left; + this.label10.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label10.Location = new System.Drawing.Point(0, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(142, 28); + this.label10.TabIndex = 0; + this.label10.Text = "합계"; + this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 2; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Controls.Add(this.richTextBox5, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.richTextBox6, 1, 1); + this.tableLayoutPanel3.Controls.Add(this.label5, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.label6, 1, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 458); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 2; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1320, 138); + this.tableLayoutPanel3.TabIndex = 10; + // + // richTextBox5 + // + this.richTextBox5.BackColor = System.Drawing.Color.Gold; + this.richTextBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsNR, "chkremark", true)); + this.richTextBox5.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox5.Location = new System.Drawing.Point(3, 28); + this.richTextBox5.Name = "richTextBox5"; + this.richTextBox5.Size = new System.Drawing.Size(654, 107); + this.richTextBox5.TabIndex = 0; + this.richTextBox5.Text = ""; + // + // richTextBox6 + // + this.richTextBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsNR, "bigo", true)); + this.richTextBox6.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox6.Location = new System.Drawing.Point(663, 28); + this.richTextBox6.Name = "richTextBox6"; + this.richTextBox6.ReadOnly = true; + this.richTextBox6.Size = new System.Drawing.Size(654, 107); + this.richTextBox6.TabIndex = 0; + this.richTextBox6.Text = ""; + // + // label5 + // + this.label5.Dock = System.Windows.Forms.DockStyle.Fill; + this.label5.Location = new System.Drawing.Point(3, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(654, 25); + this.label5.TabIndex = 1; + this.label5.Text = "구매 담당자 비고"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label6 + // + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Location = new System.Drawing.Point(663, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(654, 25); + this.label6.TabIndex = 2; + this.label6.Text = "구매신청자 비고(구매사유)"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.dvCR); + this.tabPage2.Controls.Add(this.panel2); + this.tabPage2.Controls.Add(this.tableLayoutPanel2); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(1326, 599); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "CR구매"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // dvCR + // + this.dvCR.AllowUserToAddRows = false; + this.dvCR.AllowUserToDeleteRows = false; + this.dvCR.AutoGenerateColumns = false; + this.dvCR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dvCR.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn14, + this.dataGridViewTextBoxColumn15, + this.dataGridViewTextBoxColumn16, + this.dataGridViewTextBoxColumn17, + this.dataGridViewTextBoxColumn18, + this.dataGridViewTextBoxColumn19, + this.dataGridViewTextBoxColumn20, + this.dataGridViewTextBoxColumn21, + this.dataGridViewTextBoxColumn22, + this.dataGridViewTextBoxColumn23, + this.dataGridViewTextBoxColumn24, + this.dataGridViewTextBoxColumn25, + this.dataGridViewTextBoxColumn26}); + this.dvCR.DataSource = this.bsCR; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle12.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dvCR.DefaultCellStyle = dataGridViewCellStyle12; + this.dvCR.Dock = System.Windows.Forms.DockStyle.Fill; + this.dvCR.Location = new System.Drawing.Point(3, 3); + this.dvCR.Name = "dvCR"; + this.dvCR.ReadOnly = true; + this.dvCR.RowTemplate.Height = 23; + this.dvCR.Size = new System.Drawing.Size(1320, 425); + this.dvCR.TabIndex = 9; + // // dataGridViewTextBoxColumn14 // this.dataGridViewTextBoxColumn14.DataPropertyName = "pdate"; @@ -766,6 +782,155 @@ this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26"; this.dataGridViewTextBoxColumn26.ReadOnly = true; // + // bsCR + // + this.bsCR.DataMember = "EETGW_PurchaseCR"; + this.bsCR.DataSource = this.dsPurchase; + // + // panel2 + // + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.lbSumCR); + this.panel2.Controls.Add(this.label9); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(3, 428); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1320, 30); + this.panel2.TabIndex = 12; + // + // lbSumCR + // + this.lbSumCR.BackColor = System.Drawing.Color.White; + this.lbSumCR.Dock = System.Windows.Forms.DockStyle.Left; + this.lbSumCR.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbSumCR.Location = new System.Drawing.Point(142, 0); + this.lbSumCR.Name = "lbSumCR"; + this.lbSumCR.Size = new System.Drawing.Size(142, 28); + this.lbSumCR.TabIndex = 1; + this.lbSumCR.Text = "0"; + this.lbSumCR.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label9 + // + this.label9.BackColor = System.Drawing.Color.Gainsboro; + this.label9.Dock = System.Windows.Forms.DockStyle.Left; + this.label9.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label9.Location = new System.Drawing.Point(0, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(142, 28); + this.label9.TabIndex = 0; + this.label9.Text = "합계"; + this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Controls.Add(this.richTextBox3, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.richTextBox4, 1, 1); + this.tableLayoutPanel2.Controls.Add(this.label3, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.label4, 1, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 458); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1320, 138); + this.tableLayoutPanel2.TabIndex = 10; + // + // richTextBox3 + // + this.richTextBox3.BackColor = System.Drawing.Color.Gold; + this.richTextBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsCR, "chkremark", true)); + this.richTextBox3.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox3.Location = new System.Drawing.Point(3, 28); + this.richTextBox3.Name = "richTextBox3"; + this.richTextBox3.Size = new System.Drawing.Size(654, 107); + this.richTextBox3.TabIndex = 0; + this.richTextBox3.Text = ""; + // + // richTextBox4 + // + this.richTextBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsCR, "bigo", true)); + this.richTextBox4.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox4.Location = new System.Drawing.Point(663, 28); + this.richTextBox4.Name = "richTextBox4"; + this.richTextBox4.ReadOnly = true; + this.richTextBox4.Size = new System.Drawing.Size(654, 107); + this.richTextBox4.TabIndex = 0; + this.richTextBox4.Text = ""; + // + // label3 + // + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Location = new System.Drawing.Point(3, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(654, 25); + this.label3.TabIndex = 1; + this.label3.Text = "구매 담당자 비고"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label4 + // + this.label4.Dock = System.Windows.Forms.DockStyle.Fill; + this.label4.Location = new System.Drawing.Point(663, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(654, 25); + this.label4.TabIndex = 2; + this.label4.Text = "구매신청자 비고(구매사유)"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.dvEB); + this.tabPage3.Controls.Add(this.panel1); + this.tabPage3.Controls.Add(this.tableLayoutPanel1); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(1326, 599); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "전자실구매"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // dvEB + // + this.dvEB.AllowUserToAddRows = false; + this.dvEB.AllowUserToDeleteRows = false; + this.dvEB.AutoGenerateColumns = false; + this.dvEB.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dvEB.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2, + this.dataGridViewTextBoxColumn3, + this.dataGridViewTextBoxColumn4, + this.dataGridViewTextBoxColumn5, + this.dataGridViewTextBoxColumn6, + this.dataGridViewTextBoxColumn7, + this.dataGridViewTextBoxColumn8, + this.dataGridViewTextBoxColumn9, + this.dataGridViewTextBoxColumn10, + this.dataGridViewTextBoxColumn11, + this.dataGridViewTextBoxColumn12, + this.dataGridViewTextBoxColumn13}); + this.dvEB.DataSource = this.bsEB; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3); + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dvEB.DefaultCellStyle = dataGridViewCellStyle18; + this.dvEB.Dock = System.Windows.Forms.DockStyle.Fill; + this.dvEB.Location = new System.Drawing.Point(0, 0); + this.dvEB.Name = "dvEB"; + this.dvEB.RowTemplate.Height = 23; + this.dvEB.Size = new System.Drawing.Size(1326, 431); + this.dvEB.TabIndex = 9; + // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.DataPropertyName = "pdate"; @@ -855,14 +1020,45 @@ this.dataGridViewTextBoxColumn13.HeaderText = "비고(구매요청)"; this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; // - // toolStripButton4 + // bsEB // - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(104, 34); - this.toolStripButton4.Text = "새로고침(&R)"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + this.bsEB.DataMember = "EETGW_PurchaseEB"; + this.bsEB.DataSource = this.dsPurchase; + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.lbSumEB); + this.panel1.Controls.Add(this.label7); + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(0, 431); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1326, 30); + this.panel1.TabIndex = 11; + // + // lbSumEB + // + this.lbSumEB.BackColor = System.Drawing.Color.White; + this.lbSumEB.Dock = System.Windows.Forms.DockStyle.Left; + this.lbSumEB.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbSumEB.Location = new System.Drawing.Point(142, 0); + this.lbSumEB.Name = "lbSumEB"; + this.lbSumEB.Size = new System.Drawing.Size(142, 28); + this.lbSumEB.TabIndex = 1; + this.lbSumEB.Text = "0"; + this.lbSumEB.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label7 + // + this.label7.BackColor = System.Drawing.Color.Gainsboro; + this.label7.Dock = System.Windows.Forms.DockStyle.Left; + this.label7.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label7.Location = new System.Drawing.Point(0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(142, 28); + this.label7.TabIndex = 0; + this.label7.Text = "합계"; + this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // tableLayoutPanel1 // @@ -924,231 +1120,6 @@ this.label2.Text = "구매신청자 비고(구매사유)"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 2; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Controls.Add(this.richTextBox3, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.richTextBox4, 1, 1); - this.tableLayoutPanel2.Controls.Add(this.label3, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.label4, 1, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 458); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1320, 138); - this.tableLayoutPanel2.TabIndex = 10; - // - // richTextBox3 - // - this.richTextBox3.BackColor = System.Drawing.Color.Gold; - this.richTextBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsCR, "chkremark", true)); - this.richTextBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox3.Location = new System.Drawing.Point(3, 28); - this.richTextBox3.Name = "richTextBox3"; - this.richTextBox3.Size = new System.Drawing.Size(654, 107); - this.richTextBox3.TabIndex = 0; - this.richTextBox3.Text = ""; - // - // richTextBox4 - // - this.richTextBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsCR, "bigo", true)); - this.richTextBox4.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox4.Location = new System.Drawing.Point(663, 28); - this.richTextBox4.Name = "richTextBox4"; - this.richTextBox4.ReadOnly = true; - this.richTextBox4.Size = new System.Drawing.Size(654, 107); - this.richTextBox4.TabIndex = 0; - this.richTextBox4.Text = ""; - // - // label3 - // - this.label3.Dock = System.Windows.Forms.DockStyle.Fill; - this.label3.Location = new System.Drawing.Point(3, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(654, 25); - this.label3.TabIndex = 1; - this.label3.Text = "구매 담당자 비고"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label4 - // - this.label4.Dock = System.Windows.Forms.DockStyle.Fill; - this.label4.Location = new System.Drawing.Point(663, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(654, 25); - this.label4.TabIndex = 2; - this.label4.Text = "구매신청자 비고(구매사유)"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Controls.Add(this.richTextBox5, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.richTextBox6, 1, 1); - this.tableLayoutPanel3.Controls.Add(this.label5, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.label6, 1, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 458); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 2; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1320, 138); - this.tableLayoutPanel3.TabIndex = 10; - // - // richTextBox5 - // - this.richTextBox5.BackColor = System.Drawing.Color.Gold; - this.richTextBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsNR, "chkremark", true)); - this.richTextBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox5.Location = new System.Drawing.Point(3, 28); - this.richTextBox5.Name = "richTextBox5"; - this.richTextBox5.Size = new System.Drawing.Size(654, 107); - this.richTextBox5.TabIndex = 0; - this.richTextBox5.Text = ""; - // - // richTextBox6 - // - this.richTextBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsNR, "bigo", true)); - this.richTextBox6.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox6.Location = new System.Drawing.Point(663, 28); - this.richTextBox6.Name = "richTextBox6"; - this.richTextBox6.ReadOnly = true; - this.richTextBox6.Size = new System.Drawing.Size(654, 107); - this.richTextBox6.TabIndex = 0; - this.richTextBox6.Text = ""; - // - // label5 - // - this.label5.Dock = System.Windows.Forms.DockStyle.Fill; - this.label5.Location = new System.Drawing.Point(3, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(654, 25); - this.label5.TabIndex = 1; - this.label5.Text = "구매 담당자 비고"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label6 - // - this.label6.Dock = System.Windows.Forms.DockStyle.Fill; - this.label6.Location = new System.Drawing.Point(663, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(654, 25); - this.label6.TabIndex = 2; - this.label6.Text = "구매신청자 비고(구매사유)"; - this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel1 - // - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.lbSumEB); - this.panel1.Controls.Add(this.label7); - this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 431); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1326, 30); - this.panel1.TabIndex = 11; - // - // label7 - // - this.label7.BackColor = System.Drawing.Color.Gainsboro; - this.label7.Dock = System.Windows.Forms.DockStyle.Left; - this.label7.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label7.Location = new System.Drawing.Point(0, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(142, 28); - this.label7.TabIndex = 0; - this.label7.Text = "합계"; - this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // lbSumEB - // - this.lbSumEB.BackColor = System.Drawing.Color.White; - this.lbSumEB.Dock = System.Windows.Forms.DockStyle.Left; - this.lbSumEB.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbSumEB.Location = new System.Drawing.Point(142, 0); - this.lbSumEB.Name = "lbSumEB"; - this.lbSumEB.Size = new System.Drawing.Size(142, 28); - this.lbSumEB.TabIndex = 1; - this.lbSumEB.Text = "0"; - this.lbSumEB.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // panel2 - // - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.lbSumCR); - this.panel2.Controls.Add(this.label9); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(3, 428); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1320, 30); - this.panel2.TabIndex = 12; - // - // lbSumCR - // - this.lbSumCR.BackColor = System.Drawing.Color.White; - this.lbSumCR.Dock = System.Windows.Forms.DockStyle.Left; - this.lbSumCR.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbSumCR.Location = new System.Drawing.Point(142, 0); - this.lbSumCR.Name = "lbSumCR"; - this.lbSumCR.Size = new System.Drawing.Size(142, 28); - this.lbSumCR.TabIndex = 1; - this.lbSumCR.Text = "0"; - this.lbSumCR.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label9 - // - this.label9.BackColor = System.Drawing.Color.Gainsboro; - this.label9.Dock = System.Windows.Forms.DockStyle.Left; - this.label9.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label9.Location = new System.Drawing.Point(0, 0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(142, 28); - this.label9.TabIndex = 0; - this.label9.Text = "합계"; - this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel3 - // - this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel3.Controls.Add(this.lbSumNR); - this.panel3.Controls.Add(this.label10); - this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(3, 428); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1320, 30); - this.panel3.TabIndex = 12; - // - // lbSumNR - // - this.lbSumNR.BackColor = System.Drawing.Color.White; - this.lbSumNR.Dock = System.Windows.Forms.DockStyle.Left; - this.lbSumNR.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbSumNR.Location = new System.Drawing.Point(142, 0); - this.lbSumNR.Name = "lbSumNR"; - this.lbSumNR.Size = new System.Drawing.Size(142, 28); - this.lbSumNR.TabIndex = 1; - this.lbSumNR.Text = "0"; - this.lbSumNR.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label10 - // - this.label10.BackColor = System.Drawing.Color.Gainsboro; - this.label10.Dock = System.Windows.Forms.DockStyle.Left; - this.label10.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label10.Location = new System.Drawing.Point(0, 0); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(142, 28); - this.label10.TabIndex = 0; - this.label10.Text = "합계"; - this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // fPurchaseConfirm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1171,18 +1142,18 @@ this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dvNR)).EndInit(); + this.panel3.ResumeLayout(false); + this.tableLayoutPanel3.ResumeLayout(false); this.tabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dvCR)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsCR)).EndInit(); + this.panel2.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); this.tabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dvEB)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsEB)).EndInit(); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel3.ResumeLayout(false); this.panel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.panel3.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1208,9 +1179,6 @@ private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripButton btConfirm; - private System.Windows.Forms.ToolStripDropDownButton toolStripButton1; - private System.Windows.Forms.ToolStripMenuItem 집계표ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 구매승인양식ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; diff --git a/SubProject/FEQ0000/fPurchaseConfirm.cs b/SubProject/FEQ0000/fPurchaseConfirm.cs index e10a864..bc6b596 100644 --- a/SubProject/FEQ0000/fPurchaseConfirm.cs +++ b/SubProject/FEQ0000/fPurchaseConfirm.cs @@ -695,28 +695,60 @@ namespace FEQ0000 { //state 가 ---인 데이터를 기준으로 함 //chk2 ==false 인 자료를 기준으로 함 - var newlist = this.dsPurchase.Purchase.Where(t => (t.Ischk2Null() || t.chk2 == false) && t.state.Equals("---")).ToList(); - if (newlist.Any() == false) + + + fSIDCheckNR f = null; + + if(tabControl1.SelectedIndex == 0) { - FCOMMON.Util.MsgE($"신규 신청 데이터가 없습니다"); - return; + var newlist = this.dsPurchase.Purchase.Where(t => (t.Ischk2Null() || t.chk2 == false) && t.state.Equals("---")).ToList(); + if (newlist.Any() == false) + { + FCOMMON.Util.MsgE($"신규 신청 데이터가 없습니다"); + return; + } + f = new fSIDCheckNR(newlist); } - var f = new fSIDCheckNR(newlist); + + else if(tabControl1.SelectedIndex == 1) + { + var newlist = this.dsPurchase.EETGW_PurchaseCR.Where(t => (t.Ischk2Null() || t.chk2 == false) && t.state.Equals("---")).ToList(); + if (newlist.Any() == false) + { + FCOMMON.Util.MsgE($"신규 신청 데이터가 없습니다"); + return; + } + f = new fSIDCheckNR(newlist); + } + + else if (tabControl1.SelectedIndex == 2) + { + var newlist = this.dsPurchase.EETGW_PurchaseEB.Where(t => (t.Ischk2Null() || t.chk2 == false) && t.state.Equals("---")).ToList(); + if (newlist.Any() == false) + { + FCOMMON.Util.MsgE($"신규 신청 데이터가 없습니다"); + return; + } + f = new fSIDCheckNR(newlist); + } + + if (f == null) return; + if (f.ShowDialog() == DialogResult.OK) { - var cnt = 0; - foreach (var idx in f.chklist) - { - var dr = newlist.Where(t => t.idx == idx).FirstOrDefault(); - if (dr != null) - { - cnt += 1; - dr.chk2 = true; - if (dr.IspumqtyNull() || dr.pumqty == 0) dr.pumqty = dr.pumqtyReq; - dr.EndEdit(); - } - } - FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); + //var cnt = 0; + //foreach (var idx in f.chklist) + //{ + // var dr = newlist.Where(t => t.idx == idx).FirstOrDefault(); + // if (dr != null) + // { + // cnt += 1; + // dr.chk2 = true; + // if (dr.IspumqtyNull() || dr.pumqty == 0) dr.pumqty = dr.pumqtyReq; + // dr.EndEdit(); + // } + //} + //FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); } } diff --git a/SubProject/FEQ0000/fPurchaseConfirm.resx b/SubProject/FEQ0000/fPurchaseConfirm.resx index b7f43f2..ff861fd 100644 --- a/SubProject/FEQ0000/fPurchaseConfirm.resx +++ b/SubProject/FEQ0000/fPurchaseConfirm.resx @@ -201,26 +201,6 @@ pOavhqRyUfo7gJLWHybVWQKePh/ULmIBNEt5+52aLN+MeXNnk8ErjVkNKJS7dO57IISCgOy+HBkZPHE6 kIYRDzRLAKewuxpoMAXyn0gFIAuhILzWXFAIc2zATNjEC8rBHBWH4L+wSTd+ZUAIIreWL7fv5cYJRdEP Fas4M5JsXd4AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANISURBVDhPtZBdTFN3GIdJvFu4ULMSFIiZW0JCci5EF4hU - OsZHZoEYslIgFMs6LUioQIsBZHCoKwo1ZVBqaR1DsFIrjiBoZwWDURNGsWvnGSNQoSsg/bBWqodtkhB/ - I7XLZvTW5/Z9n+ef/xv2f1TTZPgZa10j+bN4ouZe2UbF7a83SoyFE0WDuQ25AwNbhCMrH4RW30ZBNbCa - LTWOm/M3MOq8DePiLTx4YoXeeglf6tjqiv7FY6U9846vtHZWSPkPue1kjuH3Xow5R9Frv4xKawMkv5AY - nLuG7D62P69X83FpzyN/zz0fJBcXwJHbckLq5svT5PZT5mp6fHEcrdMqCKaOo9h8HF0zPVDf7USGOuXY - kW6Huu2GG8bfaGjGvGA3memMqontwQA5KZEZ7ddxfvYi+FMi5E8IccLSBJ1VhwzlAVuxZib+MDm9MfLw - BRS3fBgwB1DZPYsD5WOyYODE3RKb6Y9RiCwnUbApCyfF0NkNEBlKkdSSwCxUztxvM7rwoyWAKv0KZMNe - tAwtI14wbAsGykzF68POn1BhqUcrpcSVuUGcNbVi/7ef/lDYMcvNIB/+dWVyFRK9CyXfL0GoWcJ3192I - 410NBANFQ9zApGcKV+eGoLqjBOv0fn+idF/jiJj8UFV9ITKTNFOdN92o0btR1O4Er82BlkEXdrEv0MEA - tz/b1nmnHZ93sp4kyxPEJnFezEs+v/7vbK6fPniISKm+T5299hii7mVwmhdQol6CqMuO3Vldr7+QqUmT - pHYwhbaqw1HrR48q1ng8mm78Bmv5BaCTU4mkchMlNSziiNKJrLo5yAxusCvHEZXe/vqIqK3d9rK8TOsV - CNbXmmVYNejg7+/F86xDoOMTiX2CEaquz4HCVgfIzTvwzvyK6HQ5HclsZgQDr0QixhqfT7/QnsOzgX64 - pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L - fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ - brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fProjectListUser.Designer.cs b/SubProject/FPJ0000/Project/fProjectListUser.Designer.cs index a1f8aa9..c58db87 100644 --- a/SubProject/FPJ0000/Project/fProjectListUser.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectListUser.Designer.cs @@ -78,6 +78,7 @@ this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bsUser = new System.Windows.Forms.BindingSource(this.components); this.dSProjectSummary = new FPJ0000.Project.DSProjectSummary(); this.projectsTableAdapter = new FPJ0000.Project.DSProjectSummaryTableAdapters.ProjectsTableAdapter(); @@ -94,7 +95,6 @@ this.bindingNavigatorMoveLastItem1 = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.panel2 = new System.Windows.Forms.Panel(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); @@ -102,12 +102,12 @@ ((System.ComponentModel.ISupportInitialize)(this.bsHistD)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsUser)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSProjectSummary)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bs @@ -220,9 +220,9 @@ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmbDateType, this.cmbYearS, - this.toolStripSeparator4, this.btClose, - this.btSearch}); + this.btSearch, + this.toolStripSeparator4}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1339, 45); @@ -317,148 +317,6 @@ this.fpSpread1.TabIndex = 36; this.fpSpread1.CellDoubleClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellDoubleClick); // - // bsUser - // - this.bsUser.DataMember = "ProjectCountForUser"; - this.bsUser.DataSource = this.dSProjectSummary; - this.bsUser.Sort = "process,username"; - this.bsUser.CurrentChanged += new System.EventHandler(this.bsUser_CurrentChanged); - // - // dSProjectSummary - // - this.dSProjectSummary.DataSetName = "DSProjectSummary"; - this.dSProjectSummary.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // projectsTableAdapter - // - this.projectsTableAdapter.ClearBeforeFill = true; - // - // bindingNavigator1 - // - this.bindingNavigator1.AddNewItem = this.bindingNavigatorAddNewItem; - this.bindingNavigator1.BindingSource = this.bsUser; - this.bindingNavigator1.CountItem = this.bindingNavigatorCountItem1; - this.bindingNavigator1.DeleteItem = this.bindingNavigatorDeleteItem; - this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem1, - this.bindingNavigatorMovePreviousItem1, - this.bindingNavigatorSeparator3, - this.bindingNavigatorPositionItem1, - this.bindingNavigatorCountItem1, - this.bindingNavigatorSeparator4, - this.bindingNavigatorMoveNextItem1, - this.bindingNavigatorMoveLastItem1, - this.bindingNavigatorSeparator5, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem}); - this.bindingNavigator1.Location = new System.Drawing.Point(0, 620); - this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem1; - this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem1; - this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem1; - this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1; - this.bindingNavigator1.Name = "bindingNavigator1"; - this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1; - this.bindingNavigator1.Size = new System.Drawing.Size(1339, 25); - this.bindingNavigator1.TabIndex = 37; - this.bindingNavigator1.Text = "bindingNavigator1"; - // - // bindingNavigatorAddNewItem - // - this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); - this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; - this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorAddNewItem.Text = "새로 추가"; - // - // bindingNavigatorCountItem1 - // - this.bindingNavigatorCountItem1.Name = "bindingNavigatorCountItem1"; - this.bindingNavigatorCountItem1.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem1.Text = "/{0}"; - this.bindingNavigatorCountItem1.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorDeleteItem - // - this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorDeleteItem.Text = "삭제"; - // - // bindingNavigatorMoveFirstItem1 - // - this.bindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem1.Image"))); - this.bindingNavigatorMoveFirstItem1.Name = "bindingNavigatorMoveFirstItem1"; - this.bindingNavigatorMoveFirstItem1.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem1.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveFirstItem1.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem1 - // - this.bindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem1.Image"))); - this.bindingNavigatorMovePreviousItem1.Name = "bindingNavigatorMovePreviousItem1"; - this.bindingNavigatorMovePreviousItem1.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem1.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMovePreviousItem1.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator3 - // - this.bindingNavigatorSeparator3.Name = "bindingNavigatorSeparator3"; - this.bindingNavigatorSeparator3.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem1 - // - this.bindingNavigatorPositionItem1.AccessibleName = "위치"; - this.bindingNavigatorPositionItem1.AutoSize = false; - this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; - this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem1.Text = "0"; - this.bindingNavigatorPositionItem1.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator4 - // - this.bindingNavigatorSeparator4.Name = "bindingNavigatorSeparator4"; - this.bindingNavigatorSeparator4.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem1 - // - this.bindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem1.Image"))); - this.bindingNavigatorMoveNextItem1.Name = "bindingNavigatorMoveNextItem1"; - this.bindingNavigatorMoveNextItem1.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem1.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveNextItem1.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem1 - // - this.bindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem1.Image"))); - this.bindingNavigatorMoveLastItem1.Name = "bindingNavigatorMoveLastItem1"; - this.bindingNavigatorMoveLastItem1.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem1.Size = new System.Drawing.Size(23, 22); - this.bindingNavigatorMoveLastItem1.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator5 - // - this.bindingNavigatorSeparator5.Name = "bindingNavigatorSeparator5"; - this.bindingNavigatorSeparator5.Size = new System.Drawing.Size(6, 25); - // - // panel2 - // - this.panel2.Controls.Add(this.fpSpread1); - this.panel2.Controls.Add(this.bindingNavigator1); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(0, 45); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1339, 645); - this.panel2.TabIndex = 38; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -733,6 +591,148 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // bsUser + // + this.bsUser.DataMember = "ProjectCountForUser"; + this.bsUser.DataSource = this.dSProjectSummary; + this.bsUser.Sort = "process,username"; + this.bsUser.CurrentChanged += new System.EventHandler(this.bsUser_CurrentChanged); + // + // dSProjectSummary + // + this.dSProjectSummary.DataSetName = "DSProjectSummary"; + this.dSProjectSummary.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // projectsTableAdapter + // + this.projectsTableAdapter.ClearBeforeFill = true; + // + // bindingNavigator1 + // + this.bindingNavigator1.AddNewItem = this.bindingNavigatorAddNewItem; + this.bindingNavigator1.BindingSource = this.bsUser; + this.bindingNavigator1.CountItem = this.bindingNavigatorCountItem1; + this.bindingNavigator1.DeleteItem = this.bindingNavigatorDeleteItem; + this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem1, + this.bindingNavigatorMovePreviousItem1, + this.bindingNavigatorSeparator3, + this.bindingNavigatorPositionItem1, + this.bindingNavigatorCountItem1, + this.bindingNavigatorSeparator4, + this.bindingNavigatorMoveNextItem1, + this.bindingNavigatorMoveLastItem1, + this.bindingNavigatorSeparator5, + this.bindingNavigatorAddNewItem, + this.bindingNavigatorDeleteItem}); + this.bindingNavigator1.Location = new System.Drawing.Point(0, 620); + this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem1; + this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem1; + this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem1; + this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1; + this.bindingNavigator1.Name = "bindingNavigator1"; + this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1; + this.bindingNavigator1.Size = new System.Drawing.Size(1339, 25); + this.bindingNavigator1.TabIndex = 37; + this.bindingNavigator1.Text = "bindingNavigator1"; + // + // bindingNavigatorAddNewItem + // + this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); + this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; + this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorAddNewItem.Text = "새로 추가"; + // + // bindingNavigatorCountItem1 + // + this.bindingNavigatorCountItem1.Name = "bindingNavigatorCountItem1"; + this.bindingNavigatorCountItem1.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem1.Text = "/{0}"; + this.bindingNavigatorCountItem1.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorDeleteItem + // + this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); + this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; + this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorDeleteItem.Text = "삭제"; + // + // bindingNavigatorMoveFirstItem1 + // + this.bindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem1.Image"))); + this.bindingNavigatorMoveFirstItem1.Name = "bindingNavigatorMoveFirstItem1"; + this.bindingNavigatorMoveFirstItem1.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem1.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem1.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem1 + // + this.bindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem1.Image"))); + this.bindingNavigatorMovePreviousItem1.Name = "bindingNavigatorMovePreviousItem1"; + this.bindingNavigatorMovePreviousItem1.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem1.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem1.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator3 + // + this.bindingNavigatorSeparator3.Name = "bindingNavigatorSeparator3"; + this.bindingNavigatorSeparator3.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem1 + // + this.bindingNavigatorPositionItem1.AccessibleName = "위치"; + this.bindingNavigatorPositionItem1.AutoSize = false; + this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; + this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem1.Text = "0"; + this.bindingNavigatorPositionItem1.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator4 + // + this.bindingNavigatorSeparator4.Name = "bindingNavigatorSeparator4"; + this.bindingNavigatorSeparator4.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem1 + // + this.bindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem1.Image"))); + this.bindingNavigatorMoveNextItem1.Name = "bindingNavigatorMoveNextItem1"; + this.bindingNavigatorMoveNextItem1.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem1.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem1.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem1 + // + this.bindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem1.Image"))); + this.bindingNavigatorMoveLastItem1.Name = "bindingNavigatorMoveLastItem1"; + this.bindingNavigatorMoveLastItem1.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem1.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem1.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator5 + // + this.bindingNavigatorSeparator5.Name = "bindingNavigatorSeparator5"; + this.bindingNavigatorSeparator5.Size = new System.Drawing.Size(6, 25); + // + // panel2 + // + this.panel2.Controls.Add(this.fpSpread1); + this.panel2.Controls.Add(this.bindingNavigator1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 45); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1339, 645); + this.panel2.TabIndex = 38; + // // fProjectListUser // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -751,6 +751,7 @@ ((System.ComponentModel.ISupportInitialize)(this.bsHistD)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsUser)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dSProjectSummary)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit(); @@ -758,7 +759,6 @@ this.bindingNavigator1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/Project/fProjectListUser.cs b/SubProject/FPJ0000/Project/fProjectListUser.cs index b6dc3d2..b4c8365 100644 --- a/SubProject/FPJ0000/Project/fProjectListUser.cs +++ b/SubProject/FPJ0000/Project/fProjectListUser.cs @@ -40,11 +40,14 @@ namespace FPJ0000 this.cmbYearS.Items.Clear(); + //this.cmbYearE.Items.Clear(); for (int i = 2010; i <= DateTime.Now.Year + 1; i++) { cmbYearS.Items.Add(i.ToString("0000")); + // cmbYearE.Items.Add(i.ToString("0000")); } this.cmbYearS.Text = DateTime.Now.Year.ToString("0000"); + // this.cmbYearE.Text = DateTime.Now.Year.ToString("0000"); refreshData(); //일반사용자의경우에는 상태를 변경하지 못한다. diff --git a/SubProject/FPJ0000/Project/fProjectListUser.resx b/SubProject/FPJ0000/Project/fProjectListUser.resx index 48be050..6f31b65 100644 --- a/SubProject/FPJ0000/Project/fProjectListUser.resx +++ b/SubProject/FPJ0000/Project/fProjectListUser.resx @@ -217,7 +217,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/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 @@ -229,7 +229,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -241,7 +241,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAASpJREFUOE9jGDygcNbz/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 @@ -252,7 +252,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -261,7 +261,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -270,7 +270,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAASxJREFUOE9jGFygcNbz/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