pmp제거, ot 시간 없으면 null로 입력

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.07.23.1500")]
+[assembly: AssemblyVersion("21.07.28.1350")]
-[assembly: AssemblyFileVersion("21.07.23.1500")]
+[assembly: AssemblyFileVersion("21.07.28.1350")]

Project/fMain.Designer.cs

@@ -62,6 +62,7 @@
             this.mn_dailyhistory = new System.Windows.Forms.ToolStripMenuItem();
             this.목록ToolStripMenuItem1 = 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.교육목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.비용절감ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -116,10 +117,8 @@
             this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
-            this.양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -240,14 +239,14 @@
             // 
             this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image")));
             this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
-            this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.codesToolStripMenuItem.Text = "공용코드";
             this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
             // 
             // itemsToolStripMenuItem
             // 
             this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
-            this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.itemsToolStripMenuItem.Text = "품목정보";
             this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
             // 
@@ -258,7 +257,7 @@
             this.myAccouserToolStripMenuItem,
             this.권한설정ToolStripMenuItem});
             this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
-            this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.userInfoToolStripMenuItem.Text = "사용자";
             // 
             // userAccountToolStripMenuItem
@@ -285,14 +284,14 @@
             // customerToolStripMenuItem
             // 
             this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
-            this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.customerToolStripMenuItem.Text = "업체정보";
             this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
             // 
             // mn_kuntae
             // 
             this.mn_kuntae.Name = "mn_kuntae";
-            this.mn_kuntae.Size = new System.Drawing.Size(180, 24);
+            this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
             this.mn_kuntae.Text = "월별 근무표";
             this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click);
             // 
@@ -300,7 +299,7 @@
             // 
             this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image")));
             this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem";
-            this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.메일양식ToolStripMenuItem.Text = "메일 양식";
             this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click);
             // 
@@ -346,21 +345,21 @@
             // 목록ToolStripMenuItem
             // 
             this.목록ToolStripMenuItem.Name = "목록ToolStripMenuItem";
-            this.목록ToolStripMenuItem.Size = new System.Drawing.Size(152, 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.Name = "구매진행현황ToolStripMenuItem";
-            this.구매진행현황ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.구매진행현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.구매진행현황ToolStripMenuItem.Text = "CR구매현황";
             this.구매진행현황ToolStripMenuItem.Click += new System.EventHandler(this.구매진행현황ToolStripMenuItem_Click);
             // 
             // layoutToolStripMenuItem
             // 
             this.layoutToolStripMenuItem.Name = "layoutToolStripMenuItem";
-            this.layoutToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+            this.layoutToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.layoutToolStripMenuItem.Text = "Layout";
             this.layoutToolStripMenuItem.Click += new System.EventHandler(this.layoutToolStripMenuItem_Click);
             // 
@@ -390,6 +389,13 @@
             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";
@@ -427,22 +433,24 @@
             // 관리ToolStripMenuItem
             // 
             this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem";
-            this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 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.Name = "재고현황ToolStripMenuItem";
-            this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
+            this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.재고현황ToolStripMenuItem.Text = "재고 현황";
             this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click);
             // 
             // pMP현황ToolStripMenuItem
             // 
+            this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
             this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem";
-            this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
+            this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.pMP현황ToolStripMenuItem.Text = "PMP 현황";
+            this.pMP현황ToolStripMenuItem.Visible = false;
             this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click);
             // 
             // mn_eq
@@ -543,39 +551,39 @@
             // 메모장ToolStripMenuItem
             // 
             this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
-            this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.메모장ToolStripMenuItem.Text = "메모장";
             this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6);
             // 
             // 패치내역ToolStripMenuItem1
             // 
             this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
-            this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24);
+            this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
             this.패치내역ToolStripMenuItem1.Text = "패치 내역";
             this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click);
             // 
             // 메일내역ToolStripMenuItem
             // 
             this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem";
-            this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.메일내역ToolStripMenuItem.Text = "메일 내역";
             this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
             // 
             // minutesToolStripMenuItem
             // 
             this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
             this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
-            this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.minutesToolStripMenuItem.Text = "회의록";
             this.minutesToolStripMenuItem.Visible = false;
             this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -584,7 +592,7 @@
             // 
             this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
             this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
-            this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.requestITemToolStripMenuItem.Text = "견적요청";
             this.requestITemToolStripMenuItem.Visible = false;
             this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -593,7 +601,7 @@
             // 
             this.freeBoardToolStripMenuItem.Enabled = false;
             this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
-            this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.freeBoardToolStripMenuItem.Text = "Free Board";
             this.freeBoardToolStripMenuItem.Visible = false;
             // 
@@ -601,7 +609,7 @@
             // 
             this.bugReportToolStripMenuItem.Enabled = false;
             this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
-            this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.bugReportToolStripMenuItem.Text = "Bug Report";
             this.bugReportToolStripMenuItem.Visible = false;
             // 
@@ -609,7 +617,7 @@
             // 
             this.todoListToolStripMenuItem.Enabled = false;
             this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
-            this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.todoListToolStripMenuItem.Text = "Todo List";
             this.todoListToolStripMenuItem.Visible = false;
             this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -618,7 +626,7 @@
             // 
             this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
             this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
-            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
+            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.메일전송ToolStripMenuItem.Text = "메일전송";
             this.메일전송ToolStripMenuItem.Visible = false;
             this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click);
@@ -627,7 +635,7 @@
             // 
             this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red;
             this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24);
             this.toolStripMenuItem5.Text = "(test)휴가등록";
             this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
             // 
@@ -814,7 +822,6 @@
             this.toolStripMenuItem8,
             this.toolStripMenuItem7,
             this.toolStripMenuItem6,
-            this.toolStripButton4,
             this.toolStripButton1,
             this.toolStripButton2});
             this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
@@ -853,17 +860,6 @@
             this.toolStripMenuItem6.ToolTipText = "프로젝트";
             this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
             // 
-            // toolStripButton4
-            // 
-            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(26, 20);
-            this.toolStripButton4.Text = "PMP 자료 보기(베타)";
-            this.toolStripButton4.ToolTipText = "PMP 자료 보기(베타)";
-            this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click_1);
-            // 
             // toolStripButton1
             // 
             this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -885,13 +881,6 @@
             this.toolStripButton2.Text = "품목정보";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
             // 
-            // 양식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);
-            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -991,7 +980,6 @@
         private System.Windows.Forms.ToolStripMenuItem 메모장ToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
         private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.ToolStripButton toolStripButton4;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8;

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">
@@ -305,26 +325,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">
@@ -369,58 +369,42 @@
         I24MzllgRwQRDTUk6KATIcIIGAUboLCQ5I0FBDk2GNDjYMieggEu/Cgh4AsCA2WeMMFDhkvBAxeaBPmR
         BcEEKykUKIjyoCAEHBzqyABwxQsGB2hsKCBQcAASM0BcTGHhpEKRG2sokCjI54ULNlLCzDhToEKLPBRC
         FDQRoA+IDAJU0JjQWI2cDgY9DBigRMgWBj2WiJEDh2PBNiew7GDwIEYcjggL8hhDgAruiB1/CwwIADs=
-</value>
-  </data>
-  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB
-        QwoXhVCNrK1o6oJog+iDkJrIvjRloJQUgTUGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z
-        nnPO1P9OzlC+r4aal9+iPHbaUL+nDfXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn
-        W7djMXAWpZt+lEcCKIf2YCXSip9zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss
-        yDWpGZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg
-        fjmtH/v7OCrvPY0FvJmyyUywPbxTg60nHTA/ejXoW8aLBy+7EUq1YfTDELbF/jmBhvFmyl5ltpLdMLOn
-        sCLgmRdd8M3tRsfjFux/1IzouxC2TrgLGBUzLd26hOqNlgazgIufe3A7vQ+dLvBkPIC+8QTiyU84dGXW
-        WcCcGVU1dlUbxpspm8wEHxDg4emj6LuXwGQyi6nkAu4/zToLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv
-        JCnguHWwf/Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/LBdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw
-        xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm
-        03y0YetGqb83SfRBW2HAggAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Uu91FNaTxHdIgohQXuL
+        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
-        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
+        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
-        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
+        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
-        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
+        CoUQDAbR19cHr9f7hEulUqBnZmYG09PT0Et3US3ehvHdQ7xeEBBM2fF08Bau207jStsp9m+hUMDOzg4E
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        AylwrL6+HjU1NV9kah8k16VXBD6fj06aZqZ50d7ezrq2tLSgsbERdXV1LLtGo8kz4U+QtRjp1+1267q6
-        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
+        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
-        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
+        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
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        vvUZmBmoY8pj4FyXnpBbz+n2aj5z6Jh01XC2MQ9TfurXydhD9Royn+6XlKEjZYp7HVvT76++qpVtN+2U
+        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
-        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
+        +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
-        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
+        flV0onkbF4ZqCB7ewnj9C4zVZeGvzeKEIYthXSbeg8/jkTJwaTMYMm5n1CbRWZ2dmEgeknWVpf01FzQR
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FPJ0000/FPJ0000.csproj

@@ -172,11 +172,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>dsPRJ.xsd</DependentUpon>
     </Compile>
-    <Compile Include="dsPRJ_Bak.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>dsPRJ_Bak.xsd</DependentUpon>
-    </Compile>
     <Compile Include="dsPurchase.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -757,17 +752,6 @@
     <None Include="dsPRJ.xss">
       <DependentUpon>dsPRJ.xsd</DependentUpon>
     </None>
-    <None Include="dsPRJ_Bak.xsc">
-      <DependentUpon>dsPRJ_Bak.xsd</DependentUpon>
-    </None>
-    <None Include="dsPRJ_Bak.xsd">
-      <SubType>Designer</SubType>
-      <Generator>MSDataSetGenerator</Generator>
-      <LastGenOutput>dsPRJ_Bak.Designer.cs</LastGenOutput>
-    </None>
-    <None Include="dsPRJ_Bak.xss">
-      <DependentUpon>dsPRJ_Bak.xsd</DependentUpon>
-    </None>
     <None Include="dsPurchase.xsc">
       <DependentUpon>dsPurchase.xsd</DependentUpon>
     </None>

SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs

@@ -798,6 +798,7 @@
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F;
             numberCellType3.MaximumValue = 999999999999999D;
             numberCellType3.MinimumValue = -999999999999999D;
+            numberCellType3.NullDisplay = "--";
             this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot";
             this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red;
@@ -815,7 +816,7 @@
             dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
             dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
             dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2021, 7, 23, 22, 53, 4, 0);
+            dateTimeCellType1.TimeDefault = new System.DateTime(2021, 7, 28, 22, 53, 4, 0);
             this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -826,7 +827,7 @@
             dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
             dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
             dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType2.TimeDefault = new System.DateTime(2021, 7, 23, 22, 53, 4, 0);
+            dateTimeCellType2.TimeDefault = new System.DateTime(2021, 7, 28, 22, 53, 4, 0);
             this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;

SubProject/FPJ0000/JobReport_/fJobReport.resx

@@ -260,20 +260,20 @@
   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC
+        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
-        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
+        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
-        LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII=
+        TiAQCH4BkPChBKRJ4EwAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -402,14 +402,15 @@ namespace FPJ0000.JobReport_
                     return;
                 }
 
-                dr.ot = ot;
                 if(ot == 0)
                 {
+                    dr.SetotNull();
                     dr.SetotStartNull();
                     dr.SetotEndNull();
                 }
                 else
                 {
+                    dr.ot = ot;
                     dr.otStart = dateTimePicker1.Value;
                     dr.otEnd = dateTimePicker2.Value;
                 }
@@ -417,7 +418,7 @@ namespace FPJ0000.JobReport_
             }
             else
             {
-                dr.ot = 0;
+                dr.SetotNull();
                 dr.SetotStartNull();
                 dr.SetotEndNull();
             }

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs

@@ -118,7 +118,7 @@ namespace FPJ0000.JobReport_
             dts.Value = DateTime.Parse(dr.pdate);   //일자선택
 
             this.checkBox1.Checked = !dr.edate.isEmpty();
-            if(this.checkBox1.Checked)  dte.Value = DateTime.Parse(dr.edate);
+            if (this.checkBox1.Checked) dte.Value = DateTime.Parse(dr.edate);
 
 
             cmbUser.SelectedValue = dr.uid;
@@ -372,6 +372,25 @@ namespace FPJ0000.JobReport_
             this.dr.tag = tbTag.Text.Trim();
             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
             else this.dr.hrs = 0;
+
+
+            //ot 시간을 초기화한다. -- 210728 김윤선
+            if (double.TryParse(tbOt.Text, out double ot))
+            {
+                if (ot == 0.0)
+                {
+                    this.dr.SetotNull();
+                }
+                else
+                {
+                    this.dr.ot = ot;
+                }
+            }
+            else
+            {
+                this.dr.SetotNull();
+            }
+
             if (tbOt.Text != "") this.dr.ot = double.Parse(tbOt.Text);
             else this.dr.ot = 0;
             //this.dr.description = richTextBox1.Text.Trim();

SubProject/FPJ0000/Project/fPartList.Designer.cs

@@ -107,7 +107,6 @@
             this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
-            this.pMP조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.bsPart = new System.Windows.Forms.BindingSource(this.components);
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
@@ -124,8 +123,6 @@
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.tbFind = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -140,8 +137,8 @@
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             pdateLabel = new System.Windows.Forms.Label();
             requestLabel = new System.Windows.Forms.Label();
             reqstaffLabel = new System.Windows.Forms.Label();
@@ -856,10 +853,9 @@
             this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.columnSizeToolStripMenuItem,
             this.toolStripMenuItem1,
-            this.pMP조회ToolStripMenuItem,
             this.exportListToolStripMenuItem});
             this.cm1.Name = "cm1";
-            this.cm1.Size = new System.Drawing.Size(243, 118);
+            this.cm1.Size = new System.Drawing.Size(243, 82);
             // 
             // columnSizeToolStripMenuItem
             // 
@@ -909,13 +905,6 @@
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
             this.toolStripMenuItem1.Size = new System.Drawing.Size(239, 6);
             // 
-            // pMP조회ToolStripMenuItem
-            // 
-            this.pMP조회ToolStripMenuItem.Name = "pMP조회ToolStripMenuItem";
-            this.pMP조회ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
-            this.pMP조회ToolStripMenuItem.Text = "PMP 조회";
-            this.pMP조회ToolStripMenuItem.Click += new System.EventHandler(this.pMP조회ToolStripMenuItem_Click);
-            // 
             // exportListToolStripMenuItem
             // 
             this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem";
@@ -951,8 +940,6 @@
             this.bindingNavigatorDeleteItem,
             this.toolStripButton2,
             this.toolStripSeparator4,
-            this.toolStripButton7,
-            this.toolStripSeparator1,
             this.toolStripLabel2,
             this.tbFind,
             this.toolStripSeparator3,
@@ -1025,7 +1012,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -1074,20 +1060,6 @@
             this.toolStripSeparator4.Name = "toolStripSeparator4";
             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27);
             // 
-            // 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(101, 24);
-            this.toolStripButton7.Text = "PMP검색(F5)";
-            this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 27);
-            // 
             // toolStripLabel2
             // 
             this.toolStripLabel2.Name = "toolStripLabel2";
@@ -1097,7 +1069,6 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 27);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -1179,6 +1150,7 @@
             this.tam.EETGW_JobReport_EBoardTableAdapter = null;
             this.tam.EETGW_NoteTableAdapter = null;
             this.tam.EETGW_ProjecthistoryDTableAdapter = null;
+            this.tam.EETGW_ProjectResonTableAdapter = null;
             this.tam.EETGW_ProjectsScheduleTableAdapter = null;
             this.tam.EETGW_ProjectToDoTableAdapter = null;
             this.tam.EETGW_SaveCostTableAdapter = null;
@@ -1384,6 +1356,7 @@
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "PMP";
             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Visible = false;
             numberCellType6.DecimalPlaces = 0;
             numberCellType6.NegativeRed = true;
             numberCellType6.NullDisplay = "--";
@@ -1535,7 +1508,6 @@
         private System.Windows.Forms.ToolStripButton toolStripButton2;
         private System.Windows.Forms.ContextMenuStrip cm1;
         private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripLabel toolStripLabel1;
         private System.Windows.Forms.ToolStripLabel lbSum;
         private FarPoint.Win.Spread.FpSpread fpSpread1;
@@ -1556,8 +1528,6 @@
         private System.Windows.Forms.RadioButton radSortGrp;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripButton toolStripButton5;
-        private System.Windows.Forms.ToolStripMenuItem pMP조회ToolStripMenuItem;
-        private System.Windows.Forms.ToolStripButton toolStripButton7;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
         private System.Windows.Forms.ToolTip toolTip1;
@@ -1578,7 +1548,7 @@
         private arCtl.arLabel prb5;
         private arCtl.arLabel prb4;
         private arCtl.arLabel prb3;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private arCtl.arLabel prb6;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FPJ0000/Project/fPartList.resx

@@ -374,42 +374,25 @@
         pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L
         fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+
         brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKgSURBVDhPvZLfT1JhHMbPuq6/oYtmmRdt2cZFXXThbbc1
-        N/Oiu+ZVm6aWBrOGRaghyjARNkBjwgkMSY/CWXL4YbhKR2wYKMigX/5KA48Q1tN5D2dLt9Zlz/bdu333
-        ft7nfb7vS/13Wa1WmEwmDA8PQ6fTXadCoRBIBQIBzM3NgWVZzM7OYnp6GpOTk3C5XHA4HLDZbLBYLOLe
-        crmMXC4HjUYTo4LBIA4ODlAqlf5Z+XweRqPx4+7uLpaXl6FWq9MqlaqJ4jhObGSzWczPzyOTyYD00uk0
-        vF4vkskkPB6PuIemacRiMfFGAlwnpaIon8+HcDhMrizz+/1wOp0yAo+NjclIDIPBICOwVquVCT0xv1Kp
-        rJZwimIYBtFoVJxBKpUSZ0CcCRyPx8G6tVjhWjH+zISlpSXiDoVCcVzCK5qYmEChUMDMzIzo7Ha7RWcn
-        bUOCaUhvJR1462ocHRkZgVwuh4T9kd1u71xYWEAikQCBibPQQzykw0Z8FOXCCt47r+Fd2I329vZfEnZU
-        ZrOZTBpDQ0MYGBiAQadElL6K4oYHxU992F59icj4TbTebv77AYclhDwWs1+xbn6gUczeB/foAn5s0Vg0
-        1eGJvP67tK0iIdeZp4L0ej2ZNHp7e2HUtCLNdqC0bgG/cgPcw/PYz7RhJzUFb9/ln0HVxRMSTlHCs3SS
-        tb+//1ZPT8+aWqVsXjTWvfkmDG5/rQV7ifpKJRuFKBpk/FoEVbVyESYaHBzsFL6l+FEikQimzB3IcH0o
-        fdGL7nvJBiFCrbjyqSbwn1/g1YPqr5yipkY6oqLu7m50dXUhoLm0w2+uorTNorguzGDdcaieo5yPIfd6
-        FOzdKoeEHhX3+Nwmo6jhj9ZZnrlXzTMdp3nmThXPtJ3ifS0nA78B2I8wkgDv+LoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        ++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
+        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
-        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
+        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
-        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
+        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
-        0Vsi2VWk1l5DbUcjipsqwZcEIJggKDmNUOkJVLVUcavYaAaLqw6EJqoZThBTzn/fPdSK1rEXqNUXcJLE
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        bbOWHcH/sLMrpO8SnMpTOt60Krf2engv1Fqd+0hii80bJ0VmdE5MrzusSqXKPbFMYWKJgtnLss3JwTZv
+        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
-        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
+        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
-        nnH5RegDAAAAAElFTkSuQmCC
+        nmgPM2D2AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -266,7 +266,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -389,7 +388,6 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 25);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -917,7 +915,6 @@
             // tbRequest
             // 
             this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbRequest.Name = "tbRequest";
             this.tbRequest.Size = new System.Drawing.Size(120, 25);
             this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;

SubProject/FPJ0000/Project/fProjectList.resx

@@ -230,34 +230,34 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF
-        SKESs3bThpqMigpL15TLXClrrcWwLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68
+        SKESs3bThpqMigpL15TLXClrrcX6Yrmlk6lpS1vSV/sy+7Ld2tzW2sronu4+O3S3/Kle8HBw7+d5ePPh
-        qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3r9ECdmJDDu6Pdc
+        Tf03RsdHtN8IwGB9D/3API73v4GWefVIHEvoG43qekcWF3ofRmB2hdH9IAwqmf6FXNXTtzkxI4FxR7/n
-        L3Xa2wKDRwf9qBYnXI3kZ53pGcSMhB73VzLvn78Cxn8Z5tmLoJCDYDh0aW7NAtNImMyzoSyeELIlGA5e
+        eqmT3hYYPDroR7Q45mokP+tMzyBmJPS4v5J5/9wlMP6LMM+cB4UcBMOBC7OrFpiGw2SeDWXxhJAtwbD/
-        8EkKqiwKVQWzC2Vdcqi7FRI/ZZ0Iil0ZwvE0NGenVwqqLKUqJV3CNY80oW2sGeXndpCgwMB4MFNgnwrB
+        nE9SUGVRqCqYHSjrkkPdrZD4Ket4UOzKEI6noTk9tVxQZSlVKekSrnm4CW2jzSg/s40EBQbGgpkC+2QI
-        PhmEcyaIt18S2NsxSQrUfaUqBb2d096txx5TOYpPFUDeugWD3hCsgibYvzd4/SmOilYvVMzOyjJazjU6
+        9okgnNNBvP2SwO6OCVKg7itVKeitnPZuPXaZylF8ogDy1k0Y9IZgFTTO/r3B609xVLR6oWK2V5bRcq7R
-        6yCjC7kiOm+b8fYi4qll2KZY4rXzX1JAtuA3sPGqsR6AsqcE1df34ajjMDbTG7iN9PqtwkZttg+IJZfh
+        WQcZXcgV0XlbjDcXEE8twTbJEq+d/5ICsgW/gY1XjXUflD0lqL66B4cdB7GRXsetp9duFjZqs31ALLkE
-        mGZxZyYjavgJi0Rq9WU1Vyuhd2txxF6DYrqAy2/KhAVaBt9h6dtPDPkyG9yf5Q/J+ZhFttRdSsjaC1Gk
+        xxSLW9MZUUNPWCRSKy+ruVwJvVuLQ/YaFNMFXH5TJizQMvgOi99+4o4vs8H9Gf6QnI9ZZEvdpYSsvRBF
-        z0P+8XUrYQHdjQVSMMwHhTApuMk/RDYvAjFojN4170B77SWifIHraZh43X6+QAjkalOH+7eYkdDAPEck
+        +jzkH12zHBbQXZsnBUN8UAiTguv8Q2TzIhCDxuhd9Q60V14iyhe4noaJ1+3nC4RArjZ0uH+LGQkNzHNE
-        8QNsLI3PkRQCbBLUboMHuZI13LOLGQnHzPPjtZ3+ZG3nHKrP+7D/zOq9/CMU9Qcl8yy8OMWX5wAAAABJ
+        Ej/AxtL4HEkhwCZB7TR4kCtZwz27mJFwxDw3VtvpT9Z2zqL6rA97T63cyz9CUX8AHwQsuvhZgxsAAAAA
-        RU5ErkJggg==
+        SUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
-        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
+        JB5MNF7ARIMJBw9UYoqACQaoS5BgFGQXlCKhNaSpgbaAUKS1ltLWaSmVqcCUmc7S6XSeX8soamLi8jIv
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        /82UOg4AAAAASUVORK5CYII=
+        j4Z0bAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FPJ0000/dsPRJ_Bak.Designer.cs

@@ -1,242 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     이 코드는 도구를 사용하여 생성되었습니다.
-//     런타임 버전:4.0.30319.42000
-//
-//     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
-//     이러한 변경 내용이 손실됩니다.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-#pragma warning disable 1591
-
-namespace FPJ0000 {
-    
-    
-    /// <summary>
-    ///Represents a strongly typed in-memory cache of data.
-    ///</summary>
-    [global::System.Serializable()]
-    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
-    [global::System.ComponentModel.ToolboxItem(true)]
-    [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedDataSetSchema")]
-    [global::System.Xml.Serialization.XmlRootAttribute("dsPRJ_Bak")]
-    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")]
-    public partial class dsPRJ_Bak : global::System.Data.DataSet {
-        
-        private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        public dsPRJ_Bak() {
-            this.BeginInit();
-            this.InitClass();
-            global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
-            base.Tables.CollectionChanged += schemaChangedHandler;
-            base.Relations.CollectionChanged += schemaChangedHandler;
-            this.EndInit();
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        protected dsPRJ_Bak(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
-                base(info, context, false) {
-            if ((this.IsBinarySerialized(info, context) == true)) {
-                this.InitVars(false);
-                global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
-                this.Tables.CollectionChanged += schemaChangedHandler1;
-                this.Relations.CollectionChanged += schemaChangedHandler1;
-                return;
-            }
-            string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string))));
-            if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
-                global::System.Data.DataSet ds = new global::System.Data.DataSet();
-                ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
-                this.DataSetName = ds.DataSetName;
-                this.Prefix = ds.Prefix;
-                this.Namespace = ds.Namespace;
-                this.Locale = ds.Locale;
-                this.CaseSensitive = ds.CaseSensitive;
-                this.EnforceConstraints = ds.EnforceConstraints;
-                this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add);
-                this.InitVars();
-            }
-            else {
-                this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
-            }
-            this.GetSerializationData(info, context);
-            global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
-            base.Tables.CollectionChanged += schemaChangedHandler;
-            this.Relations.CollectionChanged += schemaChangedHandler;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        [global::System.ComponentModel.BrowsableAttribute(true)]
-        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)]
-        public override global::System.Data.SchemaSerializationMode SchemaSerializationMode {
-            get {
-                return this._schemaSerializationMode;
-            }
-            set {
-                this._schemaSerializationMode = value;
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public new global::System.Data.DataTableCollection Tables {
-            get {
-                return base.Tables;
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
-        public new global::System.Data.DataRelationCollection Relations {
-            get {
-                return base.Relations;
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        protected override void InitializeDerivedDataSet() {
-            this.BeginInit();
-            this.InitClass();
-            this.EndInit();
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        public override global::System.Data.DataSet Clone() {
-            dsPRJ_Bak cln = ((dsPRJ_Bak)(base.Clone()));
-            cln.InitVars();
-            cln.SchemaSerializationMode = this.SchemaSerializationMode;
-            return cln;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        protected override bool ShouldSerializeTables() {
-            return false;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        protected override bool ShouldSerializeRelations() {
-            return false;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) {
-            if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
-                this.Reset();
-                global::System.Data.DataSet ds = new global::System.Data.DataSet();
-                ds.ReadXml(reader);
-                this.DataSetName = ds.DataSetName;
-                this.Prefix = ds.Prefix;
-                this.Namespace = ds.Namespace;
-                this.Locale = ds.Locale;
-                this.CaseSensitive = ds.CaseSensitive;
-                this.EnforceConstraints = ds.EnforceConstraints;
-                this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add);
-                this.InitVars();
-            }
-            else {
-                this.ReadXml(reader);
-                this.InitVars();
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() {
-            global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream();
-            this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null));
-            stream.Position = 0;
-            return global::System.Xml.Schema.XmlSchema.Read(new global::System.Xml.XmlTextReader(stream), null);
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        internal void InitVars() {
-            this.InitVars(true);
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        internal void InitVars(bool initTable) {
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        private void InitClass() {
-            this.DataSetName = "dsPRJ_Bak";
-            this.Prefix = "";
-            this.Namespace = "http://tempuri.org/dsPRJ_Bak.xsd";
-            this.EnforceConstraints = true;
-            this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
-            if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) {
-                this.InitVars();
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-        public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
-            dsPRJ_Bak ds = new dsPRJ_Bak();
-            global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
-            global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
-            global::System.Xml.Schema.XmlSchemaAny any = new global::System.Xml.Schema.XmlSchemaAny();
-            any.Namespace = ds.Namespace;
-            sequence.Items.Add(any);
-            type.Particle = sequence;
-            global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
-            if (xs.Contains(dsSchema.TargetNamespace)) {
-                global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
-                global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
-                try {
-                    global::System.Xml.Schema.XmlSchema schema = null;
-                    dsSchema.Write(s1);
-                    for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
-                        schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
-                        s2.SetLength(0);
-                        schema.Write(s2);
-                        if ((s1.Length == s2.Length)) {
-                            s1.Position = 0;
-                            s2.Position = 0;
-                            for (; ((s1.Position != s1.Length) 
-                                        && (s1.ReadByte() == s2.ReadByte())); ) {
-                                ;
-                            }
-                            if ((s1.Position == s1.Length)) {
-                                return type;
-                            }
-                        }
-                    }
-                }
-                finally {
-                    if ((s1 != null)) {
-                        s1.Close();
-                    }
-                    if ((s2 != null)) {
-                        s2.Close();
-                    }
-                }
-            }
-            xs.Add(dsSchema);
-            return type;
-        }
-    }
-}
-
-#pragma warning restore 1591

SubProject/FPJ0000/dsPRJ_Bak.xsc

@@ -1 +0,0 @@
-

SubProject/FPJ0000/dsPRJ_Bak.xsd

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-<xs:schema id="dsPRJ_Bak" 
-                  targetNamespace="http://tempuri.org/dsPRJ_Bak.xsd"
-                  elementFormDefault="qualified"
-                  attributeFormDefault="qualified"
-                  xmlns="http://tempuri.org/dsPRJ_Bak.xsd"
-                  xmlns:mstns="http://tempuri.org/dsPRJ_Bak.xsd"
-                  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                  xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
-                  xmlns:msprop="urn:schemas-microsoft-com:xml-msprop">
-    <xs:element name="dsPRJ_Bak" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true">
-        <xs:complexType>
-            <xs:choice minOccurs="0" maxOccurs="unbounded"></xs:choice>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>

SubProject/FPJ0000/dsPRJ_Bak.xss

@@ -1 +0,0 @@
-

SubProject/FPJ0000/dsReport.Designer.cs

@@ -3370,11 +3370,11 @@ namespace FPJ0000 {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public double hrs {
                 get {
-                    try {
+                    if (this.IshrsNull()) {
-                        return ((double)(this[this.tablejobReport.hrsColumn]));
+                        return 0D;
                     }
-                    catch (global::System.InvalidCastException e) {
+                    else {
-                        throw new global::System.Data.StrongTypingException("\'jobReport\' 테이블의 \'hrs\' 열의 값이 DBNull입니다.", e);
+                        return ((double)(this[this.tablejobReport.hrsColumn]));
                     }
                 }
                 set {
@@ -3386,11 +3386,11 @@ namespace FPJ0000 {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public double ot {
                 get {
-                    try {
+                    if (this.IsotNull()) {
-                        return ((double)(this[this.tablejobReport.otColumn]));
+                        return 0D;
                     }
-                    catch (global::System.InvalidCastException e) {
+                    else {
-                        throw new global::System.Data.StrongTypingException("\'jobReport\' 테이블의 \'ot\' 열의 값이 DBNull입니다.", e);
+                        return ((double)(this[this.tablejobReport.otColumn]));
                     }
                 }
                 set {
@@ -3559,11 +3559,11 @@ namespace FPJ0000 {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public double hrs {
                 get {
-                    try {
+                    if (this.IshrsNull()) {
-                        return ((double)(this[this.tableJobReportDay.hrsColumn]));
+                        return 0D;
                     }
-                    catch (global::System.InvalidCastException e) {
+                    else {
-                        throw new global::System.Data.StrongTypingException("\'JobReportDay\' 테이블의 \'hrs\' 열의 값이 DBNull입니다.", e);
+                        return ((double)(this[this.tableJobReportDay.hrsColumn]));
                     }
                 }
                 set {
@@ -3575,11 +3575,11 @@ namespace FPJ0000 {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public double ot {
                 get {
-                    try {
+                    if (this.IsotNull()) {
-                        return ((double)(this[this.tableJobReportDay.otColumn]));
+                        return 0D;
                     }
-                    catch (global::System.InvalidCastException e) {
+                    else {
-                        throw new global::System.Data.StrongTypingException("\'JobReportDay\' 테이블의 \'ot\' 열의 값이 DBNull입니다.", e);
+                        return ((double)(this[this.tableJobReportDay.otColumn]));
                     }
                 }
                 set {

SubProject/FPJ0000/dsReport.xsd

@@ -273,10 +273,10 @@ ORDER BY pdate</CommandText>
   <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
+        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm" minOccurs="0">
+              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="22" />
@@ -284,7 +284,7 @@ ORDER BY pdate</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columntotal" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_UserColumnName="total" type="xs:int" minOccurs="0" />
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
+              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -298,8 +298,8 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
+              <xs:element name="hrs" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
-              <xs:element name="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
+              <xs:element name="ot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
               <xs:element name="UserProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="UserProcess" msprop:Generator_ColumnVarNameInTable="columnUserProcess" msprop:Generator_ColumnPropNameInTable="UserProcessColumn" msprop:Generator_UserColumnName="UserProcess" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -307,11 +307,11 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInRow="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
+              <xs:element name="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
+        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -335,8 +335,8 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="hrs" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
+              <xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
-              <xs:element name="ot" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
+              <xs:element name="ot" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
               <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -347,7 +347,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
+        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -360,7 +360,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
+        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -387,7 +387,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
+        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
@@ -399,7 +399,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
+        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -429,7 +429,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
+        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -536,7 +536,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_RowClassName="K5DailyFormRow">
+        <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_UserColumnName="Grp" type="xs:string" />

SubProject/FPJ0000/dsReport.xss

@@ -6,14 +6,14 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
+    <Shape ID="DesignTable:jobReport" ZOrder="3" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:JobReportDay" ZOrder="8" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
+    <Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
-    <Shape ID="DesignTable:ProcessList" ZOrder="7" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ProcessList" ZOrder="8" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ProcessUserList" ZOrder="6" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
+    <Shape ID="DesignTable:ProcessUserList" ZOrder="7" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
-    <Shape ID="DesignTable:HolidayLIst" ZOrder="4" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:HolidayLIst" ZOrder="5" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:vJobReportForUser" ZOrder="3" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PartSummary" ZOrder="5" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:PartSummary" ZOrder="6" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:K5DailyForm" ZOrder="2" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
+    <Shape ID="DesignTable:K5DailyForm" ZOrder="4" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
   </Shapes>
   <Connectors />
 </DiagramLayout>