diff --git a/Project/History.txt b/Project/History.txt index 031e09d..405b059 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,5 @@ -181030 chi 구매시 - 서플라이 검색 기능 추가됨, 날짜 입력 편하게 됨 +181031 chi 구매 - 프로젝트 검색시 유사 검색 기능이 되도록 수정 +181030 chi 구매시 - 서플라이 검색 기능 추가됨, 날짜 입력 편하게 됨 indate 가 자동 활성화되는 현상 수정 181023 chi getAuth_Purchase, 추가 181004 chi 장비목록 출력물이 나오지 않는 현상 제거 (resource path 오류) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3cf0fcb..fb9904d 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("18.10.30.1700")] -[assembly: AssemblyFileVersion("18.10.30.1700")] +[assembly: AssemblyVersion("18.10.31.0930")] +[assembly: AssemblyFileVersion("18.10.31.0930")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 50ca9ed..04dcc2b 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -49,6 +49,7 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.projectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.listToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.workReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.itemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.codesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -89,7 +90,7 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.workReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.cmVision.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -232,10 +233,17 @@ // listToolStripMenuItem // this.listToolStripMenuItem.Name = "listToolStripMenuItem"; - this.listToolStripMenuItem.Size = new System.Drawing.Size(92, 22); + this.listToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.listToolStripMenuItem.Text = "List"; this.listToolStripMenuItem.Click += new System.EventHandler(this.listToolStripMenuItem_Click); // + // workReportToolStripMenuItem + // + this.workReportToolStripMenuItem.Name = "workReportToolStripMenuItem"; + this.workReportToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.workReportToolStripMenuItem.Text = "Work_Report"; + this.workReportToolStripMenuItem.Click += new System.EventHandler(this.workReportToolStripMenuItem_Click); + // // commonToolStripMenuItem // this.commonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -527,7 +535,8 @@ this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton1, this.toolStripButton2, - this.toolStripButton3}); + this.toolStripButton3, + this.toolStripButton4}); this.toolStrip.Location = new System.Drawing.Point(1, 25); this.toolStrip.Name = "toolStrip"; this.toolStrip.Size = new System.Drawing.Size(1035, 25); @@ -565,12 +574,15 @@ this.toolStripButton3.Text = "toolStripButton3"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // workReportToolStripMenuItem + // toolStripButton4 // - this.workReportToolStripMenuItem.Name = "workReportToolStripMenuItem"; - this.workReportToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.workReportToolStripMenuItem.Text = "Work_Report"; - this.workReportToolStripMenuItem.Click += new System.EventHandler(this.workReportToolStripMenuItem_Click); + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(23, 22); + this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // // fMain // @@ -664,6 +676,7 @@ private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripMenuItem workReportToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButton4; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index e99fa99..0a66b3c 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -434,5 +434,12 @@ namespace Project { menu_work_report(); } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + var f = new FCM0000.fInventory(); + f.MdiParent = this; + f.Show(); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index ca7e97f..68d70b3 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -154,15 +154,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIcSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad - +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f5208SQX9PL3d9PrnRz - nV7n9GrnxJg/cxpcHs8pteKFakcFqdVtf1JmFL0p6cv+M3Nlyf9du+v/r16Y96+33u/fudWF/76ea/2/ - f07qz9m1HkdXhYYyQ7UhQHxj1+eWtbP+zzq59H/f/ln/m7dO+F++pvV/+sLK//Fzyv/nLa7+37Cq9n/t - 3IJfRRNTjsXNLo+BaoWAtJbOK7Xzp//f9WAvBt5+d/f/VVc2/p97etn/CQfn/i/d2PM3Zl7FW6hWCEhq - bl6c3tv/G6apZ99MrDQIzzm17H/ygqoLUK0QkNTamppe3/oHpihuThlWGoRBroifV74aqhUCUjo6ZNKq - +v5vv7eboAH12yf/iJtT2gLVigBxJb1/Fx5fB1aEzwvFa9o/xs4pS4VqQ4DE+u53XevmwxViw5tubf8f - Pa/yR8LMClOoNgRIau44Fd3V8jdpeuF3GI6eX/Ejen4lHCdOL/iZvKCmH6oFFaRV9GWkVvZthXJJB6ll - vbpp5e3vU6r6DaBCpIOM2omHM6o7/2XWTPqfVtmPgjNqJv5PKJ74O6duCnYvgEBCVeePOesO/U8v7v8O - FYIDfHJwkAk0Pb5owu/s2sk9UCE4QJVjYAAAeAOjM1CemPgAAAAASUVORK5CYII= + +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f5204TgX9PL3d9PrnRz + nV7n9GrnhJg/cxpcHs8pteKFakcFqdWtf1JmFL0p6c3+M3Nlyf9du+v/r1qQ96+n3u/f2VWF/76ea/2/ + f3bqz9m1HkdXhYYyQ7UhQHxj1+eWtbP+zzq59H/f/ln/m7dO+F++pvV/+sLK//Fzyv/nLa7+37Cq9n/t + 3IJfRRNTjsXNLo+BaoWAtJbOK7Xzp//f9WAvBt5+d/f/VVc2/p97etn/CQfn/i/Z2PM3Zl7FW6hWCEhq + bl6c1tv/G6apZ99MrDQIzzm17H/ygqoLUK0QkNTamppe3/IHpihuThlWGoRBroifV74aqhUCUjo6ZNKq + +v5vv7eboAH12yf/iJtT2gLVigCxxb1/Fx5fB1aEzwvFa9o/xs4pS4VqQ4DE+u53XevmwxViw5tubf8f + Pa/yR8LMClOoNgRIau44FdXV8jdpWsF3GI6eX/Ejen4lHCdOy/+ZvKCmH6oFFaRV9GWkVvZthXJJB6ll + vbpp5e3vU6r6DaBCpIOM2omHM6o7/mXWTPqfVtmPgjNqJv6PL5r4O6duCnYvgEB8VcePOesO/U8v6v8O + FYIDfHJwkAk0Pb5wwu/s2sk9UCE4QJVjYAAANRyjD7U4Ir0AAAAASUVORK5CYII= @@ -179,6 +179,22 @@ fO9vVxepZClykOM2tkiFRpl3NrE97EByEQteX99Pr3NVB2gS5+xsFDZOMQX1t5cAE5gdvYZVTztWXPfR d+sQM+d9LdxFgB3xMzYjQxjuPAlb+3GUOUDbuPXmQeT9rbxql7FW/B65wENEP91h285P3+PZPYy14vV/ xdM1Mhj+AC07yRaMtd+HAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJNSURBVDhPnZPbThNBAIZ5He/0AbxQxHhENDamGo2kF6Q3 + qNELwcRoMB4IgahBggdqiFpNAwUxBCEKjVhFQEsL1kOKLm0tPW5367Zdhu3vzNTp0kud5N+dmcz3zczO + bA0hBP9aajYW1hGIZTEQiMLtW8HT2RAcb4LonvDj+uA7ngt94zznuofRdM1ZLWGNQQoHqSQia4grBcTk + AhKqjqRSRDSd54nQhFMFdHoUHG15YEpYZcgfxiqFvY9tVZmWDHh+GJikeb1sIJ0vof2VjLaRMKzNHWUJ + ewhgLTKGlO8uf7OIfgZPhMqClFZCLq/D0nSlLBCggGMzXZCm26tErhu1GPtmYJTm+Zd1qJqOg40XTQEr + YrAQiXrCexkzjnq8+GpgKLiOgSXCBfUnWjhXEeiZIEAyFVAaP8/DBG/v74ebwq5FgmcBAkUrYp/1DOf+ + CrIoRl+CxKZgEKUCqv6b0AK3MdWzk4NOP8GjBYJIUsPuw/aNAg1roX6Qn04qmURg+DQXpOfLAk/vHjyh + YL+PwPGJChJF1B1oNAUlovIGUiNA0ovPo2c5yMJW427bzOG+jwT35gmk1Sy27z3OEX6MbACLnpOAwmJl + /6JfwD1zwJ0PBKGYjG27jpiCU51uaEW9AoiwfbM9P6TLZjMz+NZ7Aln5ja07LKbgWKsDS98j/IIklDx+ + pXOIpnL0Y6kIJxSsxLOQ4jKW6cyZrIrZuQVs2lJrClq7XGiwd/DrabFfxSHbJX7O7KjY165rsPE9s2Wz + mRlsPdlcFvzP7ywKIQR/ADe1RkU7UZGnAAAAAElFTkSuQmCC diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 893d27a..1416915 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,29 +30,29 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType97 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType36 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType98 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType99 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType100 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType101 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType102 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -105,6 +105,11 @@ this.btSearch = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.sheetView1 = new FarPoint.Win.Spread.SheetView(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); + this.금일입고품목ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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(); @@ -445,7 +450,9 @@ this.toolStripSeparator3, this.toolStripLabel3, this.tbRequest, - this.btSearch}); + this.btSearch, + this.toolStripSeparator5, + this.toolStripDropDownButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(878, 25); @@ -570,138 +577,138 @@ this.sheetView1.ColumnHeader.Cells.Get(0, 15).Value = "*"; this.sheetView1.ColumnHeader.Cells.Get(0, 17).Value = "*"; this.sheetView1.ColumnHeader.Rows.Get(0).Height = 37F; - this.sheetView1.Columns.Get(0).CellType = textCellType1; + this.sheetView1.Columns.Get(0).CellType = textCellType86; this.sheetView1.Columns.Get(0).DataField = "pdate"; this.sheetView1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(0).Label = "Date"; this.sheetView1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.sheetView1.Columns.Get(0).Width = 34F; this.sheetView1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.sheetView1.Columns.Get(1).CellType = textCellType2; + this.sheetView1.Columns.Get(1).CellType = textCellType87; this.sheetView1.Columns.Get(1).DataField = "stateName"; this.sheetView1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(1).Label = "state"; this.sheetView1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.sheetView1.Columns.Get(1).Width = 34F; - this.sheetView1.Columns.Get(2).CellType = textCellType3; + this.sheetView1.Columns.Get(2).CellType = textCellType88; this.sheetView1.Columns.Get(2).DataField = "process"; this.sheetView1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.sheetView1.Columns.Get(2).Width = 49F; - this.sheetView1.Columns.Get(3).CellType = textCellType4; + this.sheetView1.Columns.Get(3).CellType = textCellType89; this.sheetView1.Columns.Get(3).DataField = "request"; this.sheetView1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(3).Width = 48F; - this.sheetView1.Columns.Get(4).CellType = textCellType5; + this.sheetView1.Columns.Get(4).CellType = textCellType90; this.sheetView1.Columns.Get(4).DataField = "sc"; this.sheetView1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(4).Label = "sc#"; this.sheetView1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.sheetView1.Columns.Get(4).Width = 27F; - this.sheetView1.Columns.Get(5).CellType = textCellType6; + this.sheetView1.Columns.Get(5).CellType = textCellType91; this.sheetView1.Columns.Get(5).DataField = "receive"; this.sheetView1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(5).Width = 46F; - this.sheetView1.Columns.Get(6).CellType = textCellType7; + this.sheetView1.Columns.Get(6).CellType = textCellType92; this.sheetView1.Columns.Get(6).DataField = "sid"; this.sheetView1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(6).Label = "sid#"; this.sheetView1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.sheetView1.Columns.Get(6).Width = 31F; - this.sheetView1.Columns.Get(7).CellType = textCellType8; + this.sheetView1.Columns.Get(7).CellType = textCellType93; this.sheetView1.Columns.Get(7).DataField = "pumname"; this.sheetView1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(7).Label = "Item"; this.sheetView1.Columns.Get(7).Width = 33F; this.sheetView1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(8).CellType = numberCellType1; + numberCellType31.DecimalPlaces = 0; + numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType31.MaximumValue = 2147483647D; + numberCellType31.MinimumValue = -2147483648D; + this.sheetView1.Columns.Get(8).CellType = numberCellType31; this.sheetView1.Columns.Get(8).DataField = "pumidx"; this.sheetView1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(8).Label = "*"; this.sheetView1.Columns.Get(8).Width = 14F; - this.sheetView1.Columns.Get(9).CellType = textCellType9; + this.sheetView1.Columns.Get(9).CellType = textCellType94; this.sheetView1.Columns.Get(9).DataField = "pumscale"; this.sheetView1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(9).Label = "Model"; this.sheetView1.Columns.Get(9).Width = 43F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(10).CellType = numberCellType2; + numberCellType32.DecimalPlaces = 0; + numberCellType32.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType32.MaximumValue = 2147483647D; + numberCellType32.MinimumValue = -2147483648D; + this.sheetView1.Columns.Get(10).CellType = numberCellType32; this.sheetView1.Columns.Get(10).DataField = "pumqty"; this.sheetView1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(10).Label = "Qty"; this.sheetView1.Columns.Get(10).Width = 28F; - this.sheetView1.Columns.Get(11).CellType = textCellType10; + this.sheetView1.Columns.Get(11).CellType = textCellType95; this.sheetView1.Columns.Get(11).DataField = "pumunit"; this.sheetView1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(11).Label = "Unit"; this.sheetView1.Columns.Get(11).Width = 31F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.sheetView1.Columns.Get(12).CellType = numberCellType3; + numberCellType33.MaximumValue = 999999999999999D; + numberCellType33.MinimumValue = -999999999999999D; + this.sheetView1.Columns.Get(12).CellType = numberCellType33; this.sheetView1.Columns.Get(12).DataField = "pumprice"; this.sheetView1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.sheetView1.Columns.Get(12).Label = "Price"; this.sheetView1.Columns.Get(12).Width = 35F; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.sheetView1.Columns.Get(13).CellType = numberCellType4; + numberCellType34.MaximumValue = 999999999999999D; + numberCellType34.MinimumValue = -999999999999999D; + this.sheetView1.Columns.Get(13).CellType = numberCellType34; this.sheetView1.Columns.Get(13).DataField = "pumamt"; this.sheetView1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.sheetView1.Columns.Get(13).Label = "Amt"; this.sheetView1.Columns.Get(13).Width = 32F; - this.sheetView1.Columns.Get(14).CellType = textCellType11; + this.sheetView1.Columns.Get(14).CellType = textCellType96; this.sheetView1.Columns.Get(14).DataField = "supply"; this.sheetView1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(14).Label = "Supply"; this.sheetView1.Columns.Get(14).Width = 46F; this.sheetView1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(15).CellType = numberCellType5; + numberCellType35.DecimalPlaces = 0; + numberCellType35.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType35.MaximumValue = 2147483647D; + numberCellType35.MinimumValue = -2147483648D; + this.sheetView1.Columns.Get(15).CellType = numberCellType35; this.sheetView1.Columns.Get(15).DataField = "supplyidx"; this.sheetView1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(15).Label = "*"; this.sheetView1.Columns.Get(15).Width = 14F; - this.sheetView1.Columns.Get(16).CellType = textCellType12; + this.sheetView1.Columns.Get(16).CellType = textCellType97; this.sheetView1.Columns.Get(16).DataField = "project"; this.sheetView1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(16).Width = 46F; this.sheetView1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.sheetView1.Columns.Get(17).CellType = numberCellType6; + numberCellType36.DecimalPlaces = 0; + numberCellType36.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType36.MaximumValue = 2147483647D; + numberCellType36.MinimumValue = -2147483648D; + this.sheetView1.Columns.Get(17).CellType = numberCellType36; this.sheetView1.Columns.Get(17).DataField = "projectidx"; this.sheetView1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(17).Label = "*"; this.sheetView1.Columns.Get(17).Width = 14F; - this.sheetView1.Columns.Get(18).CellType = textCellType13; + this.sheetView1.Columns.Get(18).CellType = textCellType98; this.sheetView1.Columns.Get(18).DataField = "asset"; this.sheetView1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(18).Width = 35F; - this.sheetView1.Columns.Get(19).CellType = textCellType14; + this.sheetView1.Columns.Get(19).CellType = textCellType99; this.sheetView1.Columns.Get(19).DataField = "edate"; this.sheetView1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(19).Width = 38F; - this.sheetView1.Columns.Get(20).CellType = textCellType15; + this.sheetView1.Columns.Get(20).CellType = textCellType100; this.sheetView1.Columns.Get(20).DataField = "indate"; this.sheetView1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(20).Width = 42F; - this.sheetView1.Columns.Get(21).CellType = textCellType16; + this.sheetView1.Columns.Get(21).CellType = textCellType101; this.sheetView1.Columns.Get(21).DataField = "po"; this.sheetView1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.sheetView1.Columns.Get(21).Width = 23F; - this.sheetView1.Columns.Get(22).CellType = textCellType17; + this.sheetView1.Columns.Get(22).CellType = textCellType102; this.sheetView1.Columns.Get(22).DataField = "dept"; this.sheetView1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.sheetView1.Columns.Get(22).Width = 33F; @@ -710,6 +717,44 @@ this.sheetView1.RowHeader.Columns.Default.Resizable = false; this.sheetView1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); + // + // toolStripDropDownButton1 + // + this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.금일입고품목ToolStripMenuItem, + this.내가등록한자료ToolStripMenuItem, + this.이번달자료ToolStripMenuItem}); + this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); + this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; + this.toolStripDropDownButton1.Size = new System.Drawing.Size(102, 22); + this.toolStripDropDownButton1.Text = "Quick Menu"; + // + // 금일입고품목ToolStripMenuItem + // + this.금일입고품목ToolStripMenuItem.Name = "금일입고품목ToolStripMenuItem"; + this.금일입고품목ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.금일입고품목ToolStripMenuItem.Text = "금일 입고 품목"; + this.금일입고품목ToolStripMenuItem.Click += new System.EventHandler(this.금일입고품목ToolStripMenuItem_Click); + // + // 내가등록한자료ToolStripMenuItem + // + this.내가등록한자료ToolStripMenuItem.Name = "내가등록한자료ToolStripMenuItem"; + this.내가등록한자료ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.내가등록한자료ToolStripMenuItem.Text = "내가 등록한 자료"; + this.내가등록한자료ToolStripMenuItem.Click += new System.EventHandler(this.내가등록한자료ToolStripMenuItem_Click); + // + // 이번달자료ToolStripMenuItem + // + this.이번달자료ToolStripMenuItem.Name = "이번달자료ToolStripMenuItem"; + this.이번달자료ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.이번달자료ToolStripMenuItem.Text = "이번달 자료"; + this.이번달자료ToolStripMenuItem.Click += new System.EventHandler(this.이번달자료ToolStripMenuItem_Click); + // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -791,5 +836,10 @@ private FarPoint.Win.Spread.SheetView sheetView1; private System.Windows.Forms.ToolStripMenuItem exportDataToolStripMenuItem; private System.Windows.Forms.ToolStripComboBox cmDate; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; + private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1; + private System.Windows.Forms.ToolStripMenuItem 금일입고품목ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 내가등록한자료ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 이번달자료ToolStripMenuItem; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index b28438e..003d724 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -364,6 +364,8 @@ namespace FEQ0000 private void btFind_Click(object sender, EventArgs e) { var search = tbFind.Text.Trim(); + search = search.Replace("*", "x"); + if (tbFind.Text != search) tbFind.Text = search; try { if(search.isEmpty()) @@ -374,7 +376,6 @@ namespace FEQ0000 else { search = search.Replace("'", "''"); - // search = search.Replace("*", ""); string filter = "supply like ? or sid like ? or process like ? or sc like ? or pumname like ? or pumscale like ? or project like ?"; filter = filter.Replace("?", "'%" + search + "%'"); this.bs.Filter = filter; @@ -537,5 +538,32 @@ namespace FEQ0000 } + private void 내가등록한자료ToolStripMenuItem_Click(object sender, EventArgs e) + { + cmDate.SelectedIndex = 0; + dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString(); + dtED.Text = DateTime.Now.ToShortDateString(); + cmbState.SelectedIndex = 0; + tbRequest.Text = FCOMMON.info.Login.nameK; + refreshData(); + } + + private void 금일입고품목ToolStripMenuItem_Click(object sender, EventArgs e) + { + cmDate.SelectedIndex = 1; //입고일 + dtSD.Text = DateTime.Now.ToShortDateString(); //당일 + dtED.Text = DateTime.Now.ToShortDateString(); + tbRequest.Text = string.Empty; + refreshData(); + } + + private void 이번달자료ToolStripMenuItem_Click(object sender, EventArgs e) + { + dtSD.Text = DateTime.Now.ToString("yyyy-MM") + "-01"; + dtED.Text = DateTime.Now.ToShortDateString(); + tbRequest.Text = string.Empty; + refreshData(); + } + } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index c43ff7a..c34f868 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -288,6 +288,17 @@ GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEcSURBVDhPpZG9SkNBEIXvW+gLiI8gpEon+ADa2liEVAHL + NHY+goWdhYViYxGEdOksUtlIQAiIIQwkIDaC4XjPycx613CJPx8My87sN7N7b1HHYvEBwtVTv4OyDU/V + xFM/pyrb/YlWL61HksuYnQHvI9igo60fWUXVCjH1e4Mqrn5NnA+7WjPZyptMu8DrFax/COvtw273FCRr + kBHypJw8OQKeD4C3u2Ww2XVDx9SAcJMmx1TKFMe7wNMOMNpSbkUO5MZbX9q5/LipXK0csMi3iphK+aH4 + o8xnlLJi3IJdbKvsSg4L/MrpG8SVSzGitkGSyfQYdtNMV6YkkU3sEna+obyrS3TQ/y/lIGqEYgSRGChT + wdMZXkp4+r8UxSdk1wcO0mb/TQAAAABJRU5ErkJggg== diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs index 02f9351..3da2c66 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs @@ -255,8 +255,14 @@ namespace FEQ0000 newdr["sc"] = dr[3].ToString(); newdr["request"] = dr[4].ToString(); newdr["sid"] = dr[5].ToString(); + + //이름 변경함 + if (dr[6].ToString() != "") dr[6] = dr[6].ToString().Replace("*", "x"); + if (dr[7].ToString() != "") dr[7] = dr[7].ToString().Replace("*", "x"); + newdr["pumname"] = dr[6].ToString(); newdr["pumscale"] = dr[7].ToString(); + newdr["pumunit"] = dr[8].ToString(); if (dr[14].ToString() != "")