..

2018-10-31 09:50:59 +09:00
parent 45a3def8e1
commit 8002b1a254
9 changed files with 220 additions and 88 deletions
--- 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 오류)
--- 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")]
--- 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;
    }
 }

--- 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();
+        }
    }
 }
--- a/Project/fMain.resx
+++ b/Project/fMain.resx
@@ -154,15 +154,15 @@
    <value>
        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=
 </value>
  </data>
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -179,6 +179,22 @@
        fO9vVxepZClykOM2tkiFRpl3NrE97EByEQteX99Pr3NVB2gS5+xsFDZOMQX1t5cAE5gdvYZVTztWXPfR
        d+sQM+d9LdxFgB3xMzYjQxjuPAlb+3GUOUDbuPXmQeT9rbxql7FW/B65wENEP91h285P3+PZPYy14vV/
        xdM1Mhj+AC07yRaMtd+HAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
 </value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">