diff --git a/Project/History.txt b/Project/History.txt index 7d05ca9..a1443cb 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,2 +1,4 @@ -180917 chi +181004 chi 장비목록 출력물이 나오지 않는 현상 제거 (resource path 오류) + 장비목록 내부검색기능 추가 +180917 chi 180624 chi setting 의 경로를 applicationdata 적용 되도록 수정 \ No newline at end of file diff --git a/SubProject/FCM0000/fLovItem.cs b/SubProject/FCM0000/fLovItem.cs index 9973132..f432942 100644 --- a/SubProject/FCM0000/fLovItem.cs +++ b/SubProject/FCM0000/fLovItem.cs @@ -16,7 +16,9 @@ namespace FCM0000 public string itemmodel = string.Empty; public decimal itemprice = 0; public string SID = string.Empty; + public string itemSupply = string.Empty; + public int itemSupplyidx = -1; string keyword = string.Empty; public fLovItem(string search_) @@ -60,6 +62,7 @@ namespace FCM0000 itemmodel = string.Empty; itemprice = 0; itemSupply = string.Empty; + itemSupplyidx = -1; SID = string.Empty; return; } @@ -71,6 +74,7 @@ namespace FCM0000 itemmodel = dr.model; itemprice = dr.price; itemSupply = dr.supply; + itemSupplyidx = dr.supplyidx; SID = dr.sid; } btOK.PerformClick(); diff --git a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs index 9c6ecc4..203a7f9 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs @@ -30,11 +30,11 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bsB = new System.Windows.Forms.BindingSource(this.components); - this.dsEQ = new dsEQ(); + this.dsEQ = new FEQ0000.dsEQ(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -49,7 +49,7 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.tbFilter = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btFind = new System.Windows.Forms.ToolStripButton(); this.dv = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -86,21 +86,21 @@ this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton(); + this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); + this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.cmbDate = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripButton(); - this.taB = new dsEQTableAdapters.EquipmentBTableAdapter(); + this.taB = new FEQ0000.dsEQTableAdapters.EquipmentBTableAdapter(); this.bsF = new System.Windows.Forms.BindingSource(this.components); - this.taF = new dsEQTableAdapters.EquipmentFTableAdapter(); - this.tam = new dsEQTableAdapters.TableAdapterManager(); - this.taME = new dsEQTableAdapters.EquipmentMETableAdapter(); + this.taF = new FEQ0000.dsEQTableAdapters.EquipmentFTableAdapter(); + this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager(); + this.taME = new FEQ0000.dsEQTableAdapters.EquipmentMETableAdapter(); this.bsME = new System.Windows.Forms.BindingSource(this.components); - this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton(); - this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit(); @@ -137,7 +137,7 @@ this.toolStripSeparator1, this.toolStripLabel1, this.tbFilter, - this.toolStripButton1}); + this.btFind}); this.bn.Location = new System.Drawing.Point(0, 604); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -266,15 +266,16 @@ this.tbFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbFilter.Name = "tbFilter"; this.tbFilter.Size = new System.Drawing.Size(150, 25); + this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyDown); // - // toolStripButton1 + // btFind // - 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(64, 22); - this.toolStripButton1.Text = "Find(&F)"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(64, 22); + this.btFind.Text = "Find(&F)"; + this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click); // // dv // @@ -310,9 +311,9 @@ // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridViewTextBoxColumn1.HeaderText = "idx"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.ReadOnly = true; @@ -619,6 +620,34 @@ this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(6, 30); // + // toolStripButton2 + // + this.toolStripButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton7, + this.applyToolStripMenuItem}); + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(99, 27); + this.toolStripButton2.Text = "Data Macro"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // toolStripButton7 + // + this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); + this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton7.Name = "toolStripButton7"; + this.toolStripButton7.Size = new System.Drawing.Size(112, 20); + this.toolStripButton7.Text = "Macro Manager"; + this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); + // + // applyToolStripMenuItem + // + this.applyToolStripMenuItem.Name = "applyToolStripMenuItem"; + this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22); + this.applyToolStripMenuItem.Text = "Apply"; + this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click); + // // toolStripButton4 // this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -688,7 +717,8 @@ this.tam.EquipmentFilterTableAdapter = null; this.tam.EquipmentFTableAdapter = this.taF; this.tam.EquipmentMETableAdapter = this.taME; - this.tam.UpdateOrder = dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.LineCodeTableAdapter = null; + this.tam.UpdateOrder = FEQ0000.dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // taME // @@ -699,34 +729,6 @@ this.bsME.DataMember = "EquipmentME"; this.bsME.DataSource = this.dsEQ; // - // toolStripButton2 - // - this.toolStripButton2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton7, - this.applyToolStripMenuItem}); - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(99, 27); - this.toolStripButton2.Text = "Data Macro"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // applyToolStripMenuItem - // - this.applyToolStripMenuItem.Name = "applyToolStripMenuItem"; - this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22); - this.applyToolStripMenuItem.Text = "Apply"; - this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click); - // - // toolStripButton7 - // - this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); - this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton7.Name = "toolStripButton7"; - this.toolStripButton7.Size = new System.Drawing.Size(112, 20); - this.toolStripButton7.Text = "Macro Manager"; - this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); - // // fEquipment // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -801,7 +803,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.ToolStripTextBox tbFilter; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btFind; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs index 9efe5c2..8b9628e 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.cs @@ -152,9 +152,13 @@ namespace FEQ0000 try { - var dRows = this.dsEQ.EquipmentB.Select(filter); + DataRow[] dRows = null; + if(dataType == eTabletype.BUMP) dRows = this.dsEQ.EquipmentB.Select(filter); + else if (dataType == eTabletype.MOLD) dRows = this.dsEQ.EquipmentME.Select(filter); + else dRows = this.dsEQ.EquipmentF.Select(filter); + int cnt = 0; - foreach(dsEQ.EquipmentBRow dr in dRows) + foreach(DataRow dr in dRows) { var appList = apply.Split(';'); foreach (var item in appList) @@ -181,9 +185,29 @@ namespace FEQ0000 { try { - this.bsB.Filter = tbFilter.Text; - if (tbFilter.Text.isEmpty()) tbFilter.BackColor = Color.White; - else tbFilter.BackColor = Color.Lime; + string key = tbFilter.Text.Trim(); + string filter = ""; + if(!key.isEmpty()) + { + filter = "asset like @ or type like @ or manu like @ or model like @ or linecode like @ or serial like @"; + filter = filter.Replace("@", "'%" + key.Replace("'","''") + "%'"); + } + try + { + if (dataType == eTabletype.MOLD) this.bsME.Filter = filter; + else if (dataType == eTabletype.BUMP) this.bsB.Filter = filter; + else this.bsF.Filter = filter; + + if (key.isEmpty()) this.tbFilter.BackColor = Color.White; + else this.tbFilter.BackColor = Color.Lime; + } + catch(Exception ex) + { + tbFilter.BackColor = Color.HotPink; + FCOMMON.Util.MsgE("filter error\n" + ex.Message); + } + tbFilter.Focus(); + tbFilter.SelectAll(); } catch (Exception ex) { @@ -362,5 +386,10 @@ namespace FEQ0000 else FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 변경되었습니다."); } } + + private void tbFilter_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) btFind.PerformClick(); + } } } diff --git a/SubProject/FEQ0000/Equipment/fEquipment.resx b/SubProject/FEQ0000/Equipment/fEquipment.resx index dad58f2..b3df7e2 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.resx +++ b/SubProject/FEQ0000/Equipment/fEquipment.resx @@ -198,7 +198,7 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG @@ -213,9 +213,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 147, 17 - True @@ -247,9 +244,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY8AFvCu2KMV3H9sMwiA2VJh4EFCxxbh+1ZP/ - IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXfjZcmCmy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d + IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXv9ZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d 2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7 - xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAIZdC8OlikQBAAAAAElFTkSuQmCC + xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHrxC70VkWh8AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEZHn7MtJlnbvaYYSF3UlRqrOyta + aSpI1ElB3amr1jR5BNG4F5Iu/KEw5htnSmPSGPzgwmXuPWcYGLIojJGl4XnFGDrVDfTiuFwABAPNjp6s + KSoYKHZpiWEYyz5dOZs8t6fsrctQ6HGGmVjLD4fdNDwv8Vylv1CCQXCl9icv+xlYFiTYyTyHv5lqdhEs + CztjqvZmEjRjV+2VgWVxScJwycip6nG49yWHD7dbbLNZ5323o7PTowbvm2adz+ReHLY/Hy9q68S7TAvu + rlvMFILjQ52ddH4EprnK7m9aaYFTW+PP8Km6Hb1a73L4V2EXDIdlfKrtROHBRx4wX7mwjO+qu0USzHCR + WM8PJHGOhMPJTKwV57cEfWlYJqCKBfBfMIJPMnIqDS/5J7Nflwkh38ze61wJP6KjAAAAAElFTkSuQmCC @@ -258,37 +266,37 @@ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHGSURBVDhPYyAVhNavYovtOtwX03m0F8SGCqOC0s45vGU9 s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6 Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef - /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjl1//ByEtxy+GcQQ23N4YufW - d/+7t3/437Du6Z+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb - IC+0zli9rr6+ngksiQVEdxwNKZx/42nx3GtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb + /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjl5//ByEtxy+GcQQ23N4YufW + d/+7t3/4X7/uyZ+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb + IC+0zli9rr6+ngksiQVEdxwNKZh/42nxnKtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY - AEawLzDtVjl5AAAAAElFTkSuQmCC + ADT1LyccReKxAAAAAElFTkSuQmCC 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 @@ -319,16 +327,4 @@ 500, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPnZJNS8NAFEVHf2dbTLK2e01pIHVRV37Udmel - VpoKEnVSUHfqqjVN/oIY9y6Sgh8UxtxxpjQmjcELDx7z3jnDwJBVYYysjS9Kxtgu19GL42IB4I80K3xu - zVH+SLEKSwzDWPfoxvnspT1nb32GQo8zzMRadjjsJOFliesow5USDPxrdTgLOilYFiTYST2Hv5lqVh4s - CztTqg4WEjRTRx0UgWVxScxwycQu61Fw9CWHj3e7bKdR5X2/q7OzkxrvG2aVz+ReFLQ/ny4r28S9Sgru - b5rMFILesc5Ouz8C09xkD7fNpMCubPFneFTdC19b73L4V2EXDIdlPKrth0HnIwtYrkxYxnPUgzwJZrhI - rGcHkihDwuF4Jtby81uCvjAs41PlEOC/YASfZGKXam78Txa/LhVCvgFb1OuXLMuHwQAAAABJRU5ErkJg - gg== - - \ No newline at end of file diff --git a/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs b/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs index 35048de..2bc3174 100644 --- a/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs +++ b/SubProject/FEQ0000/Equipment/rpt_equipmentB.cs @@ -35,18 +35,18 @@ namespace FEQ0000 switch (imptype) { - case fEquipment.eTabletype.FOL: - this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportF.rdlc"; + case fEquipment.eTabletype.FOL: + this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportF.rdlc"; taF.Fill(this.dsEQ.vEquStockF, this.pdate); DsEQ.Value = this.dsEQ.vEquStockF; break; case fEquipment.eTabletype.BUMP: - this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc"; + this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportB.rdlc"; taB.Fill(this.dsEQ.vEquStockB, this.pdate); DsEQ.Value = this.dsEQ.vEquStockB; break; case fEquipment.eTabletype.MOLD: - this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportE.rdlc"; + this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportE.rdlc"; taE.Fill(this.dsEQ.vEquStockME, this.pdate); DsEQ.Value = this.dsEQ.vEquStockME; break; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 6fb03f0..04e53f0 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,17 +30,17 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - 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 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 dataGridViewCellStyle10 = 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 dataGridViewCellStyle14 = 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 dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -63,21 +63,6 @@ this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); this.lbSum = new System.Windows.Forms.ToolStripLabel(); this.dv1 = new System.Windows.Forms.DataGridView(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.viewThisUserDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.lbStt = new System.Windows.Forms.ToolStripLabel(); - this.dtSD = new System.Windows.Forms.ToolStripTextBox(); - this.lbEnd = new System.Windows.Forms.ToolStripLabel(); - this.dtED = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.cmbState = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); - this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); - this.btSearch = new System.Windows.Forms.ToolStripButton(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -100,6 +85,21 @@ this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewThisUserDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.dtSD = new System.Windows.Forms.ToolStripTextBox(); + this.lbEnd = new System.Windows.Forms.ToolStripLabel(); + this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbState = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); + this.btSearch = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -134,7 +134,7 @@ this.bn.AddNewItem = null; this.bn.BindingSource = this.bs; this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.DeleteItem = null; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, @@ -178,6 +178,7 @@ this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 23); this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; + this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); // // bindingNavigatorMoveFirstItem // @@ -328,6 +329,192 @@ this.dv1.TabIndex = 2; this.dv1.DoubleClick += new System.EventHandler(this.dv1_DoubleClick); // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate"; + this.dataGridViewTextBoxColumn2.HeaderText = "Date"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.DataPropertyName = "stateName"; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle12; + this.dataGridViewTextBoxColumn3.HeaderText = "State"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.DataPropertyName = "process"; + this.dataGridViewTextBoxColumn4.HeaderText = "process"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.DataPropertyName = "request"; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle13; + this.dataGridViewTextBoxColumn7.HeaderText = "request"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.ReadOnly = true; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.DataPropertyName = "sc"; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle14; + this.dataGridViewTextBoxColumn6.HeaderText = "sc#"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "receive"; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle15; + this.dataGridViewTextBoxColumn5.HeaderText = "receive"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.DataPropertyName = "sid"; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle16; + this.dataGridViewTextBoxColumn8.HeaderText = "sid#"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.ReadOnly = true; + // + // dataGridViewTextBoxColumn9 + // + this.dataGridViewTextBoxColumn9.DataPropertyName = "pumname"; + this.dataGridViewTextBoxColumn9.HeaderText = "Item"; + this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; + this.dataGridViewTextBoxColumn9.ReadOnly = true; + // + // pumidx + // + this.pumidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.pumidx.DataPropertyName = "pumidx"; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.pumidx.DefaultCellStyle = dataGridViewCellStyle17; + this.pumidx.HeaderText = "*"; + this.pumidx.Name = "pumidx"; + this.pumidx.ReadOnly = true; + this.pumidx.Width = 50; + // + // dataGridViewTextBoxColumn10 + // + this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale"; + this.dataGridViewTextBoxColumn10.HeaderText = "Model"; + this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; + this.dataGridViewTextBoxColumn10.ReadOnly = true; + // + // dataGridViewTextBoxColumn11 + // + this.dataGridViewTextBoxColumn11.DataPropertyName = "pumunit"; + this.dataGridViewTextBoxColumn11.HeaderText = "Unit"; + this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; + this.dataGridViewTextBoxColumn11.ReadOnly = true; + // + // dataGridViewTextBoxColumn12 + // + this.dataGridViewTextBoxColumn12.DataPropertyName = "pumqty"; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.Format = "N0"; + this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle18; + this.dataGridViewTextBoxColumn12.HeaderText = "Qty"; + this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; + this.dataGridViewTextBoxColumn12.ReadOnly = true; + // + // dataGridViewTextBoxColumn13 + // + this.dataGridViewTextBoxColumn13.DataPropertyName = "pumprice"; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.Format = "N0"; + this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle19; + this.dataGridViewTextBoxColumn13.HeaderText = "Price"; + this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; + this.dataGridViewTextBoxColumn13.ReadOnly = true; + // + // dataGridViewTextBoxColumn14 + // + this.dataGridViewTextBoxColumn14.DataPropertyName = "pumamt"; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle20.Format = "N0"; + this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle20; + this.dataGridViewTextBoxColumn14.HeaderText = "Amt"; + this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14"; + this.dataGridViewTextBoxColumn14.ReadOnly = true; + // + // dataGridViewTextBoxColumn15 + // + this.dataGridViewTextBoxColumn15.DataPropertyName = "supply"; + this.dataGridViewTextBoxColumn15.HeaderText = "Supply"; + this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15"; + this.dataGridViewTextBoxColumn15.ReadOnly = true; + // + // supplyidx + // + this.supplyidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.supplyidx.DataPropertyName = "supplyidx"; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.supplyidx.DefaultCellStyle = dataGridViewCellStyle21; + this.supplyidx.HeaderText = "*"; + this.supplyidx.Name = "supplyidx"; + this.supplyidx.ReadOnly = true; + this.supplyidx.Width = 50; + // + // dataGridViewTextBoxColumn17 + // + this.dataGridViewTextBoxColumn17.DataPropertyName = "project"; + this.dataGridViewTextBoxColumn17.HeaderText = "Project"; + this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; + this.dataGridViewTextBoxColumn17.ReadOnly = true; + // + // dataGridViewTextBoxColumn19 + // + this.dataGridViewTextBoxColumn19.DataPropertyName = "asset"; + this.dataGridViewTextBoxColumn19.HeaderText = "Asset"; + this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19"; + this.dataGridViewTextBoxColumn19.ReadOnly = true; + // + // dataGridViewTextBoxColumn20 + // + this.dataGridViewTextBoxColumn20.DataPropertyName = "edate"; + this.dataGridViewTextBoxColumn20.HeaderText = "ExDate"; + this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; + this.dataGridViewTextBoxColumn20.ReadOnly = true; + // + // dataGridViewTextBoxColumn21 + // + this.dataGridViewTextBoxColumn21.DataPropertyName = "indate"; + this.dataGridViewTextBoxColumn21.HeaderText = "InDate"; + this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; + this.dataGridViewTextBoxColumn21.ReadOnly = true; + // + // dataGridViewTextBoxColumn22 + // + this.dataGridViewTextBoxColumn22.DataPropertyName = "po"; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle22; + this.dataGridViewTextBoxColumn22.HeaderText = "PO"; + this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22"; + this.dataGridViewTextBoxColumn22.ReadOnly = true; + // + // dataGridViewTextBoxColumn23 + // + this.dataGridViewTextBoxColumn23.DataPropertyName = "dept"; + this.dataGridViewTextBoxColumn23.HeaderText = "Dept"; + this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; + this.dataGridViewTextBoxColumn23.ReadOnly = true; + // // cm1 // this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -444,192 +631,6 @@ this.btSearch.Text = "Refresh(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate"; - this.dataGridViewTextBoxColumn2.HeaderText = "Date"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.ReadOnly = true; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "stateName"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewTextBoxColumn3.HeaderText = "State"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.ReadOnly = true; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "process"; - this.dataGridViewTextBoxColumn4.HeaderText = "process"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.ReadOnly = true; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.DataPropertyName = "request"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridViewTextBoxColumn7.HeaderText = "request"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.ReadOnly = true; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "sc"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewTextBoxColumn6.HeaderText = "sc#"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "receive"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewTextBoxColumn5.HeaderText = "receive"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - // - // dataGridViewTextBoxColumn8 - // - this.dataGridViewTextBoxColumn8.DataPropertyName = "sid"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle5; - this.dataGridViewTextBoxColumn8.HeaderText = "sid#"; - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.ReadOnly = true; - // - // dataGridViewTextBoxColumn9 - // - this.dataGridViewTextBoxColumn9.DataPropertyName = "pumname"; - this.dataGridViewTextBoxColumn9.HeaderText = "Item"; - this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; - this.dataGridViewTextBoxColumn9.ReadOnly = true; - // - // pumidx - // - this.pumidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.pumidx.DataPropertyName = "pumidx"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.pumidx.DefaultCellStyle = dataGridViewCellStyle6; - this.pumidx.HeaderText = "*"; - this.pumidx.Name = "pumidx"; - this.pumidx.ReadOnly = true; - this.pumidx.Width = 50; - // - // dataGridViewTextBoxColumn10 - // - this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale"; - this.dataGridViewTextBoxColumn10.HeaderText = "Model"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.ReadOnly = true; - // - // dataGridViewTextBoxColumn11 - // - this.dataGridViewTextBoxColumn11.DataPropertyName = "pumunit"; - this.dataGridViewTextBoxColumn11.HeaderText = "Unit"; - this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; - this.dataGridViewTextBoxColumn11.ReadOnly = true; - // - // dataGridViewTextBoxColumn12 - // - this.dataGridViewTextBoxColumn12.DataPropertyName = "pumqty"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.Format = "N0"; - this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle7; - this.dataGridViewTextBoxColumn12.HeaderText = "Qty"; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.ReadOnly = true; - // - // dataGridViewTextBoxColumn13 - // - this.dataGridViewTextBoxColumn13.DataPropertyName = "pumprice"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.Format = "N0"; - this.dataGridViewTextBoxColumn13.DefaultCellStyle = dataGridViewCellStyle8; - this.dataGridViewTextBoxColumn13.HeaderText = "Price"; - this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; - this.dataGridViewTextBoxColumn13.ReadOnly = true; - // - // dataGridViewTextBoxColumn14 - // - this.dataGridViewTextBoxColumn14.DataPropertyName = "pumamt"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle9.Format = "N0"; - this.dataGridViewTextBoxColumn14.DefaultCellStyle = dataGridViewCellStyle9; - this.dataGridViewTextBoxColumn14.HeaderText = "Amt"; - this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14"; - this.dataGridViewTextBoxColumn14.ReadOnly = true; - // - // dataGridViewTextBoxColumn15 - // - this.dataGridViewTextBoxColumn15.DataPropertyName = "supply"; - this.dataGridViewTextBoxColumn15.HeaderText = "Supply"; - this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15"; - this.dataGridViewTextBoxColumn15.ReadOnly = true; - // - // supplyidx - // - this.supplyidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.supplyidx.DataPropertyName = "supplyidx"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.supplyidx.DefaultCellStyle = dataGridViewCellStyle10; - this.supplyidx.HeaderText = "*"; - this.supplyidx.Name = "supplyidx"; - this.supplyidx.ReadOnly = true; - this.supplyidx.Width = 50; - // - // dataGridViewTextBoxColumn17 - // - this.dataGridViewTextBoxColumn17.DataPropertyName = "project"; - this.dataGridViewTextBoxColumn17.HeaderText = "Project"; - this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; - this.dataGridViewTextBoxColumn17.ReadOnly = true; - // - // dataGridViewTextBoxColumn19 - // - this.dataGridViewTextBoxColumn19.DataPropertyName = "asset"; - this.dataGridViewTextBoxColumn19.HeaderText = "Asset"; - this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19"; - this.dataGridViewTextBoxColumn19.ReadOnly = true; - // - // dataGridViewTextBoxColumn20 - // - this.dataGridViewTextBoxColumn20.DataPropertyName = "edate"; - this.dataGridViewTextBoxColumn20.HeaderText = "ExDate"; - this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; - this.dataGridViewTextBoxColumn20.ReadOnly = true; - // - // dataGridViewTextBoxColumn21 - // - this.dataGridViewTextBoxColumn21.DataPropertyName = "indate"; - this.dataGridViewTextBoxColumn21.HeaderText = "InDate"; - this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; - this.dataGridViewTextBoxColumn21.ReadOnly = true; - // - // dataGridViewTextBoxColumn22 - // - this.dataGridViewTextBoxColumn22.DataPropertyName = "po"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle11; - this.dataGridViewTextBoxColumn22.HeaderText = "PO"; - this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22"; - this.dataGridViewTextBoxColumn22.ReadOnly = true; - // - // dataGridViewTextBoxColumn23 - // - this.dataGridViewTextBoxColumn23.DataPropertyName = "dept"; - this.dataGridViewTextBoxColumn23.HeaderText = "Dept"; - this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; - this.dataGridViewTextBoxColumn23.ReadOnly = true; - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index c036f32..41af3d1 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -55,7 +55,7 @@ namespace FEQ0000 cmbState.Items.Add("-- All --"); foreach (var item in stList) cmbState.Items.Add(item); - this.cmbState.SelectedIndex = 0; + this.cmbState.SelectedIndex = 0; refreshData(); } @@ -73,8 +73,9 @@ namespace FEQ0000 try { string state = "%"; - if (cmbState.SelectedIndex > 0) { - state = cmbState.Text.Split(',')[0].Substring(1); + if (cmbState.SelectedIndex > 0) + { + state = cmbState.Text.Split(',')[0].Substring(1); } string request = "%"; if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%"; @@ -91,7 +92,7 @@ namespace FEQ0000 { decimal sum = 0; foreach (dsPurchase.PurchaseRow dr in this.dsPurchase.Purchase.Rows) - if(!dr.IspumamtNull()) sum += dr.pumamt; + if (!dr.IspumamtNull()) sum += dr.pumamt; lbSum.Text = sum.ToString("N0"); } @@ -107,7 +108,7 @@ namespace FEQ0000 private void toolStripButton1_Click(object sender, EventArgs e) { - + } private void toolStripButton1_Click_1(object sender, EventArgs e) @@ -132,7 +133,7 @@ namespace FEQ0000 private void tbRequest_KeyDown(object sender, KeyEventArgs e) { - if(e.KeyCode == Keys.Enter) + if (e.KeyCode == Keys.Enter) btSearch.PerformClick(); } @@ -159,9 +160,9 @@ namespace FEQ0000 private void lbStt_Click(object sender, EventArgs e) { //start date - var list = FCOMMON.DBM.getGroupList("pdate", "purchase","", true); + var list = FCOMMON.DBM.getGroupList("pdate", "purchase", "", true); FCM0000.fLovOneItem f = new FCM0000.fLovOneItem(list); - if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { dtSD.Text = f.Title; dtED.Focus(); @@ -191,9 +192,29 @@ namespace FEQ0000 { var drv = this.bs.Current as DataRowView; if (drv == null) return; - if(drv["request"] == null) return; + if (drv["request"] == null) return; this.tbRequest.Text = drv["request"].ToString(); btSearch.PerformClick(); } + + private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?"); + if (dlg != System.Windows.Forms.DialogResult.Yes) return; + bs.RemoveCurrent(); + + //일반사용자는 데이터를 바로 삭제한다. + if (FCOMMON.info.Login.level > 9) return; + try + { + int cnt = ta.Update(this.dsPurchase); + if(cnt != 1) + FCOMMON.Util.MsgE(cnt.ToString() + "건의 자료가 삭제되었습니다."); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("delete error\n" + ex.Message); + } + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index f269f0c..a76be7a 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -133,18 +133,6 @@ 330, 17 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -195,6 +183,18 @@ zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=