..

2020-09-03 21:34:28 +09:00
parent 31941ae90f
commit cfd9867e0c
11 changed files with 2681 additions and 90 deletions
--- a/Project/fMain.Designer.cs
+++ b/Project/fMain.Designer.cs
@@ -67,6 +67,8 @@
            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
            this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.휴가관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.근태입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.근로명부ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
            this.mn_docu = new System.Windows.Forms.ToolStripMenuItem();
@@ -370,45 +372,62 @@
            // dataFOLToolStripMenuItem
            // 
            this.dataFOLToolStripMenuItem.Name = "dataFOLToolStripMenuItem";
-            this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.dataFOLToolStripMenuItem.Text = "FOL";
            this.dataFOLToolStripMenuItem.Click += new System.EventHandler(this.dataFOLToolStripMenuItem_Click);
            // 
            // dataMoldEOLToolStripMenuItem
            // 
            this.dataMoldEOLToolStripMenuItem.Name = "dataMoldEOLToolStripMenuItem";
-            this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.dataMoldEOLToolStripMenuItem.Text = "MOLD & EOL";
            this.dataMoldEOLToolStripMenuItem.Click += new System.EventHandler(this.dataMoldEOLToolStripMenuItem_Click);
            // 
            // dataToolStripMenuItem
            // 
            this.dataToolStripMenuItem.Name = "dataToolStripMenuItem";
-            this.dataToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.dataToolStripMenuItem.Text = "BUMP";
            this.dataToolStripMenuItem.Click += new System.EventHandler(this.dataToolStripMenuItem_Click);
            // 
            // toolStripMenuItem2
            // 
            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(159, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
            // 
            // 라인코드관리ToolStripMenuItem
            // 
            this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem";
-            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
            this.라인코드관리ToolStripMenuItem.Text = "라인코드관리";
            this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click);
            // 
            // 휴가관리ToolStripMenuItem
            // 
+            this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.근태입력ToolStripMenuItem,
+            this.근로명부ToolStripMenuItem});
            this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
            this.휴가관리ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("휴가관리ToolStripMenuItem.Image")));
            this.휴가관리ToolStripMenuItem.Name = "휴가관리ToolStripMenuItem";
            this.휴가관리ToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
-            this.휴가관리ToolStripMenuItem.Text = "출근부(테스트)";
+            this.휴가관리ToolStripMenuItem.Text = "근태관리(테스트)";
            this.휴가관리ToolStripMenuItem.Click += new System.EventHandler(this.휴가관리ToolStripMenuItem_Click);
            // 
+            // 근태입력ToolStripMenuItem
+            // 
+            this.근태입력ToolStripMenuItem.Name = "근태입력ToolStripMenuItem";
+            this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(180, 24);
+            this.근로명부ToolStripMenuItem.Text = "근로자명부";
+            this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click);
+            // 
            // personalInventoryToolStripMenuItem
            // 
            this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
@@ -854,6 +873,8 @@
        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7;
        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8;
        private System.Windows.Forms.ToolStripMenuItem 휴가관리ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 근태입력ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 근로명부ToolStripMenuItem;
    }
 }

--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -982,9 +982,21 @@ namespace Project

        private void 휴가관리ToolStripMenuItem_Click(object sender, EventArgs e)
        {
-            string formkey = "HOLYDAY";
+            
+        }
+
+        private void 근태입력ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "HOLY";
            if (!ShowForm(formkey))
                AddForm(formkey, new FBS0000.fHolyday());
        }
+
+        private void 근로명부ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "WTABLEUSER";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new FBS0000.fWorkTableUser());
+        }
    }
 }
--- 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">
@@ -296,26 +316,6 @@
        JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
        jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
        Ow==
-</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">
@@ -366,16 +366,16 @@
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFC
-        QwoXhVCNrK1o6oJoA+mDkJrIvjRlkJQUgTUGEkLvYcSa0b4tCDZ1xDbv7l0vp+f87pUlKvTAw/1w73nO
-        85xzrvrfyhrK99VQ8/IsSNsLhvot/cd9vXXJx2MZQ+UJyPecwFLwPJYHLmIl7Ie8g/vZxhI272KDyuWa
-        d2IpcA7FW36URgIohfZhNdKMn7P9qAa3GJDdpmJpQ5n5s10oRvrw43orzKgH9sge1Mac/pUagH1jkwHZ
-        BjUtq9WW+y+gdDeASngXai7QntoP63kHqq9Pws6Novyucf0AMhO8MngJ5YkgrDseB5hoQfXFMZjpbphf
-        zui2v4+j/MFTH8CbuTaZCbaHd2uw9bQN5kevBn1Le/HwVSdCqRaMLgxiR+yfEygYb+baa8xWshNm5jRW
-        BTz9sgO+2b1oe9KEg48bEX0fwvYJdwCtoqfF25dRudlUZxZw4XM3huYOoN0FnooH0DueQDz5CUeuzjgD
-        6DOtqsSuacF4M9cmM8GHBHj0wXH03ktgMpnBVHIR959lnAHC7mNI6DOtIrsWzF2bzASH4ykNjE6+RU8k
-        KeC4dbhv5g3Fm2fCGBL6TKuoNgXjzVybzAT7h+c0sP3Ko1a9Oks2KDCeTJi+XXwmO9WmYLyZa5OZYBdW
-        LxlgM9uMp15fQsIBtEqzi2Bk59rrmNeK9/PHYLZ1PCVhDAl9plVU2xFsE3YW7ZMt9I/BbDOeTBhDQp+p
-        NFsLtqGU+guv4vTwUHMW1QAAAABJRU5ErkJggg==
+        QwoXhVCNrK1o6oJoA+mDkJrIvjRlkJQUgTUGEkKvRhFrRvu2INjUEdu8u3e9nJ7zu1eWqNADD/fDvec5
+        z3POuep/K2so31dDzcuzIG0vGOq39B/39dYlH49lDJUnIN9zAkvB81geuIiVsB/yDu5nG0vYvIsNKpdr
+        3omlwDkUb/lRGgmgFNqH1Ugzfs72oxrcYkB2m4qlDWXmz3ahGOnDj+utMKMe2CN7UBtz+ldqAPaNTQZk
+        G9S0rFZb7r+A0t0AKuFdqLlAe2o/rOcdqL4+CTs3ivK7xvUDyEzwyuAllCeCsO54HGCiBdUXx2Cmu2F+
+        OaPb/j6O8ntPfQBv5tpkJtge3q3B1tM2mB+9GvQt7cXDV50IpVow+mEQO2L/nEDBeDPXXmO2kp0wM6ex
+        KuDplx3wze5F25MmHHzciOhCCNsn3AG0ip4Wb19G5WZTnVnAhc/dGJo7gHYXeCoeQO94AvHkJxy5OuMM
+        oM+0qhK7pgXjzVybzAQfEuDRB8fRey+ByWQGU8lF3H+WcQYIu48hoc+0iuxaMHdtMhMcjqc0MDr5Fj2R
+        pIDj1uG+mTcUb54JY0joM62i2hSMN3NtMhPsH57TwPYrj1r16izZoMB4MmH6dvGZ7FSbgvFmrk1mgl1Y
+        vWSAzWwznnp9CQkH0CrNLoKRnWuvY14r3s8fg9nW8ZSEMST0mVZRbUewTdhZtE+20D8Gs814MmEMCX2m
+        0mwt2IZS6i+BL/Tbk6gtGgAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">