...

2024-01-02 23:08:00 +09:00
parent 7a7b667b3d
commit e26efda0fc
33 changed files with 10068 additions and 1357 deletions
--- a/Project/fMain.Designer.cs
+++ b/Project/fMain.Designer.cs
@@ -63,10 +63,12 @@
            this.cR구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.sPR구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripSeparator();
+            this.전자실구매승인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.품목입고ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.mn_project = 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.toolStripMenuItem15 = new System.Windows.Forms.ToolStripSeparator();
            this.layoutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.mn_dailyhistory = new System.Windows.Forms.ToolStripMenuItem();
@@ -156,7 +158,6 @@
            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
            this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
-            this.담당자별업무현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.cmTab.SuspendLayout();
            this.statusStrip1.SuspendLayout();
            this.menuStrip1.SuspendLayout();
@@ -399,6 +400,7 @@
            this.cR구매ToolStripMenuItem,
            this.sPR구매ToolStripMenuItem,
            this.toolStripMenuItem14,
+            this.전자실구매승인ToolStripMenuItem,
            this.품목입고ToolStripMenuItem});
            this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image")));
            this.mn_purchase.Name = "mn_purchase";
@@ -409,7 +411,7 @@
            // 일반구매ToolStripMenuItem
            // 
            this.일반구매ToolStripMenuItem.Name = "일반구매ToolStripMenuItem";
-            this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.일반구매ToolStripMenuItem.Text = "일반 구매";
            this.일반구매ToolStripMenuItem.Click += new System.EventHandler(this.일반구매ToolStripMenuItem_Click);
            // 
@@ -417,7 +419,7 @@
            // 
            this.cR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
            this.cR구매ToolStripMenuItem.Name = "cR구매ToolStripMenuItem";
-            this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.cR구매ToolStripMenuItem.Text = "CR 구매";
            this.cR구매ToolStripMenuItem.Click += new System.EventHandler(this.cR구매ToolStripMenuItem_Click);
            // 
@@ -425,19 +427,27 @@
            // 
            this.sPR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
            this.sPR구매ToolStripMenuItem.Name = "sPR구매ToolStripMenuItem";
-            this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.sPR구매ToolStripMenuItem.Text = "전자실 구매";
            this.sPR구매ToolStripMenuItem.Click += new System.EventHandler(this.sPR구매ToolStripMenuItem_Click);
            // 
            // toolStripMenuItem14
            // 
            this.toolStripMenuItem14.Name = "toolStripMenuItem14";
-            this.toolStripMenuItem14.Size = new System.Drawing.Size(150, 6);
+            this.toolStripMenuItem14.Size = new System.Drawing.Size(177, 6);
+            // 
+            // 전자실구매승인ToolStripMenuItem
+            // 
+            this.전자실구매승인ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
+            this.전자실구매승인ToolStripMenuItem.Name = "전자실구매승인ToolStripMenuItem";
+            this.전자실구매승인ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.전자실구매승인ToolStripMenuItem.Text = "구매 승인";
+            this.전자실구매승인ToolStripMenuItem.Click += new System.EventHandler(this.전자실구매승인ToolStripMenuItem_Click);
            // 
            // 품목입고ToolStripMenuItem
            // 
            this.품목입고ToolStripMenuItem.Name = "품목입고ToolStripMenuItem";
-            this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+            this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.품목입고ToolStripMenuItem.Text = "품목 입고";
            this.품목입고ToolStripMenuItem.Click += new System.EventHandler(this.품목입고ToolStripMenuItem_Click);
            // 
@@ -464,12 +474,20 @@
            // 
            // 담당자별현황ToolStripMenuItem
            // 
-            this.담당자별현황ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+            this.담당자별현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
            this.담당자별현황ToolStripMenuItem.Name = "담당자별현황ToolStripMenuItem";
            this.담당자별현황ToolStripMenuItem.Size = new System.Drawing.Size(200, 24);
            this.담당자별현황ToolStripMenuItem.Text = "목록(챔피언)";
            this.담당자별현황ToolStripMenuItem.Click += new System.EventHandler(this.담당자별현황ToolStripMenuItem_Click);
            // 
+            // 담당자별업무현황ToolStripMenuItem
+            // 
+            this.담당자별업무현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
+            this.담당자별업무현황ToolStripMenuItem.Name = "담당자별업무현황ToolStripMenuItem";
+            this.담당자별업무현황ToolStripMenuItem.Size = new System.Drawing.Size(200, 24);
+            this.담당자별업무현황ToolStripMenuItem.Text = "담당자별 업무 현황";
+            this.담당자별업무현황ToolStripMenuItem.Click += new System.EventHandler(this.담당자별업무현황ToolStripMenuItem_Click);
+            // 
            // toolStripMenuItem15
            // 
            this.toolStripMenuItem15.Name = "toolStripMenuItem15";
@@ -1229,14 +1247,6 @@
            this.toolStripButton3.ToolTipText = "휴가신청";
            this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
            // 
-            // 담당자별업무현황ToolStripMenuItem
-            // 
-            this.담당자별업무현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Blue;
-            this.담당자별업무현황ToolStripMenuItem.Name = "담당자별업무현황ToolStripMenuItem";
-            this.담당자별업무현황ToolStripMenuItem.Size = new System.Drawing.Size(200, 24);
-            this.담당자별업무현황ToolStripMenuItem.Text = "담당자별 업무 현황";
-            this.담당자별업무현황ToolStripMenuItem.Click += new System.EventHandler(this.담당자별업무현황ToolStripMenuItem_Click);
-            // 
            // fMain
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1396,6 +1406,7 @@
        private System.Windows.Forms.ToolStripStatusLabel sbLoginUseTime;
        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem16;
        private System.Windows.Forms.ToolStripMenuItem 담당자별업무현황ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 전자실구매승인ToolStripMenuItem;
    }
 }

--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using System.ServiceModel;
 using System.Web.Services.Description;
 using FCOMMON;
+using FBS0000;

 namespace Project
 {
@@ -163,20 +164,20 @@ namespace Project
            }


-            // Address 
-            string address = "net.tcp://localhost:57900/eetgw";
+            //// Address 
+            //string address = "net.tcp://localhost:57900/eetgw";

-            // Binding : TCP 사용
-            NetTcpBinding binding = new NetTcpBinding();
+            //// Binding : TCP 사용
+            //NetTcpBinding binding = new NetTcpBinding();

-            // Service Host 만들기
-            host = new ServiceHost(typeof(MyService));
+            //// Service Host 만들기
+            //host = new ServiceHost(typeof(MyService));

-            // End Point 추가
-            host.AddServiceEndpoint(typeof(IMyContract), binding, address);
+            //// End Point 추가
+            //host.AddServiceEndpoint(typeof(IMyContract), binding, address);

-            // Service Host 시작
-            host.Open();
+            //// Service Host 시작
+            //host.Open();

        }
        void Update_Site()
@@ -1515,5 +1516,12 @@ namespace Project
                AddForm(formkey, new FPJ0000.fProjectListUser());

        }
+
+        private void 전자실구매승인ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "PURCHAGECONFIRMADMIN";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new FEQ0000.fPurchaseConfirm());
+        }
    }
 }
--- a/Project/fMain.resx
+++ b/Project/fMain.resx
@@ -153,6 +153,26 @@
        Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA
        kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV
        Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw==
+</value>
+  </data>
+  <data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL
+        XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo
+        oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE
+        TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh
+        AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw==
+</value>
+  </data>
+  <data name="메일양식ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
+        /lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
+        gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
+        SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
+        CyQdKlaIsLHjggEBADs=
 </value>
  </data>
  <data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -345,26 +365,6 @@
        oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG
        IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB
        D4UNMwz8ISAAOw==
-</value>
-  </data>
-  <data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL
-        XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo
-        oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE
-        TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh
-        AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw==
-</value>
-  </data>
-  <data name="메일양식ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
-        /lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
-        gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
-        SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
-        CyQdKlaIsLHjggEBADs=
 </value>
  </data>
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -468,14 +468,14 @@
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
        h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
-        /U7m/E+5XP8/92TF/3lzYj/UTMn/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
+        /U7m/E+5XP8/92TF/3lzYj/UTMr/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3t9r/vV7o9blnWyHc
        gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
        v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
        LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr
-        2d+jAdUG1LhtIjtQcP6NmfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
-        BQCHNaqguIh6AAAAAABJRU5ErkJggg==
+        2d+jAdUG1LhtIjtQcP616fX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
+        BQB7QaqWKtAx+QAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">