diff --git a/.gitignore b/.gitignore index 5efc0ad..6eef48d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ bin obj *.suo +/.vs/EETGW/v15/Server/sqlite3 +/packages diff --git a/Project/History.txt b/Project/History.txt index 14518b9..63220eb 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,6 @@ -200618 chi 사용자 정보 변경 기능 수정 (저장에서 오류가 있었음) +200812 chi 1일최대근무시간 8시간 적용 +200730 chi 파트리스트에 입력되는 단가 자릿수 증가 +200618 chi 사용자 정보 변경 기능 수정 (저장에서 오류가 있었음) 200519 chi 업무일지 그림 넣기 가능하게 200512 chi 구매내역 엑셀 반입 기능 추가 200106 chi 구매내역목록에서 정렬 기능 추가 (등록일,완료일,S/C) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d1363f6..cf70734 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("20.06.16.1730")] -[assembly: AssemblyFileVersion("20.06.16.1730")] +[assembly: AssemblyVersion("20.08.12.0800")] +[assembly: AssemblyFileVersion("20.08.12.0800")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 6f1db92..20cf685 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -66,6 +66,7 @@ this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); 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(); @@ -73,7 +74,6 @@ this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.메일내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.requestITemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -289,6 +289,7 @@ this.mn_dailyhistory, this.mn_jago, this.mn_eq, + this.휴가관리ToolStripMenuItem, this.personalInventoryToolStripMenuItem, this.메일전송ToolStripMenuItem1}); this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image"))); @@ -300,7 +301,7 @@ // this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image"))); this.mn_purchase.Name = "mn_purchase"; - this.mn_purchase.Size = new System.Drawing.Size(162, 24); + this.mn_purchase.Size = new System.Drawing.Size(208, 24); this.mn_purchase.Text = "구매신청"; this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); // @@ -308,7 +309,7 @@ // this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image"))); this.mn_project.Name = "mn_project"; - this.mn_project.Size = new System.Drawing.Size(162, 24); + this.mn_project.Size = new System.Drawing.Size(208, 24); this.mn_project.Text = "프로젝트"; this.mn_project.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click); // @@ -316,7 +317,7 @@ // this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image"))); this.mn_dailyhistory.Name = "mn_dailyhistory"; - this.mn_dailyhistory.Size = new System.Drawing.Size(162, 24); + this.mn_dailyhistory.Size = new System.Drawing.Size(208, 24); this.mn_dailyhistory.Text = "업무일지"; this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click); // @@ -328,7 +329,7 @@ this.pMP현황ToolStripMenuItem}); this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image"))); this.mn_jago.Name = "mn_jago"; - this.mn_jago.Size = new System.Drawing.Size(162, 24); + this.mn_jago.Size = new System.Drawing.Size(208, 24); this.mn_jago.Text = "품목재고"; this.mn_jago.Click += new System.EventHandler(this.재고관리ToolStripMenuItem_Click); // @@ -363,7 +364,7 @@ this.라인코드관리ToolStripMenuItem}); this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image"))); this.mn_eq.Name = "mn_eq"; - this.mn_eq.Size = new System.Drawing.Size(162, 24); + this.mn_eq.Size = new System.Drawing.Size(208, 24); this.mn_eq.Text = "장비 목록"; // // dataFOLToolStripMenuItem @@ -399,21 +400,32 @@ this.라인코드관리ToolStripMenuItem.Text = "라인코드관리"; this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click); // + // 휴가관리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.Click += new System.EventHandler(this.휴가관리ToolStripMenuItem_Click); + // // personalInventoryToolStripMenuItem // - this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; + this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato; + this.personalInventoryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("personalInventoryToolStripMenuItem.Image"))); this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; - this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(162, 24); - this.personalInventoryToolStripMenuItem.Text = "개인별 물품"; + this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(208, 24); + this.personalInventoryToolStripMenuItem.Text = "개인별 물품(테스트"; this.personalInventoryToolStripMenuItem.Visible = false; this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); // // 메일전송ToolStripMenuItem1 // + this.메일전송ToolStripMenuItem1.ForeColor = System.Drawing.Color.Tomato; this.메일전송ToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem1.Image"))); this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1"; - this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(162, 24); - this.메일전송ToolStripMenuItem1.Text = "메일자동발신"; + this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(208, 24); + this.메일전송ToolStripMenuItem1.Text = "메일자동발신(테스트"; this.메일전송ToolStripMenuItem1.Click += new System.EventHandler(this.메일전송ToolStripMenuItem1_Click); // // mn_docu @@ -423,7 +435,6 @@ this.toolStripMenuItem4, this.패치내역ToolStripMenuItem1, this.메일내역ToolStripMenuItem, - this.holidayToolStripMenuItem, this.toolStripMenuItem3, this.minutesToolStripMenuItem, this.requestITemToolStripMenuItem, @@ -463,14 +474,6 @@ this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // - // holidayToolStripMenuItem - // - this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black; - this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem"; - this.holidayToolStripMenuItem.Size = new System.Drawing.Size(165, 24); - this.holidayToolStripMenuItem.Text = "휴가 내역"; - this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click); - // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; @@ -802,7 +805,6 @@ private System.Windows.Forms.ToolStripMenuItem personalInventoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem holidayToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem requestITemToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mn_purchase; private System.Windows.Forms.ToolStripMenuItem btDev; @@ -851,6 +853,7 @@ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8; + private System.Windows.Forms.ToolStripMenuItem 휴가관리ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index ed9e067..28c67ae 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -979,5 +979,12 @@ namespace Project if (!ShowForm(formkey)) AddForm(formkey, new FPM0000.fSPMaster()); } + + private void 휴가관리ToolStripMenuItem_Click(object sender, EventArgs e) + { + string formkey = "HOLYDAY"; + if (!ShowForm(formkey)) + AddForm(formkey, new FBS0000.fHolyday()); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index a503095..12bf889 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -153,26 +153,6 @@ Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw== - - - - - R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL - XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo - oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE - TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh - AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw== - - - - - R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1 - /lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY - gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi - SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG - CyQdKlaIsLHjggEBADs= @@ -244,6 +224,40 @@ AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL hQnTql2rNiAAOw== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAALrSURBVDhPbZLZU9NXGIb5V3rn2FuttiJCUVtxuanI + AGFJ2EQWl1GMIERASkQnhCQQQogRDSEhLHEERRmlUBKWH0sSI+DODxEdtcNF9danBzrOqOHiPVfnfd7z + fe+JAqIOFl/98UCRbW5/kc23v9BGQmEr+wqEjln5Xei3/Bb2HrWwJ6+Z+GwjMWkXX6z51rR+CHODMH9W + mwdRVXWhrOwi84KHDI2HdE0naRUuFOddiHvE55qJVmiF7SuAMM+qzfe461tg/sVb5p6/Ye7ZCuGnyzx8 + 8orgwhKBeZnXb96zurrK5pik7wCFrYvtI4850dBPhkhOr3CvS1HuIlUkp5R1kHzOuT5WXHZTJCChoFV2 + jz+n8X6Yu+EVbgdX6A8sc2vmFV5pie6JRdxjL7k29ISEgpZIgFiW7PQ9paTDj3XoMcY7QXReibqeSWo9 + 41R7JGq9QayDC2KplkiA2LTsECOccgxjGgix/M8nlj58RBZafP+Rl+/+ReOWaBqYE41sABA1yfaheY7b + 76PvD6Ptlqh0jVHe7qe0bZSSNh9lHRL6vrCoszkSIDqWrYOPyG8ZoO5WmNreEFXdAco7Z1E7pzntkDjj + mKLuZkj8BXMkYE+eRW66EyLH0Ed1TxCNZ5ZS1zQl7RInr09SdHWcIvs4f/YE2J2zQQu7c5tlQ1+AzMu9 + nHfPcNY5xekbEsXXJjhmGyO3xc9Rq58qAf01uzESEJ9jlnXeGVJrOsVT/08tEKlrpiyLj3TTCErTqNjJ + FHFZpkiA+ByytksiqcJJsX2C/LVUix+l+W8UhhGS64dJ1Q2jbpskVrUBIDarSa5xT3JYfYM88VxV8+h6 + aop+mCNX/uKPSw9I1A5xxjbBLpWRTdGJ8jeAXapGucYzxaXeIFpviJruIJWdATQds5Q5ZkSV05y1i9Es + Y8Qojfyw5VDbN4AYpal1Z6aJ6EwjOzIM/JJu4Oe0Bran6dmu0LMttZ6fUurZmqJja7Lu5hczEPUfnqi7 + iiOVMjYAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHuSURBVDhPfZJbbxJRFIXPn+irpv+CZOIv88XamD7W + Ng1t41trNHINhHsgAYFwC4SrzAyIIwEBMWkTdKZyyfLsQxw7HezDeph99vrW3mcO63Q6aLfbaDabaDQa + qNfrqNVqqFarqFQqewDYY2KtVgubzcam0WgkIMVi8VEIo2QyDIdDkaxpmgmhGp8CuVzuvxBGI1MzpVGh + XC5XF4sFVquVqBOwUCggnU7vhDBK/dvIzb/5yEPDMPD92y/k4zNxNhgMkM1mkUqlbBBGydREWq/XIPOP + mYHzQxUnzxXkYltIv9+nKRCPxy0QxnfU5/O5aFoulyLZ+VLF1fEA7840XBz2TIiqqjQFwuGwCWGlUukZ + 31GfzbZNcuNGJF+ffMGHi682iKIoNAUCgYCACEo+n5f4jvp0OhVNvfYtnAcK3p7+gzgPVHyMbM+73S5N + AZ/Pt2fukslkJL6jPplMbJD3Tg1vjvq4PPrE/85aTBGNRuHxeJ6aABLfT0omk/p4PDYhZy9kXL7q4fq0 + h58L4755nzwWACmRSEixWEynl0gQtXWDq9efcWesTLPb7RZmkg1AikQiUigU0uklEoREZl63mEkW430F + g0EHv2mdHpgsyzvNJMvHQ/n9fofX69XJ7HK5bGaSrfBQPNXBzU92nQFgfwCJli/+LKS33wAAAABJRU5E + rkJggg== @@ -282,6 +296,26 @@ JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA Ow== + + + + + R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL + XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo + oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE + TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh + AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw== + + + + + R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1 + /lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY + gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi + SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG + CyQdKlaIsLHjggEBADs= @@ -332,16 +366,16 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFC - QwoXhVCNrK1o6oJoA+mDkJrIvjRlkJQUgXUZSAi9R1FrRvu2INjUEdu8210vp+f87pUlKvTAw/1w73nO - 85xzrvrfyhjK99VQ8/LMS9ufDPVb+o/7evOSj8fShsoRkOs5hsXgWSwNnMdy2A95B/ez9SVs3oUGlc02 - b8di4AwKN/wojgRQDO3BSqQZP2f7UQluMiCzRcVShrJyp7tQiPThx9VWWFEP7JFdqI05/Ss5APvaBgMy - DWpaVqst9Z9D8XYA5fAO1FygPbUX1acdqLw8Djs7itKbxrUDyEzw8uAFlCaCqN7yOMBECyrPjsBKdcP6 - ckq3/X0cpXee+gDezLXJTLA9vFODq4/bYH3watC3lBf3X3QilGzB6PtBbIv9cwIF481ce5W5anbCSp/E - ioCnn3fAN7sbbY+asP9hI6JvQ9g64Q6gVfS0cPMiyteb6swCzn/uxtDcPrS7wBPxAHrHE4ibH3Ho8owz - gD7TqnLsihaMN3NtMhN8QICH7x1F750EJs00pswF3H2SdgYIu48hoc+0iuxaMHdtMhMcjic1MDr5Gj0R - U8CJ6sG+mVcUb54JY0joM62i2hSMN3NtMhPsH57TwPZLD1r16izZIM94MmH6dvGZ7FSbgvFmrk1mgl1Y - vWSAzWwznnp9CQkH0CrNLoKRnWuvYV4t3s8fg9nW8ZSEMST0mVZRbUewDdhZtE+20D8Gs814MmEMCX2m - 0mwt2LpS6i/8SvUc1lO/igAAAABJRU5ErkJggg== + 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== diff --git a/Sub/AmkorRestfulService b/Sub/AmkorRestfulService new file mode 160000 index 0000000..469d805 --- /dev/null +++ b/Sub/AmkorRestfulService @@ -0,0 +1 @@ +Subproject commit 469d805524bb163c0a2c986925d128c5acba40df diff --git a/Sub/YARTE/formSetting/fBase.xml b/Sub/YARTE/formSetting/fBase.xml new file mode 100644 index 0000000..1c127b4 --- /dev/null +++ b/Sub/YARTE/formSetting/fBase.xml @@ -0,0 +1,3 @@ + + + diff --git a/Sub/arCtl b/Sub/arCtl new file mode 160000 index 0000000..36f0d54 --- /dev/null +++ b/Sub/arCtl @@ -0,0 +1 @@ +Subproject commit 36f0d54728673b8f65853c8f9b7b0b6c119311d5 diff --git a/Sub/arftp b/Sub/arftp new file mode 160000 index 0000000..feb1fc6 --- /dev/null +++ b/Sub/arftp @@ -0,0 +1 @@ +Subproject commit feb1fc67fab758c023c9bc6e8c65fb40e0977fee diff --git a/Sub/desktop.ini b/Sub/desktop.ini new file mode 100644 index 0000000..abf4107 --- /dev/null +++ b/Sub/desktop.ini @@ -0,0 +1,6 @@ +[.ShellClassInfo] +IconResource=C:\WINDOWS\System32\SHELL32.dll,27 +[ViewState] +Mode= +Vid= +FolderType=Generic diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index 50e2146..d8f3efb 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -32,9 +32,26 @@ 4 + + False + ..\..\Sub\arCtl\bin\debug\arControl.Net4.dll + ..\..\DLL\ArSetting.Net4.dll + + + + + + + + + + + + + ..\..\DLL\libxl.net.dll @@ -56,6 +73,7 @@ True + @@ -71,6 +89,7 @@ False True + @@ -78,6 +97,18 @@ True dsMSSQL.xsd + + Form + + + WorkTable.cs + + + Form + + + fHolydayJobReport.cs + Form @@ -104,6 +135,12 @@ + + WorkTable.cs + + + fHolydayJobReport.cs + fHolyday.cs @@ -116,6 +153,7 @@ fHolyday_Add.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/SubProject/FBS0000/Holiday/WorkTable.Designer.cs b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs new file mode 100644 index 0000000..f056cd3 --- /dev/null +++ b/SubProject/FBS0000/Holiday/WorkTable.Designer.cs @@ -0,0 +1,472 @@ +namespace FBS0000 +{ + partial class WorkTable + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WorkTable)); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.sbUse = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.sbGen = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); + this.sbJan = new System.Windows.Forms.ToolStripLabel(); + this.dsMSSQL = new FBS0000.dsMSSQL(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.autoResizeComlumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbSD = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + this.cm1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.ImageScalingSize = new System.Drawing.Size(20, 20); + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.toolStripLabel7, + this.sbUse, + this.toolStripLabel5, + this.sbGen, + this.toolStripLabel8, + this.sbJan}); + this.bn.Location = new System.Drawing.Point(0, 531); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(984, 27); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 24); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 27); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 27); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 27); + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(31, 24); + this.toolStripLabel7.Text = "사용"; + // + // sbUse + // + this.sbUse.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.sbUse.Name = "sbUse"; + this.sbUse.Size = new System.Drawing.Size(19, 24); + this.sbUse.Text = "0"; + // + // toolStripLabel5 + // + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(31, 24); + this.toolStripLabel5.Text = "발생"; + // + // sbGen + // + this.sbGen.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.sbGen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.sbGen.Name = "sbGen"; + this.sbGen.Size = new System.Drawing.Size(19, 24); + this.sbGen.Text = "0"; + // + // toolStripLabel8 + // + this.toolStripLabel8.Name = "toolStripLabel8"; + this.toolStripLabel8.Size = new System.Drawing.Size(31, 24); + this.toolStripLabel8.Text = "잔량"; + // + // sbJan + // + this.sbJan.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.sbJan.Name = "sbJan"; + this.sbJan.Size = new System.Drawing.Size(19, 24); + this.sbJan.Text = "0"; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // cm1 + // + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.sendToMailToolStripMenuItem, + this.toolStripMenuItem1, + this.autoResizeComlumnsToolStripMenuItem}); + this.cm1.Name = "contextMenuStrip1"; + this.cm1.Size = new System.Drawing.Size(201, 54); + // + // sendToMailToolStripMenuItem + // + this.sendToMailToolStripMenuItem.Name = "sendToMailToolStripMenuItem"; + this.sendToMailToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.sendToMailToolStripMenuItem.Text = "Mail (Preview)"; + this.sendToMailToolStripMenuItem.Click += new System.EventHandler(this.sendToMailToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(197, 6); + // + // autoResizeComlumnsToolStripMenuItem + // + this.autoResizeComlumnsToolStripMenuItem.Name = "autoResizeComlumnsToolStripMenuItem"; + this.autoResizeComlumnsToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.autoResizeComlumnsToolStripMenuItem.Text = "Auto Resize Comlumns"; + this.autoResizeComlumnsToolStripMenuItem.Click += new System.EventHandler(this.autoResizeComlumnsToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel1, + this.tbSD, + this.toolStripLabel2, + this.tbED, + this.toolStripButton1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(984, 31); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel1.Text = "기간"; + // + // tbSD + // + this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbSD.Name = "tbSD"; + this.tbSD.Size = new System.Drawing.Size(100, 31); + this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbSD.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(15, 28); + this.toolStripLabel2.Text = "~"; + // + // tbED + // + this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbED.Name = "tbED"; + this.tbED.Size = new System.Drawing.Size(100, 31); + this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); + // + // toolStripButton1 + // + this.toolStripButton1.Image = global::FBS0000.Properties.Resources.action_refresh; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(74, 28); + this.toolStripButton1.Text = "검색(&R)"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.Location = new System.Drawing.Point(0, 31); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(984, 500); + this.fpSpread1.TabIndex = 4; + // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 9; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "일자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "요일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "사번"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "성명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "사용(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "사용(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "내용"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "발생(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "발생(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2020, 9, 3, 10, 46, 20, 866); + this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "일자"; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(1).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "요일"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "uid"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "사번"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "UserName"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "성명"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "term"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "사용(일)"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "CrTime"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(H)"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "contents"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "내용"; + this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "termDr"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "발생(일)"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "DrTime"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "발생(H)"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // + // bs + // + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // WorkTable + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(984, 558); + this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.Name = "WorkTable"; + this.Text = "출근부"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + this.cm1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private dsMSSQL dsMSSQL; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripTextBox tbSD; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripTextBox tbED; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ContextMenuStrip cm1; + private System.Windows.Forms.ToolStripMenuItem autoResizeComlumnsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem sendToMailToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripLabel sbUse; + private System.Windows.Forms.ToolStripLabel toolStripLabel5; + private System.Windows.Forms.ToolStripLabel sbGen; + private System.Windows.Forms.ToolStripLabel toolStripLabel8; + private System.Windows.Forms.ToolStripLabel sbJan; + private FarPoint.Win.Spread.FpSpread fpSpread1; + private System.Windows.Forms.BindingSource bs; + private dsMSSQLTableAdapters.HolydayTableAdapter ta; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + } +} \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/WorkTable.cs b/SubProject/FBS0000/Holiday/WorkTable.cs new file mode 100644 index 0000000..e05b52d --- /dev/null +++ b/SubProject/FBS0000/Holiday/WorkTable.cs @@ -0,0 +1,267 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using NetOffice; +using Outlook = NetOffice.OutlookApi; +using NetOffice.OutlookApi.Enums; + +namespace FBS0000 +{ + public partial class WorkTable : FCOMMON.fBase + { + public WorkTable(string sd,string ed ) + { + InitializeComponent(); + this.dsMSSQL.vHoliday_uselist.TableNewRow += Holyday_TableNewRow; + tbSD.Text = sd; + tbED.Text = ed; + //this.dv1.CellFormatting += dv1_CellFormatting; + } + + void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) + { + //if (e.RowIndex < 0 || e.ColumnIndex < 0) return; + //var col = this.dv1.Columns[e.ColumnIndex]; + //var cate = dv1.Rows[e.RowIndex].Cells["dvc_cate"].Value.ToString(); + //if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray; + //else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black; + } + + private void __Load(object sender, EventArgs e) + { + + tbSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01"; + tbED.Text = DateTime.Now.AddDays(10).ToShortDateString(); + + //var userlist = FCOMMON.DBM.getUserTable(); + //dvc_user.DataSource = userlist; + //dvc_user.ValueMember = "Key"; + //dvc_user.DisplayMember = "Value"; + + //var cateList = FCOMMON.DBM.getCodeTable("02"); + //this.dvc_cate.DataSource = cateList; + //dvc_cate.ValueMember = "Key"; + //dvc_cate.DisplayMember = "Value"; + + //var rrltList = FCOMMON.DBM.getCodeTable("03"); + //this.dvc_result.DataSource = rrltList; + //dvc_result.ValueMember = "Key"; + //dvc_result.DisplayMember = "Value"; + + //udpate user list + var userList = FCOMMON.DBM.getUserList(); + this.cmbUser.Items.Clear(); + this.cmbUser.Items.Add("-- ALL --"); + int curuserindex = -1; + foreach (var user in userList) + { + this.cmbUser.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value)); + if (user.Key == FCOMMON.info.Login.no) curuserindex = cmbUser.Items.Count - 1; + } + this.cmbUser.SelectedIndex = curuserindex; + + //일반사용자의경우에는 상태를 변경하지 못한다. + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); + if (curLevel >= 5) + { + //권한이 잇으므로 모든 사용자로 한다. + } + else + { + this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. + } + + RefreshData(); + } + + void Holyday_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + e.Row["wuid"] = FCOMMON.info.Login.no; + e.Row["uid"] = FCOMMON.info.Login.no; + e.Row["wdate"] = DateTime.Now; + e.Row["cate"] = "0"; //기본 신청 + e.Row["pdate"] = DateTime.Now; + e.Row["termDr"] = 1.0f; + e.Row["contents"] = string.Empty; + } + + string GetUIDValue() + { + string uid = "%"; + if (cmbUser.SelectedIndex > 0) + { + uid = cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1); + } + return uid; + } + + void RefreshData() + { + //update data + string uid = GetUIDValue(); + var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); + var ed = DateTime.Parse(tbED.Text + " 23:59:59"); + this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid, FCOMMON.info.Login.gcode); + + + //잔량계산 + double sumdrD = this.dsMSSQL.Holyday.Sum(t => t.termDr); //전체발생수량 + double sumdrT = this.dsMSSQL.Holyday.Sum(t => t.DrTime); //전체발생수량 + + double sumcrD = this.dsMSSQL.Holyday.Sum(t => t.term); //전체발생수량 + double sumcrT = this.dsMSSQL.Holyday.Sum(t => t.CrTime); //전체발생수량 + + //double sumcr = sumcrD + sumcrT; //전체 사용수량 + //double sumdr = sumdrD + sumdrT; //전체 발생량 + + double janD = sumdrD - sumcrD; + double janT = sumdrT - sumcrT; + sbGen.Text = string.Format("{0}+{1}", sumdrD, sumdrT); //발생량 + sbUse.Text = string.Format("{0}+{1}", sumcrD, sumcrT); //사용량 + sbJan.Text = string.Format("{0}+{1}", janD, janT); //잔량 + if (janD < 0) sbJan.ForeColor = Color.Red; + else sbJan.ForeColor = Color.Blue; + + //색상변경 + + + // this.dv1.AutoResizeColumns(); + } + private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + this.Validate(); + this.bs.EndEdit(); + var dlg = FCOMMON.Util.MsgQ("변경된 내용을 저장하시겠습니까?"); + if (dlg != System.Windows.Forms.DialogResult.Yes) return; + try + { + + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + var f = new fHolyday_Add(); + f.TopMost = true; + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + RefreshData(); + } + } + + private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e) + { + // dv1.AutoResizeColumns(); + } + + private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) + { + + } + + private void dv1_DoubleClick(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsMSSQL.vHoliday_uselistRow; + var f = new fHolyday_Add(dr.idx); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + RefreshData(); + } + + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + RefreshData(); + } + + private void tbSD_KeyDown(object sender, KeyEventArgs e) + { + var tb = sender as ToolStripTextBox; + if (e.KeyCode == Keys.Enter) + { + string datestring; + if (FCOMMON.Util.MakeDateString(tb.Text, out datestring)) + { + tb.Text = datestring; + SendKeys.Send("{TAB}"); + } + } + } + + private void sendToMailToolStripMenuItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsMSSQL.HolydayRow; + + //string to = dr.tolist; + //string body = "test 2sfdnice to meet"; + //string bcc = string.Empty; + //string cc = string.Empty; + //string subject = "etst mail"; + + Outlook.Application outlookApplication = new Outlook.Application(); + Outlook.MailItem newTask = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem; + newTask.Subject = "mail test"; + newTask.To = "Chikyun.Kim@amkor.co.kr"; + newTask.HTMLBody = "this is test mail"; + newTask.BodyFormat = OlBodyFormat.olFormatHTML; + newTask.Display(); + + //FCOMMON.Util.RunDefaultMail(to, subject, body, cc, bcc); + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + this.Validate(); + this.bs.EndEdit(); + try + { + var cnt = this.ta.Update(this.dsMSSQL.Holyday); + this.dsMSSQL.Holyday.AcceptChanges(); + FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 저장됨"); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + var newdr = this.dsMSSQL.Holyday.NewHolydayRow(); + newdr.uid = FCOMMON.info.Login.no; + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.sdate = DateTime.Now; + newdr.edate = DateTime.Now; + newdr.contents = string.Empty; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + this.dsMSSQL.Holyday.AddHolydayRow(newdr); + } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + if(this.cmbUser.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("담당자가 선택되어야 합니다."); + return; + } + string uid = GetUIDValue(); + var f = new fHolydayJobReport(tbSD.Text,tbED.Text,uid); + f.ShowDialog(); + } + } +} diff --git a/SubProject/FBS0000/Holiday/WorkTable.resx b/SubProject/FBS0000/Holiday/WorkTable.resx new file mode 100644 index 0000000..a54eea1 --- /dev/null +++ b/SubProject/FBS0000/Holiday/WorkTable.resx @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 122, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + 17, 17 + + + 294, 17 + + + 188, 17 + + + 647, 17 + + + 647, 17 + + + + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= + + + + 521, 17 + + + 585, 17 + + \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs index ea1bb4c..a07b9db 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.Designer.cs @@ -30,13 +30,17 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new FBS0000.dsMSSQL(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); @@ -45,7 +49,10 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); this.sbUse = new System.Windows.Forms.ToolStripLabel(); @@ -53,7 +60,8 @@ this.sbGen = new System.Windows.Forms.ToolStripLabel(); this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); this.sbJan = new System.Windows.Forms.ToolStripLabel(); - this.dv1 = new System.Windows.Forms.DataGridView(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.dsMSSQL = new FBS0000.dsMSSQL(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); @@ -66,29 +74,28 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.ta = new FBS0000.dsMSSQLTableAdapters.vHoliday_uselistTableAdapter(); - this.pdate = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_cate = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.termDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.termDr = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.contents = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); this.cm1.SuspendLayout(); this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn // this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.DeleteItem = null; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.ImageScalingSize = new System.Drawing.Size(24, 24); + this.bn.ImageScalingSize = new System.Drawing.Size(20, 20); this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, @@ -99,58 +106,44 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, + this.toolStripButton3, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, + this.toolStripButton2, this.toolStripSeparator1, this.toolStripLabel7, this.sbUse, this.toolStripLabel5, this.sbGen, this.toolStripLabel8, - this.sbJan}); - this.bn.Location = new System.Drawing.Point(0, 507); + this.sbJan, + this.toolStripButton4, + this.toolStripButton5}); + this.bn.Location = new System.Drawing.Point(0, 531); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(849, 31); + this.bn.Size = new System.Drawing.Size(984, 27); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // - // bs - // - this.bs.DataMember = "vHoliday_uselist"; - this.bs.DataSource = this.dsMSSQL; - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 28); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 24); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // - // bindingNavigatorDeleteItem - // - this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); - this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; - this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(76, 28); - this.bindingNavigatorDeleteItem.Text = "삭제(&D)"; - // // bindingNavigatorMoveFirstItem // this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -159,13 +152,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 31); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorPositionItem // @@ -179,7 +172,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 31); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 27); // // bindingNavigatorMoveNextItem // @@ -187,7 +180,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -196,45 +189,71 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(24, 24); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 31); + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 27); + // + // toolStripButton3 + // + this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.RightToLeftAutoMirrorImage = true; + this.toolStripButton3.Size = new System.Drawing.Size(81, 24); + this.toolStripButton3.Text = "줄추가(&L)"; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // // bindingNavigatorAddNewItem // this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(131, 28); - this.bindingNavigatorAddNewItem.Text = "휴가 발생 등록(&A)"; + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(71, 24); + this.bindingNavigatorAddNewItem.Text = "추가(&A)"; this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // + // bindingNavigatorDeleteItem + // + this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); + this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; + this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(72, 24); + this.bindingNavigatorDeleteItem.Text = "삭제(&D)"; + // + // toolStripButton2 + // + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(70, 24); + this.toolStripButton2.Text = "저장(&S)"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 27); // // toolStripLabel7 // this.toolStripLabel7.Name = "toolStripLabel7"; - this.toolStripLabel7.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel7.Size = new System.Drawing.Size(31, 24); this.toolStripLabel7.Text = "사용"; // // sbUse // this.sbUse.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.sbUse.Name = "sbUse"; - this.sbUse.Size = new System.Drawing.Size(19, 28); + this.sbUse.Size = new System.Drawing.Size(19, 24); this.sbUse.Text = "0"; // // toolStripLabel5 // this.toolStripLabel5.Name = "toolStripLabel5"; - this.toolStripLabel5.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel5.Size = new System.Drawing.Size(31, 24); this.toolStripLabel5.Text = "발생"; // // sbGen @@ -242,47 +261,36 @@ this.sbGen.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.sbGen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.sbGen.Name = "sbGen"; - this.sbGen.Size = new System.Drawing.Size(19, 28); + this.sbGen.Size = new System.Drawing.Size(19, 24); this.sbGen.Text = "0"; // // toolStripLabel8 // this.toolStripLabel8.Name = "toolStripLabel8"; - this.toolStripLabel8.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel8.Size = new System.Drawing.Size(31, 24); this.toolStripLabel8.Text = "잔량"; // // sbJan // this.sbJan.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.sbJan.Name = "sbJan"; - this.sbJan.Size = new System.Drawing.Size(19, 28); + this.sbJan.Size = new System.Drawing.Size(19, 24); this.sbJan.Text = "0"; // - // dv1 + // toolStripButton4 // - this.dv1.AllowUserToAddRows = false; - this.dv1.AllowUserToDeleteRows = false; - this.dv1.AutoGenerateColumns = false; - this.dv1.ColumnHeadersHeight = 30; - this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.pdate, - this.dvc_cate, - this.termDataGridViewTextBoxColumn, - this.termDr, - this.contents}); - this.dv1.ContextMenuStrip = this.cm1; - this.dv1.DataSource = this.bs; - this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv1.Location = new System.Drawing.Point(0, 31); - this.dv1.Name = "dv1"; - this.dv1.ReadOnly = true; - this.dv1.RowTemplate.Height = 23; - this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(849, 476); - this.dv1.TabIndex = 2; - this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv1_DataError); - this.dv1.DoubleClick += new System.EventHandler(this.dv1_DoubleClick); + this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(135, 24); + this.toolStripButton4.Text = "업무일지(휴가내역)"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // // cm1 // @@ -325,7 +333,7 @@ this.toolStripButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(849, 31); + this.toolStrip1.Size = new System.Drawing.Size(984, 31); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -378,73 +386,140 @@ this.toolStripButton1.Text = "검색(&R)"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.Location = new System.Drawing.Point(0, 31); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(984, 500); + this.fpSpread1.TabIndex = 4; + // + // bs + // + this.bs.DataMember = "Holyday"; + this.bs.DataSource = this.dsMSSQL; + // // ta // this.ta.ClearBeforeFill = true; // - // pdate + // fpSpread1_Sheet1 // - this.pdate.DataPropertyName = "pdate"; - this.pdate.HeaderText = "등록일"; - this.pdate.Name = "pdate"; - this.pdate.ReadOnly = true; + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 9; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "일자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "요일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "사번"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "성명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "사용(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "사용(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "내용"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "발생(일)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "발생(H)"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2020, 9, 3, 10, 43, 44, 535); + this.fpSpread1_Sheet1.Columns.Get(0).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "일자"; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(1).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "요일"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "uid"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "사번"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "UserName"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "성명"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "term"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "사용(일)"; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "CrTime"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(H)"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "contents"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "내용"; + this.fpSpread1_Sheet1.Columns.Get(7).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "termDr"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "발생(일)"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "DrTime"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "발생(H)"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // dvc_cate + // toolStripButton5 // - this.dvc_cate.DataPropertyName = "cate"; - this.dvc_cate.HeaderText = "cate"; - this.dvc_cate.Name = "dvc_cate"; - this.dvc_cate.ReadOnly = true; - this.dvc_cate.Visible = false; - // - // termDataGridViewTextBoxColumn - // - this.termDataGridViewTextBoxColumn.DataPropertyName = "term"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Red; - this.termDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; - this.termDataGridViewTextBoxColumn.HeaderText = "사용"; - this.termDataGridViewTextBoxColumn.Name = "termDataGridViewTextBoxColumn"; - this.termDataGridViewTextBoxColumn.ReadOnly = true; - // - // termDr - // - this.termDr.DataPropertyName = "termDr"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Blue; - this.termDr.DefaultCellStyle = dataGridViewCellStyle2; - this.termDr.HeaderText = "발생"; - this.termDr.Name = "termDr"; - this.termDr.ReadOnly = true; - // - // contents - // - this.contents.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.contents.DataPropertyName = "contents"; - this.contents.HeaderText = "비고"; - this.contents.Name = "contents"; - this.contents.ReadOnly = true; + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(67, 24); + this.toolStripButton5.Text = "출근부"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); // // fHolyday // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(849, 538); - this.Controls.Add(this.dv1); + this.ClientSize = new System.Drawing.Size(984, 558); + this.Controls.Add(this.fpSpread1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); this.Name = "fHolyday"; - this.Text = "휴가 사용 내역"; + this.Text = "출근부"; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); this.cm1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -453,7 +528,6 @@ #endregion private dsMSSQL dsMSSQL; - private System.Windows.Forms.BindingSource bs; private System.Windows.Forms.BindingNavigator bn; private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; @@ -466,7 +540,6 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.DataGridView dv1; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripLabel toolStripLabel1; private System.Windows.Forms.ToolStripTextBox tbSD; @@ -486,11 +559,13 @@ private System.Windows.Forms.ToolStripLabel sbGen; private System.Windows.Forms.ToolStripLabel toolStripLabel8; private System.Windows.Forms.ToolStripLabel sbJan; - private dsMSSQLTableAdapters.vHoliday_uselistTableAdapter ta; - private System.Windows.Forms.DataGridViewTextBoxColumn pdate; - private System.Windows.Forms.DataGridViewTextBoxColumn dvc_cate; - private System.Windows.Forms.DataGridViewTextBoxColumn termDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn termDr; - private System.Windows.Forms.DataGridViewTextBoxColumn contents; + private FarPoint.Win.Spread.FpSpread fpSpread1; + private System.Windows.Forms.BindingSource bs; + private dsMSSQLTableAdapters.HolydayTableAdapter ta; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton toolStripButton3; + private System.Windows.Forms.ToolStripButton toolStripButton4; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton5; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 840db4d..502b941 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -18,16 +18,16 @@ namespace FBS0000 { InitializeComponent(); this.dsMSSQL.vHoliday_uselist.TableNewRow += Holyday_TableNewRow; - this.dv1.CellFormatting += dv1_CellFormatting; + //this.dv1.CellFormatting += dv1_CellFormatting; } void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { - if (e.RowIndex < 0 || e.ColumnIndex < 0) return; - var col = this.dv1.Columns[e.ColumnIndex]; - var cate = dv1.Rows[e.RowIndex].Cells["dvc_cate"].Value.ToString(); - if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray; - else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black; + //if (e.RowIndex < 0 || e.ColumnIndex < 0) return; + //var col = this.dv1.Columns[e.ColumnIndex]; + //var cate = dv1.Rows[e.RowIndex].Cells["dvc_cate"].Value.ToString(); + //if (cate == "0") dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Blue;// = Color.Gray; + //else dv1.Rows[e.RowIndex].DefaultCellStyle.ForeColor = Color.Black; } private void __Load(object sender, EventArgs e) @@ -88,37 +88,47 @@ namespace FBS0000 e.Row["contents"] = string.Empty; } - - void RefreshData() + string GetUIDValue() { - //update data string uid = "%"; if (cmbUser.SelectedIndex > 0) { uid = cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1); } + return uid; + } + + void RefreshData() + { + //update data + string uid = GetUIDValue(); var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); var ed = DateTime.Parse(tbED.Text + " 23:59:59"); - this.ta.Fill(this.dsMSSQL.vHoliday_uselist,uid,tbSD.Text,tbED.Text,FCOMMON.info.Login.gcode); + this.ta.Fill(this.dsMSSQL.Holyday, tbSD.Text, tbED.Text, uid, FCOMMON.info.Login.gcode); //잔량계산 - double sumdr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.termDr); //전체발생수량 - double sumdrN = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate == "10").Sum(t => t.termDr); //일반발생 - double sumdrE = this.dsMSSQL.vHoliday_uselist.Where(t => t.cate != "10").Sum(t => t.termDr); //기타발생 + double sumdrD = this.dsMSSQL.Holyday.Sum(t => t.termDr); //전체발생수량 + double sumdrT = this.dsMSSQL.Holyday.Sum(t => t.DrTime); //전체발생수량 - double sumcr = this.dsMSSQL.vHoliday_uselist.Sum(t => t.term); - double jan = sumdr - sumcr; - sbGen.Text = string.Format("{0}+{1}",sumdrN, sumdrE); - sbUse.Text = sumcr.ToString("N0"); - sbJan.Text = jan.ToString("N0"); - if (jan < 0) sbJan.ForeColor = Color.Red; + double sumcrD = this.dsMSSQL.Holyday.Sum(t => t.term); //전체발생수량 + double sumcrT = this.dsMSSQL.Holyday.Sum(t => t.CrTime); //전체발생수량 + + //double sumcr = sumcrD + sumcrT; //전체 사용수량 + //double sumdr = sumdrD + sumdrT; //전체 발생량 + + double janD = sumdrD - sumcrD; + double janT = sumdrT - sumcrT; + sbGen.Text = string.Format("{0}+{1}", sumdrD, sumdrT); //발생량 + sbUse.Text = string.Format("{0}+{1}", sumcrD, sumcrT); //사용량 + sbJan.Text = string.Format("{0}+{1}", janD, janT); //잔량 + if (janD < 0) sbJan.ForeColor = Color.Red; else sbJan.ForeColor = Color.Blue; //색상변경 - this.dv1.AutoResizeColumns(); + // this.dv1.AutoResizeColumns(); } private void boardBindingNavigatorSaveItem_Click(object sender, EventArgs e) { @@ -128,7 +138,7 @@ namespace FBS0000 if (dlg != System.Windows.Forms.DialogResult.Yes) return; try { - + } catch (Exception ex) { @@ -148,7 +158,7 @@ namespace FBS0000 private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e) { - dv1.AutoResizeColumns(); + // dv1.AutoResizeColumns(); } private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) @@ -161,20 +171,12 @@ namespace FBS0000 var drv = this.bs.Current as DataRowView; if (drv == null) return; var dr = drv.Row as dsMSSQL.vHoliday_uselistRow; - if(dr.cate == "10" || dr.cate=="11") + var f = new fHolyday_Add(dr.idx); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - var f = new fHolyday_Add(dr.idx); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - RefreshData(); - } + RefreshData(); } - else - { - FCOMMON.Util.MsgI("이 데이터는 업무일지의 데이터가 입니다.\n\n" + - "변경하려면 업무일지의 자료를 수정하세요" ); - } - + } private void toolStripButton1_Click(object sender, EventArgs e) @@ -219,5 +221,51 @@ namespace FBS0000 //FCOMMON.Util.RunDefaultMail(to, subject, body, cc, bcc); } + private void toolStripButton2_Click(object sender, EventArgs e) + { + this.Validate(); + this.bs.EndEdit(); + try + { + var cnt = this.ta.Update(this.dsMSSQL.Holyday); + this.dsMSSQL.Holyday.AcceptChanges(); + FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 저장됨"); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + var newdr = this.dsMSSQL.Holyday.NewHolydayRow(); + newdr.uid = FCOMMON.info.Login.no; + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.sdate = DateTime.Now; + newdr.edate = DateTime.Now; + newdr.contents = string.Empty; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + this.dsMSSQL.Holyday.AddHolydayRow(newdr); + } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + if(this.cmbUser.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("담당자가 선택되어야 합니다."); + return; + } + string uid = GetUIDValue(); + var f = new fHolydayJobReport(tbSD.Text,tbED.Text,uid); + f.ShowDialog(); + } + + private void toolStripButton5_Click(object sender, EventArgs e) + { + var f = new WorkTable(tbSD.Text, tbED.Text); + f.ShowDialog(); + } } } diff --git a/SubProject/FBS0000/Holiday/fHolyday.resx b/SubProject/FBS0000/Holiday/fHolyday.resx index 193c329..b97f168 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.resx +++ b/SubProject/FBS0000/Holiday/fHolyday.resx @@ -118,27 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 186, 17 - - 122, 17 - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -177,6 +159,18 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== @@ -191,25 +185,92 @@ rkJggg== - - True - - - True - - - True - - - True + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE1SURBVDhPY/hPIQAbcOn57//T915BwW1rjoFx/oJz//N6 + VqHgsNxeMA03YN3lp/9vv4YYhAtsuQ6h55/9A8aBidVgPtiADZcegzWDFN1/9///qy8IDOKDcPfu1/9/ + /vn/v3rt/f9TD38BuwJuwIrT9wka0L79BdiAkuW3MA0A+fnog///V12GKAZ5BxcGGQByDYoXYAbA/Aey + AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs + 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG + GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi + Dwoi+hCn0lXUZFlGI7uI6iKQqJxDzCVZmjKnbi6m29oHTk+4TWzpcW5Nl86lsJ3Tjvvg6T1neWxsF77w + 4/Ae+D/v7zznnB38oiiq3PpChtHGChirD4LcOr5N9vPDh10uF+Ny2kA5LTDcKEM6nd4WQohSqdyp1Wpv + jjyth11VD8P1MiQSiRxYlgXDMCKxWAypVCobkGtghv6qNC9gM2STeDyOZDKZa6B/Ug9bax30V6TgOE7g + QVcQjZog7hEUnQEoOgJoIPAWYoBo4MgaDF2WYmNjQ4Af1pgj6CS8G4ugYzSCO+0LQgBvlWMw1FyHr69r + MXipVEjn+f9UORm8q6Zxu40WOiAhmYIGAxdKhYL4AI5LwOIJotcxi46xID7YljBMhbD+ewVra2sMCTi6 + ZaCshfWVDAPnS/4Nc+g0zWGQWsHcLxYLUQ7j8zEYplYx4vIjGo0W6MBhhvZssRDAd/DJEcbMYhyuwB84 + /CzsBG+YQ7c1ALfbDYlEckI00D2UwdJSg/7KYrHEdlMAdISDY56BjWZg8sVB/eTw3rKI5eXlfINJYtBX + cUAssZs888wSC8tsdphnMsRBNfwj/0vU3a/B2Mtq9J3ZCjC7wxinY/hGhpyBBCbI6Tp3HK2aAYQofWGD + 3tNFyGQywptYXWfh/B5BD+nioz0MtXEBbzTD8BrUmFDVQVG1r0kwkMvlRV2Vh9B/7Rh6ThWBpmn4fD5M + T0/D4/EIhXm9XuFq+fwW42234B9pga65PEEssqu6ZNfJR0f2PK6R7paRbaFfV6Sham/Tl2cXOePzc/gL + qwzIzob0lx0AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7GF3XVVdRps4uIogougsKQlGi + Dwoi+pBNR1dRk2UZjeyiqItAolKHrC3J0pRt6qahbrYPpp5wm9jS49xSl86lsJ3Tzr54es9ZHhvuwhd+ + HM6B//P+3uecs4NfFEWVj76QY7i+AoPVB0EeHd8m+/nhw263mxlz2UG5bLDcKEMmk9kWQohard5pMBhu + DjxVwNGigOV6GRKJRB4sy4JhGJFYLIZ0Op0LyDewwnxVuiVgI2SDeDyOVCqVb2B+ooC9uRbmK1JwHCfw + oD2Een0I9wgqXRAqbRB1BN5CDBANnDmDvstSJJNJAX5Yb41AR3g3EoF2OII7bfNCAG+VZ9DXWIuvr2vQ + e6lUSOf5f1clGbyroXG7lRY6IMfIFjQwXigVCuIDOC4BmzeELucMtCMhfLAvoZ9awPrvFaytrTEk4Oim + gboGo6/kMJ4v+TfMQTc0i15qBbO/WMxHObjnYrBMrmJgLIBoNFqgA6cVhrPFQgDfwSdnGNOLcYwF/8AZ + YOEg+MIcOkaD8Hg8kEgkJ0QD00M5bE0y9FQWiyW2DQVBRzg45xjYaQZD/jionxze2xaxvLy81WCCGHRX + HBBL7CBnnl5iYZvJDfNMLHBo6f+x9Us03Zdh5GU1us9sBlg9YbjpGL6RIVcwgXGyu8kTR7PeiAXKXNig + 63QRstms8CZW11m4vkfQSbr46AhDMziPN/p++CwajLfUQlW1r0EwUCqVRe2Vh9Bz7Rg6TxWBpmn4/X5M + TU3B6/UKhfl8PuFq+/wW7tZbCAw0wdhYniAWuVVdsuvkoyN7Hsuku+XkttCvK1JXtbfhy7OL3ODzc/gL + dFHItBTWKaIAAAAASUVORK5CYII= + + + + 17, 17 - 358, 17 + 294, 17 - 252, 17 + 188, 17 + + + 647, 17 + + + 521, 17 - 433, 17 + 585, 17 + + 647, 17 + + + + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh + cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 + cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 + AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// + K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA + AAD/////AQgAAP////8AAQgAAAs= + + \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolydayJobReport.Designer.cs b/SubProject/FBS0000/Holiday/fHolydayJobReport.Designer.cs new file mode 100644 index 0000000..6552165 --- /dev/null +++ b/SubProject/FBS0000/Holiday/fHolydayJobReport.Designer.cs @@ -0,0 +1,430 @@ +namespace FBS0000 +{ + partial class fHolydayJobReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolydayJobReport)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btExport = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.sbUse = new System.Windows.Forms.ToolStripLabel(); + this.dsMSSQL = new FBS0000.dsMSSQL(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.sendToMailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.autoResizeComlumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbSD = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FBS0000.dsMSSQLTableAdapters.vHoliday_uselistTableAdapter(); + this.dv1 = new arCtl.arDatagridView(); + this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.term = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.description = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + this.cm1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.ImageScalingSize = new System.Drawing.Size(24, 24); + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2, + this.btExport, + this.toolStripSeparator1, + this.toolStripLabel7, + this.sbUse}); + this.bn.Location = new System.Drawing.Point(0, 527); + this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bn.Name = "bn"; + this.bn.PositionItem = this.bindingNavigatorPositionItem; + this.bn.Size = new System.Drawing.Size(909, 31); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 28); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 31); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 31); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(28, 28); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 31); + // + // btExport + // + this.btExport.Image = ((System.Drawing.Image)(resources.GetObject("btExport.Image"))); + this.btExport.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btExport.Name = "btExport"; + this.btExport.Size = new System.Drawing.Size(98, 28); + this.btExport.Text = "내보내기(&S)"; + this.btExport.Visible = false; + this.btExport.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel7.Text = "합계"; + // + // sbUse + // + this.sbUse.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.sbUse.Name = "sbUse"; + this.sbUse.Size = new System.Drawing.Size(19, 28); + this.sbUse.Text = "0"; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // cm1 + // + this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.sendToMailToolStripMenuItem, + this.toolStripMenuItem1, + this.autoResizeComlumnsToolStripMenuItem}); + this.cm1.Name = "contextMenuStrip1"; + this.cm1.Size = new System.Drawing.Size(201, 54); + // + // sendToMailToolStripMenuItem + // + this.sendToMailToolStripMenuItem.Name = "sendToMailToolStripMenuItem"; + this.sendToMailToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.sendToMailToolStripMenuItem.Text = "Mail (Preview)"; + this.sendToMailToolStripMenuItem.Click += new System.EventHandler(this.sendToMailToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(197, 6); + // + // autoResizeComlumnsToolStripMenuItem + // + this.autoResizeComlumnsToolStripMenuItem.Name = "autoResizeComlumnsToolStripMenuItem"; + this.autoResizeComlumnsToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.autoResizeComlumnsToolStripMenuItem.Text = "Auto Resize Comlumns"; + this.autoResizeComlumnsToolStripMenuItem.Click += new System.EventHandler(this.autoResizeComlumnsToolStripMenuItem_Click); + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel1, + this.tbSD, + this.toolStripLabel2, + this.tbED, + this.toolStripLabel3, + this.cmbUser, + this.toolStripButton1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(909, 31); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel1.Text = "기간"; + // + // tbSD + // + this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbSD.Name = "tbSD"; + this.tbSD.Size = new System.Drawing.Size(100, 31); + this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbSD.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(15, 28); + this.toolStripLabel2.Text = "~"; + // + // tbED + // + this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbED.Name = "tbED"; + this.tbED.Size = new System.Drawing.Size(100, 31); + this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbED.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbSD_KeyDown); + // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(43, 28); + this.toolStripLabel3.Text = "담당자"; + // + // cmbUser + // + this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUser.Name = "cmbUser"; + this.cmbUser.Size = new System.Drawing.Size(150, 31); + // + // toolStripButton1 + // + this.toolStripButton1.Image = global::FBS0000.Properties.Resources.action_refresh; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(74, 28); + this.toolStripButton1.Text = "검색(&R)"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // bs + // + this.bs.DataMember = "vHoliday_uselist"; + this.bs.DataSource = this.dsMSSQL; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // dv1 + // + this.dv1.A_DelCurrentCell = true; + this.dv1.A_EnterToTab = true; + this.dv1.A_KoreanField = null; + this.dv1.A_UpperField = null; + this.dv1.A_ViewRownumOnHeader = true; + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoGenerateColumns = false; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.pdateDataGridViewTextBoxColumn, + this.term, + this.description}); + this.dv1.DataSource = this.bs; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(3); + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle1; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 31); + this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(909, 496); + this.dv1.TabIndex = 4; + // + // pdateDataGridViewTextBoxColumn + // + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + this.pdateDataGridViewTextBoxColumn.HeaderText = "pdate"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + this.pdateDataGridViewTextBoxColumn.ReadOnly = true; + // + // term + // + this.term.DataPropertyName = "term"; + this.term.HeaderText = "term"; + this.term.Name = "term"; + this.term.ReadOnly = true; + // + // description + // + this.description.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.description.DataPropertyName = "description"; + this.description.HeaderText = "description"; + this.description.Name = "description"; + this.description.ReadOnly = true; + // + // fHolydayJobReport + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(909, 558); + this.Controls.Add(this.dv1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.Name = "fHolydayJobReport"; + this.Text = "업무일지 휴가 등록 내역"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + this.cm1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private dsMSSQL dsMSSQL; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripTextBox tbSD; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripTextBox tbED; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripLabel toolStripLabel3; + private System.Windows.Forms.ToolStripComboBox cmbUser; + private System.Windows.Forms.ContextMenuStrip cm1; + private System.Windows.Forms.ToolStripMenuItem autoResizeComlumnsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem sendToMailToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripLabel sbUse; + private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.ToolStripButton btExport; + private dsMSSQLTableAdapters.vHoliday_uselistTableAdapter ta; + private arCtl.arDatagridView dv1; + private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn termDrDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn contentsDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn term; + private System.Windows.Forms.DataGridViewTextBoxColumn description; + } +} \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolydayJobReport.cs b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs new file mode 100644 index 0000000..4463f9d --- /dev/null +++ b/SubProject/FBS0000/Holiday/fHolydayJobReport.cs @@ -0,0 +1,142 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using NetOffice; +using Outlook = NetOffice.OutlookApi; +using NetOffice.OutlookApi.Enums; + +namespace FBS0000 +{ + public partial class fHolydayJobReport : FCOMMON.fBase + { + string p_uid = string.Empty; + public fHolydayJobReport(string sd,string ed ,string uid ) + { + InitializeComponent(); + this.tbSD.Text = sd; + this.tbED.Text = ed; + p_uid = uid; + } + + private void __Load(object sender, EventArgs e) + { + + //udpate user list + var userList = FCOMMON.DBM.getUserList(); + this.cmbUser.Items.Clear(); + this.cmbUser.Items.Add("-- ALL --"); + int curuserindex = -1; + foreach (var user in userList) + { + this.cmbUser.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value)); + if (user.Key == p_uid) curuserindex = cmbUser.Items.Count - 1; + } + this.cmbUser.SelectedIndex = curuserindex; + + //일반사용자의경우에는 상태를 변경하지 못한다. + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); + if (curLevel >= 5) + { + //권한이 잇으므로 모든 사용자로 한다. + } + else + { + this.cmbUser.Enabled = false; //사용자를 고칠수 없게 한다. + } + + RefreshData(); + } + + + + + void RefreshData() + { + //update data + string uid = "%"; + if (cmbUser.SelectedIndex > 0) + { + uid = cmbUser.Text.Substring(1, cmbUser.Text.IndexOf(']') - 1); + } + var sd = DateTime.Parse(tbSD.Text + " 00:00:00"); + var ed = DateTime.Parse(tbED.Text + " 23:59:59"); + this.ta.Fill(this.dsMSSQL.vHoliday_uselist,uid, tbSD.Text, tbED.Text, FCOMMON.info.Login.gcode); + + + //잔량계산 + double sumdrD = this.dsMSSQL.vHoliday_uselist.Sum(t => t.term); //전체발생수량 + + sbUse.Text = string.Format("{0}day,{1}hour", sumdrD/8.0f,sumdrD); //사용량 + + //색상변경 + + + this.dv1.AutoResizeColumns(); + } + + + private void autoResizeComlumnsToolStripMenuItem_Click(object sender, EventArgs e) + { + // dv1.AutoResizeColumns(); + } + + private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) + { + + } + + + private void toolStripButton1_Click(object sender, EventArgs e) + { + RefreshData(); + } + + private void tbSD_KeyDown(object sender, KeyEventArgs e) + { + var tb = sender as ToolStripTextBox; + if (e.KeyCode == Keys.Enter) + { + string datestring; + if (FCOMMON.Util.MakeDateString(tb.Text, out datestring)) + { + tb.Text = datestring; + SendKeys.Send("{TAB}"); + } + } + } + + private void sendToMailToolStripMenuItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsMSSQL.HolydayRow; + + //string to = dr.tolist; + //string body = "test 2sfdnice to meet"; + //string bcc = string.Empty; + //string cc = string.Empty; + //string subject = "etst mail"; + + Outlook.Application outlookApplication = new Outlook.Application(); + Outlook.MailItem newTask = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem; + newTask.Subject = "mail test"; + newTask.To = "Chikyun.Kim@amkor.co.kr"; + newTask.HTMLBody = "this is test mail"; + newTask.BodyFormat = OlBodyFormat.olFormatHTML; + newTask.Display(); + + //FCOMMON.Util.RunDefaultMail(to, subject, body, cc, bcc); + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + FCOMMON.Util.MsgI("준비중"); + } + + } +} diff --git a/SubProject/FBS0000/Holiday/fHolydayJobReport.resx b/SubProject/FBS0000/Holiday/fHolydayJobReport.resx new file mode 100644 index 0000000..af8c549 --- /dev/null +++ b/SubProject/FBS0000/Holiday/fHolydayJobReport.resx @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 122, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + 17, 17 + + + 294, 17 + + + 188, 17 + + + 369, 17 + + + 433, 17 + + + True + + + True + + \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs index 8c788d8..4de317b 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.Designer.cs @@ -33,6 +33,7 @@ System.Windows.Forms.Label contentsLabel; System.Windows.Forms.Label uidLabel; System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; this.dsMSSQL = new FBS0000.dsMSSQL(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter(); @@ -42,15 +43,18 @@ this.cmbUser = new System.Windows.Forms.ComboBox(); this.btOK = new System.Windows.Forms.Button(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); - this.radNormall = new System.Windows.Forms.RadioButton(); - this.radEtc = new System.Windows.Forms.RadioButton(); + this.radDR = new System.Windows.Forms.RadioButton(); + this.radCR = new System.Windows.Forms.RadioButton(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); sdateLabel = new System.Windows.Forms.Label(); contentsLabel = new System.Windows.Forms.Label(); uidLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); this.SuspendLayout(); // // sdateLabel @@ -66,7 +70,7 @@ // contentsLabel // contentsLabel.AutoSize = true; - contentsLabel.Location = new System.Drawing.Point(44, 82); + contentsLabel.Location = new System.Drawing.Point(42, 83); contentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); contentsLabel.Name = "contentsLabel"; contentsLabel.Size = new System.Drawing.Size(37, 19); @@ -137,7 +141,7 @@ this.dateTimePicker1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true)); this.dateTimePicker1.Location = new System.Drawing.Point(87, 45); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(300, 27); + this.dateTimePicker1.Size = new System.Drawing.Size(214, 27); this.dateTimePicker1.TabIndex = 3; this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged); // @@ -169,42 +173,76 @@ // this.numericUpDown1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.numericUpDown1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "termDr", true)); + this.numericUpDown1.DecimalPlaces = 2; this.numericUpDown1.Location = new System.Drawing.Point(87, 256); + this.numericUpDown1.Maximum = new decimal(new int[] { + 999999, + 0, + 0, + 0}); this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(422, 27); + this.numericUpDown1.Size = new System.Drawing.Size(159, 27); this.numericUpDown1.TabIndex = 7; this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // radNormall + // radDR // - this.radNormall.AutoSize = true; - this.radNormall.Checked = true; - this.radNormall.Location = new System.Drawing.Point(393, 47); - this.radNormall.Name = "radNormall"; - this.radNormall.Size = new System.Drawing.Size(55, 23); - this.radNormall.TabIndex = 9; - this.radNormall.TabStop = true; - this.radNormall.Text = "일반"; - this.radNormall.UseVisualStyleBackColor = true; + this.radDR.AutoSize = true; + this.radDR.Location = new System.Drawing.Point(389, 47); + this.radDR.Name = "radDR"; + this.radDR.Size = new System.Drawing.Size(55, 23); + this.radDR.TabIndex = 9; + this.radDR.Text = "발생"; + this.radDR.UseVisualStyleBackColor = true; // - // radEtc + // radCR // - this.radEtc.AutoSize = true; - this.radEtc.Location = new System.Drawing.Point(454, 47); - this.radEtc.Name = "radEtc"; - this.radEtc.Size = new System.Drawing.Size(55, 23); - this.radEtc.TabIndex = 10; - this.radEtc.Text = "기타"; - this.radEtc.UseVisualStyleBackColor = true; + this.radCR.AutoSize = true; + this.radCR.Checked = true; + this.radCR.Location = new System.Drawing.Point(317, 47); + this.radCR.Name = "radCR"; + this.radCR.Size = new System.Drawing.Size(55, 23); + this.radCR.TabIndex = 10; + this.radCR.TabStop = true; + this.radCR.Text = "사용"; + this.radCR.UseVisualStyleBackColor = true; + // + // numericUpDown2 + // + this.numericUpDown2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.numericUpDown2.DecimalPlaces = 2; + this.numericUpDown2.Location = new System.Drawing.Point(350, 256); + this.numericUpDown2.Maximum = new decimal(new int[] { + 999999, + 0, + 0, + 0}); + this.numericUpDown2.Name = "numericUpDown2"; + this.numericUpDown2.Size = new System.Drawing.Size(159, 27); + this.numericUpDown2.TabIndex = 12; + this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label2 + // + label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(307, 258); + label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(37, 19); + label2.TabIndex = 11; + label2.Text = "시간"; // // fHolyday_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(523, 340); - this.Controls.Add(this.radEtc); - this.Controls.Add(this.radNormall); + this.Controls.Add(this.numericUpDown2); + this.Controls.Add(label2); + this.Controls.Add(this.radCR); + this.Controls.Add(this.radDR); this.Controls.Add(this.numericUpDown1); this.Controls.Add(label1); this.Controls.Add(this.btOK); @@ -218,12 +256,13 @@ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.MinimizeBox = false; this.Name = "fHolyday_Add"; - this.Text = "휴가 발생 등록"; + this.Text = "휴가 발생/사용 등록"; this.TopMost = true; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -240,7 +279,8 @@ private System.Windows.Forms.ComboBox cmbUser; private System.Windows.Forms.Button btOK; private System.Windows.Forms.NumericUpDown numericUpDown1; - private System.Windows.Forms.RadioButton radNormall; - private System.Windows.Forms.RadioButton radEtc; + private System.Windows.Forms.RadioButton radDR; + private System.Windows.Forms.RadioButton radCR; + private System.Windows.Forms.NumericUpDown numericUpDown2; } } \ No newline at end of file diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.cs b/SubProject/FBS0000/Holiday/fHolyday_Add.cs index f68c309..36d5e30 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.cs +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.cs @@ -17,10 +17,10 @@ namespace FBS0000 public fHolyday_Add(int idx) { InitializeComponent(); - if(idx == -1) + if (idx == -1) { dr = this.dsMSSQL.Holyday.NewHolydayRow(); - dr.sdate = DateTime.Parse( DateTime.Now.Year.ToString() + "-01-01"); + dr.sdate = DateTime.Parse(DateTime.Now.Year.ToString() + "-01-01"); dr.edate = dr.sdate; dr.wuid = FCOMMON.info.Login.no; dr.wdate = DateTime.Now; @@ -29,16 +29,16 @@ namespace FBS0000 dr.gcode = FCOMMON.info.Login.gcode; dr.uid = FCOMMON.info.Login.no; this.dsMSSQL.Holyday.AddHolydayRow(dr); - } + } else { ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx); this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow; - if (dr.cate == "10") radNormall.Checked = true; - else radEtc.Checked = true; + if (dr.term > 0 || dr.CrTime > 0) radCR.Checked = true; + else radDR.Checked = true; } - this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); + this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); this.cmbUser.DisplayMember = "dispName"; this.cmbUser.ValueMember = "id"; this.bs.DataSource = dr; @@ -50,13 +50,35 @@ namespace FBS0000 { bInit = true; this.Show(); + + if (radCR.Checked) + { + this.numericUpDown1.Value = (decimal)dr.term; + this.numericUpDown2.Value = (decimal)dr.CrTime; + } + else + { + this.numericUpDown1.Value = (decimal)dr.termDr; + this.numericUpDown2.Value = (decimal)dr.DrTime; + } Application.DoEvents(); } private void btOK_Click(object sender, EventArgs e) { - if (radEtc.Checked) dr.cate = "11"; //OT년차발생 - else dr.cate = "10";//일반 년차발생 + if (radCR.Checked) + { + dr.CrTime = (double)numericUpDown2.Value; + dr.term = (double)numericUpDown1.Value; + dr.cate = "20"; //OT년차발생 + } + else + { + dr.DrTime = (double)numericUpDown2.Value; + dr.termDr = (double)numericUpDown1.Value; + dr.cate = "10";//일반 년차발생 + } + //기본값처리 this.Validate(); this.bs.EndEdit(); @@ -64,7 +86,7 @@ namespace FBS0000 try { - + this.ta.Update(this.dr); dr.AcceptChanges(); DialogResult = System.Windows.Forms.DialogResult.OK; @@ -74,19 +96,19 @@ namespace FBS0000 FCOMMON.Util.MsgE(eX.Message); } - - + + } private void dateTimePicker1_ValueChanged(object sender, EventArgs e) { if (!bInit) return; - + //if(dateTimePicker1.Value > this.dateTimePicker2.Value) // this.dateTimePicker2.Value = dateTimePicker1.Value; //RefreshTerm(); - + } diff --git a/SubProject/FBS0000/Holiday/fHolyday_Add.resx b/SubProject/FBS0000/Holiday/fHolyday_Add.resx index 8fa5593..567a2d2 100644 --- a/SubProject/FBS0000/Holiday/fHolyday_Add.resx +++ b/SubProject/FBS0000/Holiday/fHolyday_Add.resx @@ -141,4 +141,7 @@ 248, 17 + + False + \ No newline at end of file diff --git a/SubProject/FBS0000/Properties/licenses.licx b/SubProject/FBS0000/Properties/licenses.licx new file mode 100644 index 0000000..cecfb1c --- /dev/null +++ b/SubProject/FBS0000/Properties/licenses.licx @@ -0,0 +1 @@ +FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457 diff --git a/SubProject/FBS0000/dsMSSQL.Designer.cs b/SubProject/FBS0000/dsMSSQL.Designer.cs index d0e3795..353f615 100644 --- a/SubProject/FBS0000/dsMSSQL.Designer.cs +++ b/SubProject/FBS0000/dsMSSQL.Designer.cs @@ -1239,6 +1239,12 @@ namespace FBS0000 { private global::System.Data.DataColumn columngcode; + private global::System.Data.DataColumn columnDrTime; + + private global::System.Data.DataColumn columnCrTime; + + private global::System.Data.DataColumn columnUserName; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public HolydayDataTable() { @@ -1408,6 +1414,30 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn DrTimeColumn { + get { + return this.columnDrTime; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn CrTimeColumn { + get { + return this.columnCrTime; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn UserNameColumn { + get { + return this.columnUserName; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1461,7 +1491,10 @@ namespace FBS0000 { string wuid, System.DateTime wdate, double termDr, - string gcode) { + string gcode, + double DrTime, + double CrTime, + string UserName) { HolydayRow rowHolydayRow = ((HolydayRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1480,7 +1513,10 @@ namespace FBS0000 { wuid, wdate, termDr, - gcode}; + gcode, + DrTime, + CrTime, + UserName}; rowHolydayRow.ItemArray = columnValuesArray; this.Rows.Add(rowHolydayRow); return rowHolydayRow; @@ -1527,6 +1563,9 @@ namespace FBS0000 { this.columnwdate = base.Columns["wdate"]; this.columntermDr = base.Columns["termDr"]; this.columngcode = base.Columns["gcode"]; + this.columnDrTime = base.Columns["DrTime"]; + this.columnCrTime = base.Columns["CrTime"]; + this.columnUserName = base.Columns["UserName"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1566,6 +1605,12 @@ namespace FBS0000 { base.Columns.Add(this.columntermDr); this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngcode); + this.columnDrTime = new global::System.Data.DataColumn("DrTime", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDrTime); + this.columnCrTime = new global::System.Data.DataColumn("CrTime", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCrTime); + this.columnUserName = new global::System.Data.DataColumn("UserName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnUserName); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1586,6 +1631,8 @@ namespace FBS0000 { this.columnwdate.AllowDBNull = false; this.columngcode.AllowDBNull = false; this.columngcode.MaxLength = 10; + this.columnUserName.ReadOnly = true; + this.columnUserName.MaxLength = 200; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1721,24 +1768,22 @@ namespace FBS0000 { private global::System.Data.DataColumn columnidx; - private global::System.Data.DataColumn columncate; - private global::System.Data.DataColumn columngcode; - private global::System.Data.DataColumn columnpdate; - - private global::System.Data.DataColumn columnterm; - - private global::System.Data.DataColumn columntermDr; - - private global::System.Data.DataColumn columncontents; - private global::System.Data.DataColumn columnuid; private global::System.Data.DataColumn columnwuid; private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columnpdate; + + private global::System.Data.DataColumn columntermdr; + + private global::System.Data.DataColumn columndescription; + + private global::System.Data.DataColumn columnterm; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public vHoliday_uselistDataTable() { @@ -1780,14 +1825,6 @@ namespace FBS0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public global::System.Data.DataColumn cateColumn { - get { - return this.columncate; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn gcodeColumn { @@ -1796,38 +1833,6 @@ namespace FBS0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public global::System.Data.DataColumn pdateColumn { - get { - return this.columnpdate; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public global::System.Data.DataColumn termColumn { - get { - return this.columnterm; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public global::System.Data.DataColumn termDrColumn { - get { - return this.columntermDr; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public global::System.Data.DataColumn contentsColumn { - get { - return this.columncontents; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn uidColumn { @@ -1852,6 +1857,38 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn pdateColumn { + get { + return this.columnpdate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn termdrColumn { + get { + return this.columntermdr; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn descriptionColumn { + get { + return this.columndescription; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn termColumn { + get { + return this.columnterm; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1889,19 +1926,18 @@ namespace FBS0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public vHoliday_uselistRow AddvHoliday_uselistRow(int idx, string cate, string gcode, System.DateTime pdate, double term, double termDr, string contents, string uid, string wuid, System.DateTime wdate) { + public vHoliday_uselistRow AddvHoliday_uselistRow(int idx, string gcode, string uid, string wuid, System.DateTime wdate, string pdate, int termdr, string description, int term) { vHoliday_uselistRow rowvHoliday_uselistRow = ((vHoliday_uselistRow)(this.NewRow())); object[] columnValuesArray = new object[] { idx, - cate, gcode, - pdate, - term, - termDr, - contents, uid, wuid, - wdate}; + wdate, + pdate, + termdr, + description, + term}; rowvHoliday_uselistRow.ItemArray = columnValuesArray; this.Rows.Add(rowvHoliday_uselistRow); return rowvHoliday_uselistRow; @@ -1909,10 +1945,9 @@ namespace FBS0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public vHoliday_uselistRow FindByidxcate(int idx, string cate) { + public vHoliday_uselistRow FindByidx(int idx) { return ((vHoliday_uselistRow)(this.Rows.Find(new object[] { - idx, - cate}))); + idx}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1933,15 +1968,14 @@ namespace FBS0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.columnidx = base.Columns["idx"]; - this.columncate = base.Columns["cate"]; this.columngcode = base.Columns["gcode"]; - this.columnpdate = base.Columns["pdate"]; - this.columnterm = base.Columns["term"]; - this.columntermDr = base.Columns["termDr"]; - this.columncontents = base.Columns["contents"]; this.columnuid = base.Columns["uid"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columnpdate = base.Columns["pdate"]; + this.columntermdr = base.Columns["termdr"]; + this.columndescription = base.Columns["description"]; + this.columnterm = base.Columns["term"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1949,38 +1983,36 @@ namespace FBS0000 { private void InitClass() { this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidx); - this.columncate = new global::System.Data.DataColumn("cate", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columncate); this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngcode); - this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnpdate); - this.columnterm = new global::System.Data.DataColumn("term", typeof(double), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnterm); - this.columntermDr = new global::System.Data.DataColumn("termDr", typeof(double), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columntermDr); - this.columncontents = new global::System.Data.DataColumn("contents", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columncontents); this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuid); this.columnwuid = new global::System.Data.DataColumn("wuid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpdate); + this.columntermdr = new global::System.Data.DataColumn("termdr", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columntermdr); + this.columndescription = new global::System.Data.DataColumn("description", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndescription); + this.columnterm = new global::System.Data.DataColumn("term", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnterm); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnidx, - this.columncate}, true)); + this.columnidx}, true)); this.columnidx.AllowDBNull = false; - this.columncate.AllowDBNull = false; - this.columncate.MaxLength = 10; + this.columnidx.Unique = true; this.columngcode.AllowDBNull = false; this.columngcode.MaxLength = 10; - this.columntermDr.AllowDBNull = false; - this.columncontents.MaxLength = 2147483647; this.columnuid.MaxLength = 20; this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columnpdate.MaxLength = 10; + this.columntermdr.ReadOnly = true; + this.columndescription.MaxLength = 2147483647; + this.columnterm.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2917,6 +2949,54 @@ namespace FBS0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public double DrTime { + get { + if (this.IsDrTimeNull()) { + return 0D; + } + else { + return ((double)(this[this.tableHolyday.DrTimeColumn])); + } + } + set { + this[this.tableHolyday.DrTimeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public double CrTime { + get { + if (this.IsCrTimeNull()) { + return 0D; + } + else { + return ((double)(this[this.tableHolyday.CrTimeColumn])); + } + } + set { + this[this.tableHolyday.CrTimeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string UserName { + get { + if (this.IsUserNameNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableHolyday.UserNameColumn])); + } + } + set { + this[this.tableHolyday.UserNameColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IscateNull() { @@ -3072,6 +3152,42 @@ namespace FBS0000 { public void SettermDrNull() { this[this.tableHolyday.termDrColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsDrTimeNull() { + return this.IsNull(this.tableHolyday.DrTimeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetDrTimeNull() { + this[this.tableHolyday.DrTimeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsCrTimeNull() { + return this.IsNull(this.tableHolyday.CrTimeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetCrTimeNull() { + this[this.tableHolyday.CrTimeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsUserNameNull() { + return this.IsNull(this.tableHolyday.UserNameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetUserNameNull() { + this[this.tableHolyday.UserNameColumn] = global::System.Convert.DBNull; + } } /// @@ -3099,17 +3215,6 @@ namespace FBS0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public string cate { - get { - return ((string)(this[this.tablevHoliday_uselist.cateColumn])); - } - set { - this[this.tablevHoliday_uselist.cateColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string gcode { @@ -3121,65 +3226,6 @@ namespace FBS0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public System.DateTime pdate { - get { - try { - return ((global::System.DateTime)(this[this.tablevHoliday_uselist.pdateColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'vHoliday_uselist\' 테이블의 \'pdate\' 열의 값이 DBNull입니다.", e); - } - } - set { - this[this.tablevHoliday_uselist.pdateColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public double term { - get { - if (this.IstermNull()) { - return 0D; - } - else { - return ((double)(this[this.tablevHoliday_uselist.termColumn])); - } - } - set { - this[this.tablevHoliday_uselist.termColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public double termDr { - get { - return ((double)(this[this.tablevHoliday_uselist.termDrColumn])); - } - set { - this[this.tablevHoliday_uselist.termDrColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public string contents { - get { - if (this.IscontentsNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tablevHoliday_uselist.contentsColumn])); - } - } - set { - this[this.tablevHoliday_uselist.contentsColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public string uid { @@ -3220,38 +3266,66 @@ namespace FBS0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public bool IspdateNull() { - return this.IsNull(this.tablevHoliday_uselist.pdateColumn); + public string pdate { + get { + try { + return ((string)(this[this.tablevHoliday_uselist.pdateColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'vHoliday_uselist\' 테이블의 \'pdate\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablevHoliday_uselist.pdateColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public void SetpdateNull() { - this[this.tablevHoliday_uselist.pdateColumn] = global::System.Convert.DBNull; + public int termdr { + get { + try { + return ((int)(this[this.tablevHoliday_uselist.termdrColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'vHoliday_uselist\' 테이블의 \'termdr\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablevHoliday_uselist.termdrColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public bool IstermNull() { - return this.IsNull(this.tablevHoliday_uselist.termColumn); + public string description { + get { + try { + return ((string)(this[this.tablevHoliday_uselist.descriptionColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'vHoliday_uselist\' 테이블의 \'description\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablevHoliday_uselist.descriptionColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public void SettermNull() { - this[this.tablevHoliday_uselist.termColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public bool IscontentsNull() { - return this.IsNull(this.tablevHoliday_uselist.contentsColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public void SetcontentsNull() { - this[this.tablevHoliday_uselist.contentsColumn] = global::System.Convert.DBNull; + public int term { + get { + if (this.IstermNull()) { + return 0; + } + else { + return ((int)(this[this.tablevHoliday_uselist.termColumn])); + } + } + set { + this[this.tablevHoliday_uselist.termColumn] = value; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3265,6 +3339,54 @@ namespace FBS0000 { public void SetuidNull() { this[this.tablevHoliday_uselist.uidColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IspdateNull() { + return this.IsNull(this.tablevHoliday_uselist.pdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetpdateNull() { + this[this.tablevHoliday_uselist.pdateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IstermdrNull() { + return this.IsNull(this.tablevHoliday_uselist.termdrColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SettermdrNull() { + this[this.tablevHoliday_uselist.termdrColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsdescriptionNull() { + return this.IsNull(this.tablevHoliday_uselist.descriptionColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetdescriptionNull() { + this[this.tablevHoliday_uselist.descriptionColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IstermNull() { + return this.IsNull(this.tablevHoliday_uselist.termColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SettermNull() { + this[this.tablevHoliday_uselist.termColumn] = global::System.Convert.DBNull; + } } /// @@ -4821,10 +4943,13 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("termDr", "termDr"); tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("DrTime", "DrTime"); + tableMapping.ColumnMappings.Add("CrTime", "CrTime"); + tableMapping.ColumnMappings.Add("UserName", "UserName"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4850,88 +4975,104 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_termDr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO Holyday - (cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode) -VALUES (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode); -SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime); +SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE Holyday -SET cate = @cate, result = @result, sdate = @sdate, edate = @edate, term = @term, title = @title, contents = @contents, uid = @uid, tolist = @tolist, mail = @mail, mailsend = @mailsend, - reason = @reason, wuid = @wuid, wdate = @wdate, termDr = @termDr, gcode = @gcode -WHERE (idx = @Original_idx) AND (@IsNull_cate = 1 AND cate IS NULL OR - cate = @Original_cate) AND (@IsNull_result = 1 AND result IS NULL OR - result = @Original_result) AND (@IsNull_sdate = 1 AND sdate IS NULL OR - sdate = @Original_sdate) AND (@IsNull_edate = 1 AND edate IS NULL OR - edate = @Original_edate) AND (@IsNull_term = 1 AND term IS NULL OR - term = @Original_term) AND (@IsNull_title = 1 AND title IS NULL OR - title = @Original_title) AND (@IsNull_uid = 1 AND uid IS NULL OR - uid = @Original_uid) AND (@IsNull_mail = 1 AND mail IS NULL OR - mail = @Original_mail) AND (@IsNull_mailsend = 1 AND mailsend IS NULL OR - mailsend = @Original_mailsend) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsNull_termDr = 1 AND termDr IS NULL OR - termDr = @Original_termDr) AND (gcode = @Original_gcode); -SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate"; + this._adapter.UpdateCommand.CommandText = "UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate" + + "] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @u" + + "id, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reas" + + "on, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrT" + + "ime] = @DrTime, [CrTime] = @CrTime WHERE (([idx] = @Original_idx) AND ((@IsNull_" + + "cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result " + + "= 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate " + + "= 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1" + + " AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND" + + " [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [titl" + + "e] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS N" + + "ULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR (" + + "[mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR " + + "([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = " + + "@Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @" + + "Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [" + + "DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND " + + "[CrTime] IS NULL) OR ([CrTime] = @Original_CrTime)));\r\nSELECT idx, cate, result," + + " sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid," + + " wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Hol" + + "yday WHERE (idx = @idx) ORDER BY sdate, edate, uid"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@contents", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "contents", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reason", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_result", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_result", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "result", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_term", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_term", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_term", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "term", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_title", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_title", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_title", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_mail", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mail", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_mailsend", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_mailsend", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "mailsend", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_termDr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_termDr", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_termDr", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "termDr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_DrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_CrTime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CrTime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CrTime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4947,18 +5088,20 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail" + - ", mailsend, reason, wuid, wdate, termDr, gcode\r\nFROM Holyday\r\nWHERE (sdate " + - ">= @sd) AND (edate <= @ed) AND (wuid LIKE @uid)\r\nORDER BY sdate, edate"; + this._commandCollection[0].CommandText = @"SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName +FROM Holyday +WHERE (sdate >= @sd) AND (edate <= @ed) AND (wuid LIKE @uid) AND (gcode = @gcode) +ORDER BY sdate, edate, uid"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail" + - ", mailsend, reason, wuid, wdate, termDr, gcode\r\nFROM Holyday\r\nWHERE gcode =" + - "@gcode and idx = @idx\r\n"; + this._commandCollection[1].CommandText = "SELECT CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason" + + ", result, sdate, term, termDr, title, tolist, uid, wdate, wuid, dbo.getUserName(" + + "uid) AS UserName\r\nFROM Holyday\r\nWHERE (gcode = @gcode) AND (idx = @idx)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4968,7 +5111,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsMSSQL.HolydayDataTable dataTable, string sd, string ed, string uid) { + public virtual int Fill(dsMSSQL.HolydayDataTable dataTable, string sd, string ed, string uid, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((sd == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4988,6 +5131,12 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -4999,7 +5148,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsMSSQL.HolydayDataTable GetData(string sd, string ed, string uid) { + public virtual dsMSSQL.HolydayDataTable GetData(string sd, string ed, string uid, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((sd == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -5019,6 +5168,12 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(uid)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(gcode)); + } dsMSSQL.HolydayDataTable dataTable = new dsMSSQL.HolydayDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -5095,7 +5250,23 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_cate, string Original_result, global::System.Nullable Original_sdate, global::System.Nullable Original_edate, global::System.Nullable Original_term, string Original_title, string Original_uid, global::System.Nullable Original_mail, global::System.Nullable Original_mailsend, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_termDr, string Original_gcode) { + public virtual int Delete( + int Original_idx, + string Original_cate, + string Original_result, + global::System.Nullable Original_sdate, + global::System.Nullable Original_edate, + global::System.Nullable Original_term, + string Original_title, + string Original_uid, + global::System.Nullable Original_mail, + global::System.Nullable Original_mailsend, + string Original_wuid, + System.DateTime Original_wdate, + global::System.Nullable Original_termDr, + string Original_gcode, + global::System.Nullable Original_DrTime, + global::System.Nullable Original_CrTime) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_cate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -5190,6 +5361,22 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.DeleteCommand.Parameters[23].Value = ((string)(Original_gcode)); } + if ((Original_DrTime.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[25].Value = ((double)(Original_DrTime.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[24].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((Original_CrTime.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[27].Value = ((double)(Original_CrTime.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[26].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[27].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -5213,8 +5400,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail public virtual int Insert( string cate, string result, - string sdate, - string edate, + global::System.Nullable sdate, + global::System.Nullable edate, global::System.Nullable term, string title, string contents, @@ -5226,7 +5413,9 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail string wuid, System.DateTime wdate, global::System.Nullable termDr, - string gcode) { + string gcode, + global::System.Nullable DrTime, + global::System.Nullable CrTime) { if ((cate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -5239,18 +5428,18 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.InsertCommand.Parameters[1].Value = ((string)(result)); } - if ((sdate == null)) { + if ((sdate.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[2].Value = ((System.DateTime)(sdate.Value)); + } + else { this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(sdate)); + if ((edate.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[3].Value = ((System.DateTime)(edate.Value)); } - if ((edate == null)) { + else { this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; } - else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(edate)); - } if ((term.HasValue == true)) { this.Adapter.InsertCommand.Parameters[4].Value = ((double)(term.Value)); } @@ -5318,6 +5507,18 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.InsertCommand.Parameters[15].Value = ((string)(gcode)); } + if ((DrTime.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[16].Value = ((double)(DrTime.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value; + } + if ((CrTime.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[17].Value = ((double)(CrTime.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -5341,8 +5542,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail public virtual int Update( string cate, string result, - string sdate, - string edate, + global::System.Nullable sdate, + global::System.Nullable edate, global::System.Nullable term, string title, string contents, @@ -5355,11 +5556,13 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail System.DateTime wdate, global::System.Nullable termDr, string gcode, + global::System.Nullable DrTime, + global::System.Nullable CrTime, int Original_idx, string Original_cate, string Original_result, - string Original_sdate, - string Original_edate, + global::System.Nullable Original_sdate, + global::System.Nullable Original_edate, global::System.Nullable Original_term, string Original_title, string Original_uid, @@ -5369,6 +5572,8 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail System.DateTime Original_wdate, global::System.Nullable Original_termDr, string Original_gcode, + global::System.Nullable Original_DrTime, + global::System.Nullable Original_CrTime, int idx) { if ((cate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -5382,18 +5587,18 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(result)); } - if ((sdate == null)) { + if ((sdate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[2].Value = ((System.DateTime)(sdate.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(sdate)); + if ((edate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[3].Value = ((System.DateTime)(edate.Value)); } - if ((edate == null)) { + else { this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(edate)); - } if ((term.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[4].Value = ((double)(term.Value)); } @@ -5461,101 +5666,129 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail else { this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(gcode)); } - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx)); - if ((Original_cate == null)) { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + if ((DrTime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[16].Value = ((double)(DrTime.Value)); } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_cate)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } - if ((Original_result == null)) { + if ((CrTime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[17].Value = ((double)(CrTime.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); + if ((Original_cate == null)) { this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_result)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_cate)); } - if ((Original_sdate == null)) { + if ((Original_result == null)) { this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_sdate)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_result)); } - if ((Original_edate == null)) { + if ((Original_sdate.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_sdate.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_edate)); - } - if ((Original_term.HasValue == true)) { + if ((Original_edate.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((double)(Original_term.Value)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((System.DateTime)(Original_edate.Value)); } else { this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } - if ((Original_title == null)) { + if ((Original_term.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((double)(Original_term.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_title)); - } - if ((Original_uid == null)) { + if ((Original_title == null)) { this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_uid)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_title)); } - if ((Original_mail.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[32].Value = ((bool)(Original_mail.Value)); - } - else { + if ((Original_uid == null)) { this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } - if ((Original_mailsend.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_uid)); + } + if ((Original_mail.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[34].Value = ((bool)(Original_mailsend.Value)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((bool)(Original_mail.Value)); } else { this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; } + if ((Original_mailsend.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((bool)(Original_mailsend.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((System.DateTime)(Original_wdate)); if ((Original_termDr.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((double)(Original_termDr.Value)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((double)(Original_termDr.Value)); } else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_gcode)); } - this.Adapter.UpdateCommand.Parameters[40].Value = ((int)(idx)); + if ((Original_DrTime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((double)(Original_DrTime.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + } + if ((Original_CrTime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((double)(Original_CrTime.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[46].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -5571,6 +5804,48 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail } } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] + public virtual int Update( + string cate, + string result, + global::System.Nullable sdate, + global::System.Nullable edate, + global::System.Nullable term, + string title, + string contents, + string uid, + string tolist, + global::System.Nullable mail, + global::System.Nullable mailsend, + string reason, + string wuid, + System.DateTime wdate, + global::System.Nullable termDr, + string gcode, + global::System.Nullable DrTime, + global::System.Nullable CrTime, + int Original_idx, + string Original_cate, + string Original_result, + global::System.Nullable Original_sdate, + global::System.Nullable Original_edate, + global::System.Nullable Original_term, + string Original_title, + string Original_uid, + global::System.Nullable Original_mail, + global::System.Nullable Original_mailsend, + string Original_wuid, + System.DateTime Original_wdate, + global::System.Nullable Original_termDr, + string Original_gcode, + global::System.Nullable Original_DrTime, + global::System.Nullable Original_CrTime) { + return this.Update(cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, Original_idx, Original_cate, Original_result, Original_sdate, Original_edate, Original_term, Original_title, Original_uid, Original_mail, Original_mailsend, Original_wuid, Original_wdate, Original_termDr, Original_gcode, Original_DrTime, Original_CrTime, Original_idx); + } } /// @@ -5695,15 +5970,14 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "vHoliday_uselist"; tableMapping.ColumnMappings.Add("idx", "idx"); - tableMapping.ColumnMappings.Add("cate", "cate"); tableMapping.ColumnMappings.Add("gcode", "gcode"); - tableMapping.ColumnMappings.Add("pdate", "pdate"); - tableMapping.ColumnMappings.Add("term", "term"); - tableMapping.ColumnMappings.Add("termDr", "termDr"); - tableMapping.ColumnMappings.Add("contents", "contents"); tableMapping.ColumnMappings.Add("uid", "uid"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("pdate", "pdate"); + tableMapping.ColumnMappings.Add("termdr", "termdr"); + tableMapping.ColumnMappings.Add("description", "description"); + tableMapping.ColumnMappings.Add("term", "term"); this._adapter.TableMappings.Add(tableMapping); } @@ -5720,18 +5994,18 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, cate, gcode, pdate, term, termDr, contents, uid, wuid, wdate\r\nFROM " + - " vHoliday_uselist\r\nWHERE (uid = @user) AND (pdate BETWEEN @sd AND @ed) AND (g" + - "code = @gcode)\r\nORDER BY pdate DESC"; + this._commandCollection[0].CommandText = "SELECT idx, gcode, pdate, termdr, description, uid, wuid, wdate, term\r\nFROM " + + "vHoliday_uselist\r\nWHERE (uid = @user) AND (pdate BETWEEN @sd AND @ed) AND (gcod" + + "e = @gcode)\r\nORDER BY pdate DESC, uid"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT idx, cate, gcode, pdate, term, termDr, contents, uid, wuid, wdate\r\nFROM " + - " vHoliday_uselist\r\nWHERE gcode = @gcode and idx =@idx\r\n"; + this._commandCollection[1].CommandText = "SELECT description, gcode, idx, pdate, term, termdr, uid, wdate, wuid FROM vHolid" + + "ay_uselist WHERE (gcode = @gcode) AND (idx = @idx)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd index 2956f9e..2f03214 100644 --- a/SubProject/FBS0000/dsMSSQL.xsd +++ b/SubProject/FBS0000/dsMSSQL.xsd @@ -232,7 +232,7 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM - DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode)) + DELETE FROM [Holyday] WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime))) @@ -258,107 +258,105 @@ SELECT idx, bidx, header, cate, title, contents, [file], guid, wuid, wdate FROM + + + + - - INSERT INTO Holyday - (cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode) -VALUES (@cate,@result,@sdate,@edate,@term,@title,@contents,@uid,@tolist,@mail,@mailsend,@reason,@wuid,@wdate,@termDr,@gcode); -SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate + + INSERT INTO [Holyday] ([cate], [result], [sdate], [edate], [term], [title], [contents], [uid], [tolist], [mail], [mailsend], [reason], [wuid], [wdate], [termDr], [gcode], [DrTime], [CrTime]) VALUES (@cate, @result, @sdate, @edate, @term, @title, @contents, @uid, @tolist, @mail, @mailsend, @reason, @wuid, @wdate, @termDr, @gcode, @DrTime, @CrTime); +SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday WHERE (idx = SCOPE_IDENTITY()) ORDER BY sdate, edate, uid - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode + SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday -WHERE (sdate >= @sd) AND (edate <= @ed) AND (wuid LIKE @uid) -ORDER BY sdate, edate +WHERE (sdate >= @sd) AND (edate <= @ed) AND (wuid LIKE @uid) AND (gcode = @gcode) +ORDER BY sdate, edate, uid + - - UPDATE Holyday -SET cate = @cate, result = @result, sdate = @sdate, edate = @edate, term = @term, title = @title, contents = @contents, uid = @uid, tolist = @tolist, mail = @mail, mailsend = @mailsend, - reason = @reason, wuid = @wuid, wdate = @wdate, termDr = @termDr, gcode = @gcode -WHERE (idx = @Original_idx) AND (@IsNull_cate = 1 AND cate IS NULL OR - cate = @Original_cate) AND (@IsNull_result = 1 AND result IS NULL OR - result = @Original_result) AND (@IsNull_sdate = 1 AND sdate IS NULL OR - sdate = @Original_sdate) AND (@IsNull_edate = 1 AND edate IS NULL OR - edate = @Original_edate) AND (@IsNull_term = 1 AND term IS NULL OR - term = @Original_term) AND (@IsNull_title = 1 AND title IS NULL OR - title = @Original_title) AND (@IsNull_uid = 1 AND uid IS NULL OR - uid = @Original_uid) AND (@IsNull_mail = 1 AND mail IS NULL OR - mail = @Original_mail) AND (@IsNull_mailsend = 1 AND mailsend IS NULL OR - mailsend = @Original_mailsend) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate) AND (@IsNull_termDr = 1 AND termDr IS NULL OR - termDr = @Original_termDr) AND (gcode = @Original_gcode); -SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate + + UPDATE [Holyday] SET [cate] = @cate, [result] = @result, [sdate] = @sdate, [edate] = @edate, [term] = @term, [title] = @title, [contents] = @contents, [uid] = @uid, [tolist] = @tolist, [mail] = @mail, [mailsend] = @mailsend, [reason] = @reason, [wuid] = @wuid, [wdate] = @wdate, [termDr] = @termDr, [gcode] = @gcode, [DrTime] = @DrTime, [CrTime] = @CrTime WHERE (([idx] = @Original_idx) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_result = 1 AND [result] IS NULL) OR ([result] = @Original_result)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_term = 1 AND [term] IS NULL) OR ([term] = @Original_term)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_mail = 1 AND [mail] IS NULL) OR ([mail] = @Original_mail)) AND ((@IsNull_mailsend = 1 AND [mailsend] IS NULL) OR ([mailsend] = @Original_mailsend)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_termDr = 1 AND [termDr] IS NULL) OR ([termDr] = @Original_termDr)) AND ([gcode] = @Original_gcode) AND ((@IsNull_DrTime = 1 AND [DrTime] IS NULL) OR ([DrTime] = @Original_DrTime)) AND ((@IsNull_CrTime = 1 AND [CrTime] IS NULL) OR ([CrTime] = @Original_CrTime))); +SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName FROM Holyday WHERE (idx = @idx) ORDER BY sdate, edate, uid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -382,15 +380,17 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail + + + - SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode + SELECT CrTime, DrTime, cate, contents, edate, gcode, idx, mail, mailsend, reason, result, sdate, term, termDr, title, tolist, uid, wdate, wuid, dbo.getUserName(uid) AS UserName FROM Holyday -WHERE gcode =@gcode and idx = @idx - +WHERE (gcode = @gcode) AND (idx = @idx) @@ -405,14 +405,14 @@ WHERE gcode =@gcode and idx = @idx - SELECT idx, cate, gcode, pdate, term, termDr, contents, uid, wuid, wdate + SELECT idx, gcode, pdate, termdr, description, uid, wuid, wdate, term FROM vHoliday_uselist WHERE (uid = @user) AND (pdate BETWEEN @sd AND @ed) AND (gcode = @gcode) -ORDER BY pdate DESC +ORDER BY pdate DESC, uid - - + + @@ -421,24 +421,20 @@ ORDER BY pdate DESC - - - - - + + + + - SELECT idx, cate, gcode, pdate, term, termDr, contents, uid, wuid, wdate -FROM vHoliday_uselist -WHERE gcode = @gcode and idx =@idx - + SELECT description, gcode, idx, pdate, term, termdr, uid, wdate, wuid FROM vHoliday_uselist WHERE (gcode = @gcode) AND (idx = @idx) @@ -642,6 +638,15 @@ WHERE gcode = @gcode and idx =@idx + + + + + + + + + @@ -649,13 +654,6 @@ WHERE gcode = @gcode and idx =@idx - - - - - - - @@ -663,16 +661,6 @@ WHERE gcode = @gcode and idx =@idx - - - - - - - - - - @@ -688,6 +676,22 @@ WHERE gcode = @gcode and idx =@idx + + + + + + + + + + + + + + + + @@ -708,7 +712,6 @@ WHERE gcode = @gcode and idx =@idx - \ No newline at end of file diff --git a/SubProject/FBS0000/dsMSSQL.xss b/SubProject/FBS0000/dsMSSQL.xss index b1b351b..5d9635d 100644 --- a/SubProject/FBS0000/dsMSSQL.xss +++ b/SubProject/FBS0000/dsMSSQL.xss @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index dddc286..e8d5df6 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -114,6 +114,9 @@ True DSMail.xsd + + dsMSSQL.xsd + True True diff --git a/SubProject/FCM0000/FCM0000.csproj.user b/SubProject/FCM0000/FCM0000.csproj.user new file mode 100644 index 0000000..fe7290b --- /dev/null +++ b/SubProject/FCM0000/FCM0000.csproj.user @@ -0,0 +1,13 @@ + + + + + + + + + + ko-KR + false + + \ No newline at end of file diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index f5ef3cb..3ba0d66 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -1005,7 +1005,7 @@ namespace FCM0000 { this.columncate.MaxLength = 50; this.columnscale.DefaultValue = ((double)(1D)); this.columnunit.DefaultValue = ((string)("EA")); - this.columnunit.MaxLength = 10; + this.columnunit.MaxLength = 50; this.columnimport.MaxLength = 1; this.columngcode.MaxLength = 10; } @@ -9803,7 +9803,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -9823,7 +9823,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp" + @@ -9898,6 +9898,17 @@ ORDER BY name, idx"; this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[9].Connection = this.Connection; + this._commandCollection[9].CommandText = "UPDATE Items\r\nSET name = @name, model = @model, unit = @unit, disable = @d" + + "isable\r\nWHERE (gcode = @gcode) AND (sid = @Original_sid)"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sid", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10602,6 +10613,64 @@ ORDER BY name, idx"; return new global::System.Nullable(((int)(returnValue))); } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int UpdateMatrial(string name, string model, string unit, global::System.Nullable disable, string gcode, string Original_sid) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9]; + if ((name == null)) { + command.Parameters[0].Value = global::System.DBNull.Value; + } + else { + command.Parameters[0].Value = ((string)(name)); + } + if ((model == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(model)); + } + if ((unit == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(unit)); + } + if ((disable.HasValue == true)) { + command.Parameters[3].Value = ((bool)(disable.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((gcode == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(gcode)); + } + if ((Original_sid == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Original_sid)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/SubProject/FCM0000/dsMSSQL.cs b/SubProject/FCM0000/dsMSSQL.cs new file mode 100644 index 0000000..c1fbd12 --- /dev/null +++ b/SubProject/FCM0000/dsMSSQL.cs @@ -0,0 +1,15 @@ +namespace FCM0000 +{ + + + partial class dsMSSQL + { + } +} + +namespace FCM0000.dsMSSQLTableAdapters { + + + public partial class ItemsTableAdapter { + } +} diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 89c7521..b4dd974 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -76,7 +76,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp - + @@ -144,7 +144,7 @@ where gcode = @gcode and isnull(replace(name,' ','') + replace(model,' ',''),'') - + SELECT COUNT(*) FROM Items @@ -213,7 +213,7 @@ ORDER BY name, idx - + SELECT ISNULL(idx, - 1) AS Expr1 @@ -227,6 +227,52 @@ WHERE (gcode = @gcode) AND (ISNULL(name, N'') = @name) AND (ISNULL(model, N'') + + + + UPDATE Items +SET name = @name, model = @model, unit = @unit, disable = @disable +WHERE (gcode = @gcode) AND (sid = @Original_sid) + + + + + + + + + + + + + UPDATE Items +SET name = @name, model = @model,unit = @unit, disable = @disable +WHERE (gcode = @gcode,sid= @Original_sid); + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1435,7 +1481,7 @@ ORDER BY pdate - + @@ -1502,7 +1548,7 @@ ORDER BY pdate - + @@ -1526,7 +1572,7 @@ ORDER BY pdate - + @@ -1578,7 +1624,7 @@ ORDER BY pdate - + @@ -1646,7 +1692,7 @@ ORDER BY pdate - + @@ -1735,7 +1781,7 @@ ORDER BY pdate - + @@ -1848,7 +1894,7 @@ ORDER BY pdate - + @@ -1913,7 +1959,7 @@ ORDER BY pdate - + @@ -2054,7 +2100,7 @@ ORDER BY pdate - + @@ -2153,7 +2199,7 @@ ORDER BY pdate - + @@ -2183,7 +2229,7 @@ ORDER BY pdate - + diff --git a/SubProject/FCM0000/dsMSSQL.xss b/SubProject/FCM0000/dsMSSQL.xss index 12af213..8d5ef5e 100644 --- a/SubProject/FCM0000/dsMSSQL.xss +++ b/SubProject/FCM0000/dsMSSQL.xss @@ -6,8 +6,8 @@ --> - - + + diff --git a/SubProject/FCM0000/fMaterial_Import.cs b/SubProject/FCM0000/fMaterial_Import.cs index 99754ef..c6fef5d 100644 --- a/SubProject/FCM0000/fMaterial_Import.cs +++ b/SubProject/FCM0000/fMaterial_Import.cs @@ -219,6 +219,8 @@ namespace FCM0000 int err = 0; //12,13 + + var dtTarget = new dsMSSQL.ItemsDataTable(); try { var sheet = book.getSheet((int)nudSheetNo.Value); @@ -226,14 +228,16 @@ namespace FCM0000 var MaxRow = (int)nudE.Value; for (int r = MinRow; r <= MaxRow; r++) { + cnt += 1; if (this.progressBar1.Value < this.progressBar1.Maximum) this.progressBar1.Value += 1; //화면 업데이트 - this.Text = string.Format("{0}/{1} : {2:N2}% 추가:{3},오류:{4},넘김:{5}", progressBar1.Value, progressBar1.Maximum, ((progressBar1.Value * 1.0) / progressBar1.Maximum) * 100.0,add,err,dup); + this.Text = string.Format("{0}/{1} : {2:N2}% 추가:{3},오류:{4},넘김:{5}", r, MaxRow, ((progressBar1.Value * 1.0) / progressBar1.Maximum) * 100.0,add,err,dup); - Application.DoEvents(); + //if(cnt % 10 == 0) + Application.DoEvents(); var v_sid = sheet.readStr(r, 0); v_sid = v_sid.Replace("_", "").Replace("-", "").Replace(" ", "").Replace(".", ""); @@ -263,7 +267,11 @@ namespace FCM0000 //중복은 처리하지 않는다. if (ta.ExistSID("EET1P", v_sid) > 0) { - dup += 1; + //해당 sid데이터가 잇으므로 업데이트를 한다 + Boolean disable = v_del == "X" ? true : false; + + dup += ta.UpdateMatrial(v_name, v_model, v_cate, disable, "EET1P", v_sid); + // dup += 1; continue; } @@ -299,9 +307,11 @@ namespace FCM0000 newdr.wdate = DateTime.Now; //newdr.unit = "--"; newdr.import = textBox2.Text; - ta.Update(newdr); - newdr.Delete(); - add += 1; + dt.Rows.Add(newdr); + add += ta.Update(newdr); + newdr.Delete(); + dtTarget.AcceptChanges(); + //add += 1; } catch (Exception ex) { @@ -309,7 +319,7 @@ namespace FCM0000 } - Application.DoEvents(); + //Application.DoEvents(); diff --git a/SubProject/FCOMMON/FCOMMON.csproj.user b/SubProject/FCOMMON/FCOMMON.csproj.user new file mode 100644 index 0000000..5bef86d --- /dev/null +++ b/SubProject/FCOMMON/FCOMMON.csproj.user @@ -0,0 +1,6 @@ + + + + ProjectFiles + + \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index a9ee658..ba80755 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,31 +30,32 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -126,8 +127,8 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -741,6 +742,18 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 616); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1184, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -782,7 +795,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -790,7 +803,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -798,166 +811,176 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 49F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 49F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 37F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 24F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 43F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType6; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사"; this.fpSpread1_Sheet1.Columns.Get(12).Width = 45F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 33F; - numberCellType7.DecimalPlaces = 0; - numberCellType7.NegativeRed = true; - numberCellType7.NullDisplay = "--"; - numberCellType7.Separator = ","; - numberCellType7.ShowSeparator = true; - numberCellType7.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType7; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 33F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.NegativeRed = true; - numberCellType8.NullDisplay = "--"; - numberCellType8.Separator = ","; - numberCellType8.ShowSeparator = true; - numberCellType8.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType8; + numberCellType3.DecimalPlaces = 0; + numberCellType3.MaximumValue = 9999999999999.99D; + numberCellType3.MinimumValue = -9999999999999.99D; + numberCellType3.NegativeRed = true; + numberCellType3.NullDisplay = "--"; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + numberCellType3.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; + numberCellType4.DecimalPlaces = 0; + numberCellType4.MaximumValue = 9999999999999.99D; + numberCellType4.MinimumValue = -9999999999999.99D; + numberCellType4.NegativeRed = true; + numberCellType4.NullDisplay = "--"; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + numberCellType4.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 49F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType9; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 14F; this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(21).Label = "관련프로젝트"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 45F; this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType10; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType35; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(23).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType37; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 32F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType38; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(26).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(27).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(27).Tag = "isdel"; @@ -968,18 +991,6 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 616); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1184, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1080,8 +1091,8 @@ private System.Windows.Forms.ToolStripMenuItem sC검색ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cRCF검색ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton3; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.Label label1; private System.Windows.Forms.ToolStripButton toolStripButton4; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 575d24b..9842b63 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -234,57 +234,57 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANJSURBVDhPtZBdTFN3GIdJdrdwsZnVMIUsc8lIzM6FjAUi - HR3hIxtgTLUUCNWyOooSKtBiEBkcuhUtuCKUrrTKGFCpFUdQsLN8BIImjNaunWeMQTfPCs5+2FWKx4kk - xN+a2mVbtts9t+/7PP/835i/o1kgY8846pvIb6RzdTcrtqqmjmyVm0vmDg0XNBYMDb0gHr3/YnT136io - Rk6LvY6+8fN1TLinYF4Zx+0HDhgdF3HQkKutGlw5drSXpj/UuzhR5S/anKe4ph/6MOmeQJ/rEqodjZB9 - S2J4+Sq4/bnBwj7dG2E52HszANnAXfDanNyoGn55gdz2ibWWmV6ZRuuCBiLbcZRaj6N7sRfa2S7kaDOO - lfXQ2vbrXpi/Z6Cb9CO32cbk1MxtiwTIeZnC7BrD+aUBCG0SFM2JccLeDIPDgBx1urNUt5h0WL20NXrn - EVTjAQxZQ6juWcK7lZOKSODEbLnT8ssEJPZTKA7L4nkpDC4TJKajSFOmsAXqH2+1mz34yh5CjfE+FNf8 - UI7cQ/KRMWckUGEp3bzm/hpV9ga0UmpcXh7GWUsr9n76zhclnUv8g8o7Ty7Pr0Fm9KD8wirEulWcG/OC - EFwJRQLCEX5o3mfDleURaGbU4Hy2N5gqT24alZKvaGq/jMsjbVTXDS/qjF4c6nBD0E5DOexB4oEBJhLg - D+5zds10ILuL8yC9LUVqkRYmPBUKGzZ4/CDzwX4is/YWdfbqr5D03AOv5S7KtauQdLuwK1///At5uixZ - Zidb7Kw5vHOzrEy1IRAwTNPHeFxUDCY9k0irHKfkphV8pHYjv34ZCpMXudXTiM/ueH5EnDz58mZlhf6p - SLT5uEWBNZMBwcE+rOfvB5OUSiSLRqn6fholrTTI8B0EZ74Ly+eYOHYLKxJ4JpGwNoRC5pH+czwcGoRH - 3oDA+W6svZeFYCJBvFVsoqr1P4G86EFh823sKTAijq3kReQ/+Z3L4zEiER6SjQjoNfB3qvBbShp88YnE - m9x+StS+iEyxBTsyVDSLffr9qPZPQmnp2etJqXSAXwSvpBJ+4m34tscTr+V1UwlZHdZXM9rkLA4ZG13/ - b/y7d8cGXk+U+3fssvpYCfC9tJ2Ijv4vYmL+AAft4bj62SxTAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANISURBVDhPtZBdTFN3GIdJvDNcOGMNKmSZy0ainouhC0Qq + HeMjG2C0sxQMlbKqRQkVaDGICIdqka+0QulKq4yBlVpxBK12VjAYNWEUu3aeIUIntaD2w1qpHkVJiD9J + 7bIt83bP7fs+zz//N+KfqMbIyHpbZQ35q3i44mbRQsm13QuFprzhXX3Z1dm9vUuExsdLw6v/RU5Vs+qs + Fc4r9y9jwHUNpumruP3EBr3tDHboMtQlPdP793VOOb/XOlhh5W+a7IfZhrtdGHQNoMtxFqW2akh+I9E3 + eQHbuzMCOV2aTxflQOdNPySnp8BpsrPD6uLLY+Tyo5Zyemh6CI1jKghGD6DAcgDt451Q32hDujp5/54O + p1px2QPTHzQ0gz5k1Fro9LLh5aEAOSKRmRyXcHLiNPijIuQOC3HQWgudTYd05RZ7gWY8Lr/13oLxzgvI + r/rRawmitGMCW4oHZaHAwRuFdvODAYish7FzURaOiKFzGCAy7ENiQzwzTzl+S2Fy42drEGX6x5Bd9KGh + /yE2Coz2UKDIXDB/0fULSqxVaKSUODfZh2ZzIzYf+/LHvNYJ7nf1d+bOjcxConej8NQMhJoZnLjkwQbe + +WAokN/PDY54R3F+sh+q60qwmjcHEqSbaoxicoWq/KeoTNJCtV3xoELvwa4WF3gKJxr63Pic3U2HAtye + rfa26y1IbWM9SWqKF5vFOTFv+Pyq1zu4AfrbbcTX5beo5guPIOp4CE7dFArVMxC1O7A2S/P+C5maVElK + K1NoL8tfM793r3yOx6PpmiN4mbsTdFIKkVhspqSGaexRupBVOQmZwYOM0iGsSWt5f0QcOvTRm+Ii7WuB + YP5lnQyzBh0CPV14nrUNdFwCsUlgpCq7nchrdIJcvAOv/ndEpynoKGYdIxR4KxIx5vh8+oX2Bzzr7YFb + WgX/yXbMfpWKQCxBrM89S5Vq/wR5xo2c2tv4IluPKGYDJyT/xSs2h0MLBHhGVsOvVcHXKsfT+ER4o2OJ + z9jdlEAxjhShGauT5U4G8/g3Ye3fBBOT0p7HJTj93Fx4RMXwERvhXRlNfJyppmJSWyyrkpukDBYZGV7/ + ML516yL9n8RKfavWWryMGHiXrSTCo/+LiIh3thHhkShbSWAAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKQSURBVDhPzZLdS1NhHMcPdNc/0V1ElhiiFUEQRNFVBJa9 - 0oUEFYJhUASC7MKXUCeyuXzrRRCtzVxOiYI0pKmb22zq5o7HTeeWokPdzvvx7Ox8ezYHeeV1P54vz3Px - +3y/v4fnof7vslpvHmnutTvfDP1Eq82NdrsPHbZxdNYWH823HF7NH+xO268ImA0Bq9sK3BEODnccTW8d - znzL4dU+NINgnMNMVMLUiohJovl1GWbrJPItFLU4WuxfG7ujxsbvHdBddfnruUjLJxfCCQVTEQHOsIAx - mocvpsD02fvPIDhUquh6BoBOVlb757ScgHnQjUCcxwSzD2fljSto6nMeMLCXpHRNhvLHCHGlDWL0PaS1 - QejpJKzfpvDDF4M3KmI6KsND0kfmeLR2DsBYUfIwZ8D0n+EyKktgM4SwCVzQgJ2Zp0h4KhFxNWDU0UEm - mYaFvEDLRxeMnTZ4hi0YNZRxNTeO3aYYW4maljaRDJixO9uIrYnnkLbc0DWOiM/vqdxEenoXcxNf4Ki/ - pQeGm9FddVEkE5xVc/fPKEQSoIk5UJNoKBtmyPE6SKsvIC4/hkDfhyaEMGI4oXa/vCJZqi6BYnpK93RN - gsa5kE5+h7o9iL3NHgI2QYrWQApXQlx6AGHxOviFy9B4P4JdRXLu/tkKdpUqGZWDujOCva0+ktoOOUZS - V7KpjyCEysEHroGbuwB2tghpzoug6aBBa5Gsq0kC90JZb4O8ZiBwNUSmgsBlJPUqOP95sL5CpDzHiQH5 - XITJ4xS19LpwQ0qFUkl6ICMsvwPPWMDTRvChenCBWnALr8DOV4P1V4L9/QT8+pgeMBan8jhF0fUFz+jG - U/2BhpOJhcbT8qFqyO0sXVdg2qcp6i9y+ENgXNWxCwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKOSURBVDhPzZHfS1NhGMcPdNc/0V1BZhaiFUEQRNFVBFYW + RRcSVAiGQREI6oU/Qp2Yc7nslyBWm7qcEgVaSFP306Ye3fG46dxUdKjbzm/Pzs63d3OQV1738H553ovn + 8/0+Ly/1f5fFcuNQc7fN8XrgF1qtLnTYfOi0/oS5uvBwbuTgav5oc1h/h8CuC1jeUuAKcbC7omh6Z3fk + Rg6ujgE35qIc3GEJE0sixolm1mQYLePIjVDU/HChf2WkVI2M3tmn2+rit7Ohli9OBGMKJkICHEEBowwP + X0RBe7/3nwHdX6zoehqATk5Ge/eUHIOxzwU6ymOM3YMz8kYVNPU49hnYihK6JkNZNUBcaoMY/gBppQ96 + Kg7L9wmM+CLwhkVMhmV4SPrQNI9W8ycYyoruZw3Y3tNcWk0S2Agh2A5urhbb7seIecoRcjZg2N5JNpmE + ifxAy2cnDGYrPIMmDNeUcFXXj5RSrLVITUkbiNNG7Ew1YnPsKaRNF3SNI+JzPZHdSE/tYHrsKwbrbur0 + YDO6Ki6IZIMzavb9aYVIAjQxC2oSA2XdCDlaB2n5GcTFhxCYu9CEAOw1x9Su55clU8VFUGxX8a6uSdA4 + J1LxH1C3+rC78ZaATZDCVZCC5RAX7kGYvwZ+9hI03g/aXCBn358p+k2xklY5qNtD2N3sIakdkCMkdSmT + +gBC4BZ4+iq46fNITp1CivOCfrXfoLVA1tU4gbuhrLVBXqklcCVEtozAJST1Cjj/OSR9J5HwHCUGbmSY + HE5RCy/z16XEfGIn8CktLL4Hz5rAMwbwgXpwdDW42RdIzlQi6S9H8s8jcKsjOm0oTORwimLq854wjSd6 + 6YbjsZnGfPlANWR7kqnLa9+jKeovOLlDMB5ltqwAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZPtS1NRHMf3Kv8G60Wvi9TKnlDoYalNjSzL - VEp8mlM0NdGVYVZMI1MXmuigIpKiFxXSg67p1JxzuuGMTLM0m48Jakvd09F77/x27t1wBkE/+HBenPP7 - cH7fe66Ir/DrupSTVUZtTLXx96kqo4uuREDJryYSU9VHou4ahkPl+tqdcS+2CE2bK/J2j37RRn5Z7YSz - OlZhtfv4ZeMh+DpnQ+nbaUjrxpySXLWft9VT0RWGhRXnGtc3ycA0xcI0zcI4ycIwsQbd91VoRhxYZYHm - by6Uvp5C+v0x118SKnBRAQZmOHycYenKol+QrKF7fBVtI04qcGNgjoPpJ4Ny9TTE1zqfC80JSrHlfFXc - uqzhLNLrz6G+tRFlTUqIbwbiGEVSHoJwxQHUNNcIo9gJi/klJ8JLu1lBEF8tftU51IKWsUeoNxYJkuS6 - KBQ9S0JeYyKkqtNIU6WheXAeLcN2vPu8gmWaU4SihwgCSa3EL7YynzOOduHpkAKVulxBktIQTZvPIOtB - JvTjDmGUjjEXtDSHJQeDiLJej4CvyIpuUvA4FeZxA1SmK7jTXogE5XGk1MXBPOmEmQbLB6z/4cnESgXh - ik2CIzduMgeLtyOpVoKBH30o78qGQl2AxHthaNS9wadZFmYabN8Eg17Kgo2B+JZXsFfuLwuWb0Pekwu4 - 2BCJCzUnBEmBOgnypkx6kzDw+wPTHPr5T0yx0SAPlxg8gmC5/2ywfCs95I/gIn/EVoYh52Eq9CNalGuL - kf0yFdKGeJipwETfhpEKCONGiFznG+FoSQ+ZWyYYnOUEukd/4vLjLGTQRpkqEYVPLm3s8dA3h/35nT5B - 6FUdmbH6BP/DQUfYndnmExwq+OC0LDjW/3X4XxCGcweka+zedhpkVrtlfoXYLIsuNwWWBRfGvSzaGQE+ - efqv8S/RzbndyzuS33/xtotE+7Jac4Kkre17ZFprkKyVbJDhITBD40GqIQFSzdKutPcdganqdJFIJPoD - 0NqjIcbQ72sAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLtS1NhGMb3Kf+FrA99jTCllF6JamlNLcrK + VMrSOaf0Yg1dmGTGXKgzQwsnVERS9KFCetFNm1ZzTjeakVmWpkunSU6XupdztnPOunrO2XAFQjf8eD48 + 5/px7uscET9Jl405+2sthoPXLb8OaCwUOWmBOv600gdr++iUGvOn7UpTw7r0xyuE0N+TfK3H5HTTc3Nu + inN5/XB5Isy5eWh8mXaj/IUDeTeHfZJzuqhwNDSp1WbngtfP9Y0zsE6wsDpYWMZZmL8HYPzmR/uQF34W + aP1KofzZBC+h/pGkVPVQi74A+ic5vJ9kycninSAJoHvUj1dDPiIIon+ag/UHA7XOAfGl14+EcGbdbvsx + TfpvufYI8hqPorGjGZUtdRBXxGI3QaLehiTVJtS31gureGgWM/M+JF3uZgVBRq346evBNrSN3EWjpUSQ + nLqVgpKH2ShqzoKs6RCkTVK0Dsyg7ZMHLz8ugqyLvaoeWhBIGiRRaTXnOcvwWzwYVEFjPCdIcrSpJJyG + wtsFMI16hVW6RigYSA/zXgZ7K3tDAn6Sq7tpxb1c2EbNaLJeRFVnMTLr9iDnVjps4z7YSLF8waaxUCcu + IkhS/SXYeaWC2Vy6BtkNEvSP9UH99jRUOgWybiSi2fgcH6ZY2Eixfd8Z9BKcbgbiq2HBRmW0PF65GkX3 + j+OENhnH6/cJEoUuG8qWAvImieDv+x0c3vGfmOAmRe4oM4cE8cqVU/HKVeShaMSXROOwJhFn7uTCNGSA + 2lCK009yIdNmwEYEVvJvWIiAZoLYWmKMrLCrrIeeXqAxMMUJdA//wIV7hcgnQXlTForvn1264/EFOCSc + 74oItl000pOuiOB/eMkKcQUdEcEWxRvf2Izn93IPLwcVYIPrpXpPOE6KLOy0/1yk3GNOX9A+S8HupDAa + ZtbDCPDNe2gObooJshy3sPak/nM4LhIlFHaciZO1d26QG1xx8nZ6ifwQsfn6EDI9HSPTz8dI9V2xubo8 + kUgk+gNtjaLf4YsIzAAAAABJRU5ErkJggg== diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs index 3371e7a..c08fe3a 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs @@ -368,7 +368,7 @@ namespace FEQ0000 if (nudQty.Value > 0) { if (cf_qty == libxl.CellType.CELLTYPE_NUMBER) - 수량 = sheet.readNum(r, (int)nudQty.Value - 1).ToString("N0"); + 수량 = sheet.readNum(r, (int)nudQty.Value - 1).ToString("N0").Replace(",", "").Trim(); else if (cf_qty == libxl.CellType.CELLTYPE_STRING) 수량 = sheet.readStr(r, (int)nudQty.Value - 1).Replace(",", "").Trim(); } diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index 6e9162e..86bc34d 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -390,6 +390,7 @@ namespace FPJ0000 { funcEdit(); } + void funcEdit() { var drv = this.bs.Current as DataRowView; diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs index 1a24812..2b75eb5 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs @@ -362,6 +362,23 @@ namespace FPJ0000.JobReport } } + double hrs2 = 0.0; + if(double.TryParse(tbHrs.Text,out hrs2) ==false) + { + FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요"); + tbHrs.Focus(); + tbHrs.SelectAll(); + return; + } + + //if(hrs2 > 8) + //{ + // FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요"); + // tbHrs.SelectAll(); + // tbHrs.Focus(); + // return; + //} + this.dr.uid = this.cmbUser.SelectedValue.ToString(); this.dr.pdate = dtPdate.Value.ToShortDateString(); this.dr.status = cmbState.Text; diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index a616cfe..aa6e862 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -42,29 +42,31 @@ FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType26 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType27 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo3 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); + this.button3 = new System.Windows.Forms.Button(); + this.panel6 = new System.Windows.Forms.Panel(); this.button2 = new System.Windows.Forms.Button(); this.panel5 = new System.Windows.Forms.Panel(); this.btConf = new System.Windows.Forms.Button(); @@ -72,6 +74,7 @@ this.button1 = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); + this.radSortIpNum = new System.Windows.Forms.RadioButton(); this.requestTextBox = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -87,10 +90,10 @@ this.nameTextBox = new System.Windows.Forms.TextBox(); this.pdateTextBox = new System.Windows.Forms.TextBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.prb3 = new arCtl.arLabel(); this.prb2 = new arCtl.arLabel(); this.prb5 = new arCtl.arLabel(); this.prb4 = new arCtl.arLabel(); + this.prb3 = new arCtl.arLabel(); this.prbPO = new arCtl.arLabel(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -132,8 +135,8 @@ this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); pdateLabel = new System.Windows.Forms.Label(); requestLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); @@ -240,6 +243,8 @@ // // panel1 // + this.panel1.Controls.Add(this.button3); + this.panel1.Controls.Add(this.panel6); this.panel1.Controls.Add(this.button2); this.panel1.Controls.Add(this.panel5); this.panel1.Controls.Add(this.btConf); @@ -251,9 +256,32 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1217, 170); + this.panel1.Size = new System.Drawing.Size(1345, 170); this.panel1.TabIndex = 0; // + // button3 + // + this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.button3.Dock = System.Windows.Forms.DockStyle.Left; + this.button3.Image = ((System.Drawing.Image)(resources.GetObject("button3.Image"))); + this.button3.Location = new System.Drawing.Point(868, 0); + this.button3.Name = "button3"; + this.button3.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.button3.Size = new System.Drawing.Size(87, 119); + this.button3.TabIndex = 40; + this.button3.Text = "비용요약"; + this.button3.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // panel6 + // + this.panel6.Dock = System.Windows.Forms.DockStyle.Left; + this.panel6.Location = new System.Drawing.Point(861, 0); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(7, 119); + this.panel6.TabIndex = 39; + // // button2 // this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; @@ -324,6 +352,7 @@ // panel2 // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel2.Controls.Add(this.radSortIpNum); this.panel2.Controls.Add(this.requestTextBox); this.panel2.Controls.Add(this.statusTextBox); this.panel2.Controls.Add(statusLabel); @@ -351,6 +380,16 @@ this.panel2.Size = new System.Drawing.Size(579, 119); this.panel2.TabIndex = 35; // + // radSortIpNum + // + this.radSortIpNum.AutoSize = true; + this.radSortIpNum.Location = new System.Drawing.Point(241, 92); + this.radSortIpNum.Name = "radSortIpNum"; + this.radSortIpNum.Size = new System.Drawing.Size(71, 16); + this.radSortIpNum.TabIndex = 30; + this.radSortIpNum.Text = "입고수량"; + this.radSortIpNum.UseVisualStyleBackColor = true; + // // requestTextBox // this.requestTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "process", true)); @@ -406,7 +445,7 @@ // radSortNo // this.radSortNo.AutoSize = true; - this.radSortNo.Location = new System.Drawing.Point(193, 92); + this.radSortNo.Location = new System.Drawing.Point(190, 92); this.radSortNo.Name = "radSortNo"; this.radSortNo.Size = new System.Drawing.Size(47, 16); this.radSortNo.TabIndex = 28; @@ -487,66 +526,19 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel1.Controls.Add(this.prb3, 2, 0); this.tableLayoutPanel1.Controls.Add(this.prb2, 1, 0); this.tableLayoutPanel1.Controls.Add(this.prb5, 0, 0); this.tableLayoutPanel1.Controls.Add(this.prb4, 4, 0); - this.tableLayoutPanel1.Controls.Add(this.prbPO, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.prb3, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.prbPO, 2, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 119); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1217, 51); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1345, 51); this.tableLayoutPanel1.TabIndex = 33; // - // prb3 - // - this.prb3.BackColor = System.Drawing.Color.Magenta; - this.prb3.BackColor2 = System.Drawing.Color.DarkMagenta; - this.prb3.BackgroundImagePadding = new System.Windows.Forms.Padding(0); - this.prb3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); - this.prb3.BorderColorOver = System.Drawing.Color.Red; - this.prb3.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); - this.prb3.ColorTheme = arCtl.arLabel.eColorTheme.Custom; - this.prb3.Cursor = System.Windows.Forms.Cursors.Arrow; - this.prb3.Dock = System.Windows.Forms.DockStyle.Fill; - this.prb3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.prb3.ForeColor = System.Drawing.Color.Black; - this.prb3.GradientEnable = true; - this.prb3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; - this.prb3.GradientRepeatBG = false; - this.prb3.isButton = false; - this.prb3.Location = new System.Drawing.Point(491, 5); - this.prb3.Margin = new System.Windows.Forms.Padding(5); - this.prb3.MouseDownColor = System.Drawing.Color.Yellow; - this.prb3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.prb3.msg = null; - this.prb3.Name = "prb3"; - this.prb3.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); - this.prb3.ProgressBorderColor = System.Drawing.Color.Black; - this.prb3.ProgressColor1 = System.Drawing.Color.Yellow; - this.prb3.ProgressColor2 = System.Drawing.Color.Gold; - this.prb3.ProgressEnable = true; - this.prb3.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); - this.prb3.ProgressForeColor = System.Drawing.Color.Black; - this.prb3.ProgressMax = 100F; - this.prb3.ProgressMin = 0F; - this.prb3.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); - this.prb3.ProgressValue = 50F; - this.prb3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb3.Sign = ""; - this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight; - this.prb3.SignColor = System.Drawing.Color.Yellow; - this.prb3.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb3.Size = new System.Drawing.Size(233, 41); - this.prb3.TabIndex = 32; - this.prb3.Text = "구매 진행 중"; - this.prb3.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.prb3.TextShadow = false; - this.prb3.TextVisible = true; - this.toolTip1.SetToolTip(this.prb3, "구매대상 중 구매"); - // // prb2 // this.prb2.BackColor = System.Drawing.Color.SkyBlue; @@ -564,7 +556,7 @@ this.prb2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb2.GradientRepeatBG = false; this.prb2.isButton = false; - this.prb2.Location = new System.Drawing.Point(248, 5); + this.prb2.Location = new System.Drawing.Point(274, 5); this.prb2.Margin = new System.Windows.Forms.Padding(5); this.prb2.MouseDownColor = System.Drawing.Color.Yellow; this.prb2.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -586,7 +578,7 @@ this.prb2.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb2.SignColor = System.Drawing.Color.Yellow; this.prb2.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb2.Size = new System.Drawing.Size(233, 41); + this.prb2.Size = new System.Drawing.Size(259, 41); this.prb2.TabIndex = 32; this.prb2.Text = "구매 등록 신청"; this.prb2.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -632,7 +624,7 @@ this.prb5.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb5.SignColor = System.Drawing.Color.Yellow; this.prb5.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb5.Size = new System.Drawing.Size(233, 41); + this.prb5.Size = new System.Drawing.Size(259, 41); this.prb5.TabIndex = 32; this.prb5.Text = "비 구매"; this.prb5.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -657,7 +649,7 @@ this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb4.GradientRepeatBG = false; this.prb4.isButton = false; - this.prb4.Location = new System.Drawing.Point(977, 5); + this.prb4.Location = new System.Drawing.Point(1081, 5); this.prb4.Margin = new System.Windows.Forms.Padding(5); this.prb4.MouseDownColor = System.Drawing.Color.Yellow; this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -679,7 +671,7 @@ this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb4.SignColor = System.Drawing.Color.Yellow; this.prb4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb4.Size = new System.Drawing.Size(235, 41); + this.prb4.Size = new System.Drawing.Size(259, 41); this.prb4.TabIndex = 32; this.prb4.Text = "구매 완료"; this.prb4.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -687,6 +679,53 @@ this.prb4.TextVisible = true; this.toolTip1.SetToolTip(this.prb4, "구매대상 중 구매완료 율"); // + // prb3 + // + this.prb3.BackColor = System.Drawing.Color.Magenta; + this.prb3.BackColor2 = System.Drawing.Color.DarkMagenta; + this.prb3.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prb3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prb3.BorderColorOver = System.Drawing.Color.Red; + this.prb3.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prb3.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.prb3.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prb3.Dock = System.Windows.Forms.DockStyle.Fill; + this.prb3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.prb3.ForeColor = System.Drawing.Color.Black; + this.prb3.GradientEnable = true; + this.prb3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prb3.GradientRepeatBG = false; + this.prb3.isButton = false; + this.prb3.Location = new System.Drawing.Point(812, 5); + this.prb3.Margin = new System.Windows.Forms.Padding(5); + this.prb3.MouseDownColor = System.Drawing.Color.Yellow; + this.prb3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.prb3.msg = null; + this.prb3.Name = "prb3"; + this.prb3.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.prb3.ProgressBorderColor = System.Drawing.Color.Black; + this.prb3.ProgressColor1 = System.Drawing.Color.Yellow; + this.prb3.ProgressColor2 = System.Drawing.Color.Gold; + this.prb3.ProgressEnable = true; + this.prb3.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prb3.ProgressForeColor = System.Drawing.Color.Black; + this.prb3.ProgressMax = 100F; + this.prb3.ProgressMin = 0F; + this.prb3.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); + this.prb3.ProgressValue = 50F; + this.prb3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prb3.Sign = ""; + this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.prb3.SignColor = System.Drawing.Color.Yellow; + this.prb3.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.prb3.Size = new System.Drawing.Size(259, 41); + this.prb3.TabIndex = 32; + this.prb3.Text = "구매 진행 중"; + this.prb3.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.prb3.TextShadow = false; + this.prb3.TextVisible = true; + this.toolTip1.SetToolTip(this.prb3, "구매대상 중 구매"); + // // prbPO // this.prbPO.BackColor = System.Drawing.Color.OrangeRed; @@ -704,7 +743,7 @@ this.prbPO.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prbPO.GradientRepeatBG = false; this.prbPO.isButton = false; - this.prbPO.Location = new System.Drawing.Point(734, 5); + this.prbPO.Location = new System.Drawing.Point(543, 5); this.prbPO.Margin = new System.Windows.Forms.Padding(5); this.prbPO.MouseDownColor = System.Drawing.Color.Yellow; this.prbPO.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -726,7 +765,7 @@ this.prbPO.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prbPO.SignColor = System.Drawing.Color.Yellow; this.prbPO.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prbPO.Size = new System.Drawing.Size(233, 41); + this.prbPO.Size = new System.Drawing.Size(259, 41); this.prbPO.TabIndex = 32; this.prbPO.Text = "PO 발행"; this.prbPO.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -853,7 +892,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1217, 27); + this.bn.Size = new System.Drawing.Size(1345, 27); this.bn.TabIndex = 3; this.bn.Text = "bindingNavigator1"; // @@ -1090,7 +1129,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1217, 464); + this.fpSpread1.Size = new System.Drawing.Size(1345, 464); this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; this.fpSpread1.TabIndex = 4; this.fpSpread1.TitleInfo.Text = "PartList"; @@ -1100,7 +1139,6 @@ flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); - this.fpSpread1.SetViewportLeftColumn(0, 0, 1); // // fpSpread1_Sheet1 // @@ -1124,189 +1162,188 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "품명"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "1대 수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "N대 수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "1대 금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "N대 금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "PMP"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "구매수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "구매확정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "제조사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "공급사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "납기일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "제조사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "1대 수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "N대 수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "1대 금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "N대 금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "PMP"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "구매수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "구매확정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "공급사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "납기일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "입고수량"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ItemGroup"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "중분류"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 89F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "option1"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "소분류"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 86F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.NegativeRed = true; - numberCellType1.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType1; + numberCellType19.DecimalPlaces = 0; + numberCellType19.NegativeRed = true; + numberCellType19.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType19; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "no"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "번호"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 79F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(3).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 99F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemUnit"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "unit"; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemManu"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "manu"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType2.DecimalPlaces = 0; - numberCellType2.MaximumValue = 10000000D; - numberCellType2.MinimumValue = -10000000D; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "0"; - numberCellType2.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(7).Tag = "price"; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemUnit"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(7).Tag = "unit"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - numberCellType3.NegativeRed = true; - numberCellType3.Separator = ","; - numberCellType3.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "qty"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "1대 수량"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "qty"; + numberCellType20.DecimalPlaces = 0; + numberCellType20.MaximumValue = 9999999999999.99D; + numberCellType20.MinimumValue = -9999999999999.99D; + numberCellType20.NegativeRed = true; + numberCellType20.NullDisplay = "0"; + numberCellType20.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType20; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "price"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "price"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.NegativeRed = true; - numberCellType4.Separator = ","; - numberCellType4.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + numberCellType21.DecimalPlaces = 0; + numberCellType21.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType21.MaximumValue = 2147483647D; + numberCellType21.MinimumValue = -2147483648D; + numberCellType21.NegativeRed = true; + numberCellType21.Separator = ","; + numberCellType21.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType21; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "N대 수량"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "1대 수량"; + this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "amt"; - this.fpSpread1_Sheet1.Columns.Get(10).Formula = "RC[-3]*RC[-2]"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "1대 금액"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "amt"; + numberCellType22.DecimalPlaces = 0; + numberCellType22.NegativeRed = true; + numberCellType22.Separator = ","; + numberCellType22.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType22; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "N대 수량"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amtn"; - this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-4]*RC[-2]"; + numberCellType23.DecimalPlaces = 0; + numberCellType23.MaximumValue = 9999999999999.99D; + numberCellType23.MinimumValue = -9999999999999.99D; + numberCellType23.NegativeRed = true; + numberCellType23.NullDisplay = "--"; + numberCellType23.Separator = ","; + numberCellType23.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType23; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amt"; + this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-3]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "N대 금액"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amtn"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "1대 금액"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amt"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "qtyjago"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "PMP"; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType23; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amtn"; + this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-4]*RC[-2]"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "N대 금액"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amtn"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType6.DecimalPlaces = 0; - numberCellType6.NegativeRed = true; - numberCellType6.NullDisplay = "--"; - numberCellType6.Separator = ","; - numberCellType6.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtybuy"; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtyjago"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "구매수량"; - this.fpSpread1_Sheet1.Columns.Get(13).Tag = "buy"; + 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(14).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "bbuy"; + numberCellType24.DecimalPlaces = 0; + numberCellType24.NegativeRed = true; + numberCellType24.NullDisplay = "--"; + numberCellType24.Separator = ","; + numberCellType24.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType24; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "qtybuy"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "구매확정"; - this.fpSpread1_Sheet1.Columns.Get(14).Tag = "bbuy"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "구매수량"; + this.fpSpread1_Sheet1.Columns.Get(14).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType7.DecimalPlaces = 0; - numberCellType7.NegativeRed = true; - numberCellType7.NullDisplay = "0"; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "qtyin"; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "입고수량"; - this.fpSpread1_Sheet1.Columns.Get(15).Tag = "qtyin"; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "구매확정"; + this.fpSpread1_Sheet1.Columns.Get(15).Tag = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "ItemManu"; + this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(16).ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "공급사"; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ItemSupply"; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "option2"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(17).ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "공급사"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "option2"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "납기일"; + numberCellType25.DecimalPlaces = 0; + numberCellType25.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType25; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "qtyin"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "입고수량"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(19).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType26; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "Item"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "item"; this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType27; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "ItemSupplyidx"; this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; @@ -1320,11 +1357,11 @@ this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; - noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo1.HardMarginX = 0F; - noPrinterPrintInfo1.HardMarginY = 0F; - noPrinterPrintInfo1.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; + noPrinterPrintInfo3.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo3.HardMarginX = 0F; + noPrinterPrintInfo3.HardMarginY = 0F; + noPrinterPrintInfo3.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo3; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -1341,7 +1378,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1217, 661); + this.ClientSize = new System.Drawing.Size(1345, 661); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); @@ -1437,6 +1474,9 @@ private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Panel panel6; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.RadioButton radSortIpNum; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 2d1d059..67a1bc0 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -75,8 +75,6 @@ namespace FPJ0000 xml.Save(); } - - private void fPartList_Load(object sender, EventArgs e) { //정렬방식 저장값 불러오기 @@ -103,9 +101,6 @@ namespace FPJ0000 this.Show(); Application.DoEvents(); RefreshData(); - - - } string sortkey = string.Empty; @@ -122,7 +117,6 @@ namespace FPJ0000 //프로젝트 정보 채우기 this.ta.FillByIDX(this.dsPRJ.Projects, this.ProjectIndex); - //order by 절은 다시 생성한다. var SSQl = " SELECT * FROM ProjectsPart " + " WHERE Project = @prj"; @@ -131,7 +125,8 @@ namespace FPJ0000 sortkey = "itemgroup asc,option1 asc ,no asc,itemname asc"; //SSQl += " order by itemgroup,option1,no,itemname"; } - else sortkey = "no"; + else if (radSortNo.Checked) sortkey = "no"; + else sortkey = "qtyin"; SSQl += " order by " + sortkey; @@ -195,7 +190,9 @@ namespace FPJ0000 var value_buy = this.fpSpread1.ActiveSheet.GetValue(i, col_buy); var value_in = this.fpSpread1.ActiveSheet.GetValue(i, col_qtyin); var value_bbuy = this.fpSpread1.ActiveSheet.GetValue(i, col_bbuy); - var value_supply = this.fpSpread1.ActiveSheet.GetValue(i, col_supply).ToString().Trim(); + var db_supply = this.fpSpread1.ActiveSheet.GetValue(i, col_supply); + var value_supply = string.Empty; + if (db_supply != null) value_supply = db_supply.ToString().Trim(); //var value_bconf = this.fpSpread1.ActiveSheet.GetValue(i, col_bconf); Boolean bbuy = false; @@ -271,7 +268,7 @@ namespace FPJ0000 //prb6.Text = string.Format("전체 진행 ({0}/{1})", 비구매건수 + 구매완료건수, 전체건수); //prb6.ProgressMax = 전체건수; //prb6.ProgressValue = 비구매건수 + 구매완료건수; - prbPO.Text = string.Format("PO 발행 ({0}/{1})", PO발행, PO발행전체); + prbPO.Text = string.Format("PO 대기 ({0}/{1})", PO발행, PO발행전체); prbPO.ProgressMax = PO발행전체; prbPO.ProgressValue = PO발행; @@ -554,8 +551,10 @@ namespace FPJ0000 this.bsPart.Filter = ""; tbFind.BackColor = Color.HotPink; } + FormattingData(); this.tbFind.SelectAll(); this.tbFind.Focus(); + } } @@ -753,5 +752,11 @@ namespace FPJ0000 var f = new fSCCheck(this.dsPRJ.ProjectsPart); f.ShowDialog(); } + + private void button3_Click(object sender, EventArgs e) + { + var f = new rPartList(this.ProjectIndex); + f.Show(); + } } } diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index e809446..e60cb07 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -145,6 +145,22 @@ False + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAkBJREFUSEvt1u9LE3EcB/B7XA/6U3rQv2AFouxBRVvD9EE9KbAHISwoC6IpDVx0 + bm2IgkkxzMIfiaFECYp33o/9aC3O0+XImei2s83Vft19uru+F6tuxfTOHugb3tzY7njx/ex7x2EHM+cf + 0m0XH7Gx/ejZB4tXEIthdi/b/TRcAh8tmlrFsOKUB7EHFR6PFWBiSTK1ivEHHP2UBbOjGIfwIQypbBGo + FeHnZ0cgVneV66rz31ZM8Bk44yafIXb/4Al2A5pdBINY40cdWEiq1/0ecjkDvdPxOGLNWXE6V4S+twno + HOHg3ugSzHNpiG/mlePfV7yXeGdWocUXgr7ZJLyMZOA5mwLHMAdt/iCMMutRxBozam28A28ScENGltMi + fNyWfunMhy9g9zLiCT99pCa8m+S+leHyQFgX1TpMb4G1l3llKNwv/6f+2TVdUOuKIILdwxZrwvWMumuc + V89TNtLkO0EXrG6rL1SpCe8mzjFe3Uh6WHVbfcGyofCifJ/eHOF1Ma3BZEEeNZM2FC5X1DHCay6ri8YF + Ca4NRcUG51yjYXChJML1JzHoeJGUrDgDQwsb6kbSUDLxFa4ORkUrTgdUVMle4XyhAu2P30Pn1JZ0a3Kz + 1NxDkudwZs6GsyVlI7V4gxWbhxFOO+dtiPyRel7oL3hovuk+sdM+GCly67md0Op2/lJ/RLw7nYE7UynR + 4qapptvoAWFmGl1Eh2Psc1mGRUsPHT7pCh1FP5mbU13EcRlcs7gpqqGbPoa+/kcw7DuQDDCAgNP2rgAA + AABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG @@ -209,6 +225,12 @@ 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -367,20 +389,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyiipF6WpTQ3s - Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc3ddMMZmuZ18zIv4GWpu5yjO2d+e87ZUgOhH3x4Xjzn - ++H8vucIuAl+qEy4UqpTRJTpfodIdRQ5aZ5y7tTTEaW9dNgz7fB5ibryWOT7A3xo74Q+0aiXrfTq8LiJ - tdg3YbHtsmrloDG6aEXBFzNiysYcwkz5QU/UPeHF2uXRyWm2d8YJ/SwDvZmBboaBdnoLyslNtI3YsckA - zWMUCj7NIvnFMPWPJETaRm04ttA/x+LHHENOBn28ZAsq4ya+jTiIwIX+RRb6BSeK5GYEPuh6x4ejywOm - bkkjt8U1N5BcfRPV7Q0obCxHoNQHAQRh0TkEy86gormCX8VGM1hacyA4WcXwgqjSwI9dQy1omXiNal0e - L4mvCkPe2zhkNcRAVHsVSbVJaB5cQsuwDV9/bmCd9BQi09C8QFgpPOgvzWZ14914MyRDiTKTlyTUhJPw - NaS9TIXaaOdX6ZygoCA9rNmdCCnscQu4CS1W0Tl1iTAYtajV38fTjlxEl19CQlUkDDMOGEixXMFqk7sT - CxEEy/YILjySOs/mH0VcpRD9pl4UdadDJs9BzPMgNCg/Y2CegYEU2zvtRA9h2epE4GOP4JTES+wnOYKs - +ljcrglFbMVlXpIjj4OkMZW8SRC4+34ziz7uExOspEjfbK1b4Cc5NO8nOUwe8oJfnheulwQh41Ui1CMK - FCnykf4hEaKaKBiIQE/+DR0R0E4XESh3V7iYraEX12kMzrM8qvEF3KtLQwoJimtjkFt/d+eOw7HFEkHT - roCzzVl2Bf/Dzq2Qukfgn/PdoRmY2N7v4f0wzZhdJ+KbbZ44KTKtY2p2w2HVDBpdUysUppYpGD2s2Jw8 - XPM2msW4adZFUdS6953WX564QHA6rT3DV9TWcVKssPiKm+gdUtz4/EXURHuLWteOJ7V2+iTKkwUCgeAP - hd2fyiWmpNkAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALwSURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFKEaNXigIWMAE + NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgQKWrZTSNhQDMpZF9i1hqUCXGehMeT0zrYAJiV/y5Fyc + eZ/M986I+Al8qI67UqxXhZXofwfJ9TQ5GYFS/jQwYcU6JuSZljov05QfDX9/QAjtneAnPZplC7NKURRn + tm3CbN1l1cLDYHjRgrwvs4gqGbGL05Ue7qhrQgu1yxRl4nTTDhhmWBhmWeinWWintqD+tYkWkw2bLNA4 + QiPv0wwSX1D0P5IgeQu9Yd9C/xyH73MsOVn0CZItdI9v4pvJTgRO9C9yMCw4UKCchf+DjndCOLLUb/KW + PHxbWnUDiZU3Udlah/z6UvjLveFHEBecQ6DiNMoay4RVrAyLpTU7AmO7WUEQUez/sWOoCU1jr1GpzxEk + sRUhyHkbg4y6KEiqryKhOgGNg0tooqz4+mMD66SnIEUPIwjE5WIPH3kmpx/twpshBYrU6YIkriqUhK8h + 5WUyNOM2YZX2MRoq0sOazYGg/F6XgJ/gwm4mqyYexnEtqg338bQtG5GllxBXEQ7jtB1GUixfsGbC1YmZ + CAIVewQXHskdZ3KPIKZcjP4JHQq6UqFQZiHqeQDq1J8xMM/CSIrVTTnQS1i2OOD/2C04KfOU+soOI6M2 + GrerghFddlmQZCljIKtPJm8SAP6+f5ZDH/+JCRZSpE+m1iXwlR2c95UdIg95wjfHE9eLApD2Kh4akwoF + qlykfoiHpCoCRiIwkH9DTwSMw0kE6t0VLmb2MIvrDAbnOYHu0QXcq0lBEglKq6OQXXt3547HvsURQcOu + gLfNmXcF/8PGr5C8R3A2q9Ou0g1u7/fwflDDo87jsY1Wd5wUmdI2ObNht3Tqh5yTKzQml2mMu1mxOgT4 + 5q0MhwFqxEnT9LrXneaf7rhIdCqlNc1H0tJ2Qqoy+0gbmB2SXHj/RdLAeEma144lNLd7xysTRSKR6A+3 + VJ80gqHE3AAAAABJRU5ErkJggg== @@ -428,4 +450,7 @@ 863, 18 + + 766, 18 + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 77c995a..c73ed88 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -49,7 +49,7 @@ System.Windows.Forms.Label label5; System.Windows.Forms.Label label7; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -515,7 +515,7 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(411, 215); + this.remark_reqTextBox.Size = new System.Drawing.Size(453, 280); this.remark_reqTextBox.TabIndex = 49; // // ddateTextBox @@ -558,14 +558,14 @@ this.btMailAddr, this.btPath, this.btSendMail}); - this.bn.Location = new System.Drawing.Point(0, 686); + this.bn.Location = new System.Drawing.Point(0, 679); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(984, 25); + this.bn.Size = new System.Drawing.Size(1026, 25); this.bn.TabIndex = 65; this.bn.Text = "bindingNavigator1"; // @@ -714,7 +714,7 @@ this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(411, 354); + this.dataGridView1.Size = new System.Drawing.Size(453, 279); this.dataGridView1.TabIndex = 0; this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); // @@ -739,8 +739,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -1281,7 +1281,7 @@ this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel6.SignColor = System.Drawing.Color.Yellow; this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel6.Size = new System.Drawing.Size(411, 23); + this.arLabel6.Size = new System.Drawing.Size(453, 23); this.arLabel6.TabIndex = 86; this.arLabel6.Text = "개선 방향"; this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1290,6 +1290,9 @@ // // arPanel1 // + this.arPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.arPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); @@ -1311,7 +1314,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(413, 240); + this.arPanel1.Size = new System.Drawing.Size(455, 305); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1320,6 +1323,8 @@ // // arPanel2 // + this.arPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.arPanel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); @@ -1331,7 +1336,7 @@ this.arPanel2.ForeColor = System.Drawing.Color.Black; this.arPanel2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; this.arPanel2.GradientRepeatBG = true; - this.arPanel2.Location = new System.Drawing.Point(559, 250); + this.arPanel2.Location = new System.Drawing.Point(559, 318); this.arPanel2.Name = "arPanel2"; this.arPanel2.Padding = new System.Windows.Forms.Padding(1); this.arPanel2.ProgressColor1 = System.Drawing.Color.LightSkyBlue; @@ -1342,7 +1347,7 @@ this.arPanel2.ProgressValue = 0F; this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel2.ShowBorder = true; - this.arPanel2.Size = new System.Drawing.Size(413, 404); + this.arPanel2.Size = new System.Drawing.Size(455, 329); this.arPanel2.TabIndex = 89; this.arPanel2.Text = "arPanel2"; this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1369,14 +1374,14 @@ this.btwADd, this.btwEdit, this.btwDel}); - this.bindingNavigator1.Location = new System.Drawing.Point(1, 378); + this.bindingNavigator1.Location = new System.Drawing.Point(1, 303); this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem1; this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem1; this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem1; this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1; this.bindingNavigator1.Name = "bindingNavigator1"; this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1; - this.bindingNavigator1.Size = new System.Drawing.Size(411, 25); + this.bindingNavigator1.Size = new System.Drawing.Size(453, 25); this.bindingNavigator1.TabIndex = 87; this.bindingNavigator1.Text = "bindingNavigator1"; // @@ -1511,7 +1516,7 @@ this.arLabel7.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel7.SignColor = System.Drawing.Color.Yellow; this.arLabel7.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel7.Size = new System.Drawing.Size(411, 23); + this.arLabel7.Size = new System.Drawing.Size(453, 23); this.arLabel7.TabIndex = 86; this.arLabel7.Text = "주간 업무 현황"; this.arLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1863,7 +1868,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(984, 686); + this.tabControl1.Size = new System.Drawing.Size(1026, 679); this.tabControl1.TabIndex = 93; // // tabPage1 @@ -1878,7 +1883,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(976, 660); + this.tabPage1.Size = new System.Drawing.Size(1018, 653); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "일반사항"; this.tabPage1.UseVisualStyleBackColor = true; @@ -1943,11 +1948,9 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(984, 711); + this.ClientSize = new System.Drawing.Size(1026, 704); this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "fProjectData"; this.Text = "프로젝트 정보 추가/편집"; diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index abbad07..43a093d 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -323,12 +323,6 @@ 449, 17 - - 449, 17 - - - 773, 17 - 773, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 7741c6a..a64c817 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,25 +30,25 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -139,6 +139,7 @@ this.sbSumE = new System.Windows.Forms.Label(); this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.prb1 = new arCtl.arLabel(); this.panel3 = new System.Windows.Forms.Panel(); this.toolStrip2 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); @@ -158,7 +159,6 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.prb1 = new arCtl.arLabel(); this.label17 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -210,14 +210,14 @@ this.btFind, this.toolStripSeparator6, this.sbCount}); - this.bn.Location = new System.Drawing.Point(0, 621); + this.bn.Location = new System.Drawing.Point(0, 657); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1179, 25); + this.bn.Size = new System.Drawing.Size(1165, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -593,7 +593,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1179, 304); + this.fpSpread1.Size = new System.Drawing.Size(1165, 340); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -650,118 +650,118 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType6; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "category"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 78F; - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 59F; - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType8; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType9.MaximumValue = 999999999999999D; - numberCellType9.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType9; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType10.MaximumValue = 999999999999999D; - numberCellType10.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType10; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -787,7 +787,7 @@ this.tbRequest}); this.toolStrip1.Location = new System.Drawing.Point(5, 5); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(949, 25); + this.toolStrip1.Size = new System.Drawing.Size(935, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -894,10 +894,10 @@ // this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 380); + this.label1.Location = new System.Drawing.Point(0, 416); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1179, 23); + this.label1.Size = new System.Drawing.Size(1165, 23); this.label1.TabIndex = 5; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -917,7 +917,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1179, 171); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1165, 171); this.tableLayoutPanel1.TabIndex = 11; // // panel4 @@ -925,10 +925,10 @@ this.panel4.Controls.Add(this.label11); this.panel4.Controls.Add(this.label4); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(589, 0); + this.panel4.Location = new System.Drawing.Point(582, 0); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(590, 25); + this.panel4.Size = new System.Drawing.Size(583, 25); this.panel4.TabIndex = 0; // // label11 @@ -936,7 +936,7 @@ this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Location = new System.Drawing.Point(0, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(490, 25); + this.label11.Size = new System.Drawing.Size(483, 25); this.label11.TabIndex = 14; this.label11.Text = "주간 진행 내용"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -947,7 +947,7 @@ this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); this.label4.Dock = System.Windows.Forms.DockStyle.Right; this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(490, 0); + this.label4.Location = new System.Drawing.Point(483, 0); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 25); @@ -968,7 +968,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(589, 25); + this.label2.Size = new System.Drawing.Size(582, 25); this.label2.TabIndex = 0; this.label2.Text = "요청 사항"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -981,7 +981,7 @@ this.richTextBox1.Location = new System.Drawing.Point(3, 28); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(583, 140); + this.richTextBox1.Size = new System.Drawing.Size(576, 140); this.richTextBox1.TabIndex = 1; this.richTextBox1.Text = ""; // @@ -990,10 +990,10 @@ this.richTextBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox2.Location = new System.Drawing.Point(592, 28); + this.richTextBox2.Location = new System.Drawing.Point(585, 28); this.richTextBox2.Name = "richTextBox2"; this.richTextBox2.ReadOnly = true; - this.richTextBox2.Size = new System.Drawing.Size(584, 140); + this.richTextBox2.Size = new System.Drawing.Size(577, 140); this.richTextBox2.TabIndex = 1; this.richTextBox2.Text = ""; // @@ -1030,7 +1030,7 @@ this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1179, 47); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1165, 47); this.tableLayoutPanel2.TabIndex = 12; // // label6 @@ -1049,7 +1049,7 @@ // this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(889, 1); + this.label5.Location = new System.Drawing.Point(877, 1); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(74, 24); this.label5.TabIndex = 0; @@ -1062,7 +1062,7 @@ this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label9.Location = new System.Drawing.Point(299, 1); + this.label9.Location = new System.Drawing.Point(295, 1); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(74, 24); this.label9.TabIndex = 0; @@ -1075,7 +1075,7 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label3.Location = new System.Drawing.Point(594, 1); + this.label3.Location = new System.Drawing.Point(586, 1); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(74, 24); this.label3.TabIndex = 0; @@ -1089,7 +1089,7 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Location = new System.Drawing.Point(85, 1); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(207, 24); + this.label7.Size = new System.Drawing.Size(203, 24); this.label7.TabIndex = 1; this.label7.Text = "--"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1098,9 +1098,9 @@ // this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Location = new System.Drawing.Point(380, 1); + this.label8.Location = new System.Drawing.Point(376, 1); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(207, 24); + this.label8.Size = new System.Drawing.Size(203, 24); this.label8.TabIndex = 1; this.label8.Text = "--"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1109,9 +1109,9 @@ // this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(675, 1); + this.label10.Location = new System.Drawing.Point(667, 1); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(207, 24); + this.label10.Size = new System.Drawing.Size(203, 24); this.label10.TabIndex = 1; this.label10.Text = "--"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1121,9 +1121,9 @@ this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label12.Location = new System.Drawing.Point(970, 1); + this.label12.Location = new System.Drawing.Point(958, 1); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(205, 24); + this.label12.Size = new System.Drawing.Size(203, 24); this.label12.TabIndex = 1; this.label12.Text = "--"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1137,7 +1137,7 @@ this.label13.Location = new System.Drawing.Point(1, 26); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(294, 20); + this.label13.Size = new System.Drawing.Size(290, 20); this.label13.TabIndex = 0; this.label13.Text = "Cost Summary"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1147,7 +1147,7 @@ this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(296, 26); + this.label14.Location = new System.Drawing.Point(292, 26); this.label14.Margin = new System.Windows.Forms.Padding(0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(80, 20); @@ -1160,7 +1160,7 @@ this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(591, 26); + this.label15.Location = new System.Drawing.Point(583, 26); this.label15.Margin = new System.Windows.Forms.Padding(0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(80, 20); @@ -1173,7 +1173,7 @@ this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(886, 26); + this.label16.Location = new System.Drawing.Point(874, 26); this.label16.Margin = new System.Windows.Forms.Padding(0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(80, 20); @@ -1186,10 +1186,10 @@ this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumO.Location = new System.Drawing.Point(377, 26); + this.sbSumO.Location = new System.Drawing.Point(373, 26); this.sbSumO.Margin = new System.Windows.Forms.Padding(0); this.sbSumO.Name = "sbSumO"; - this.sbSumO.Size = new System.Drawing.Size(213, 20); + this.sbSumO.Size = new System.Drawing.Size(209, 20); this.sbSumO.TabIndex = 1; this.sbSumO.Text = "--"; this.sbSumO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1199,10 +1199,10 @@ this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumI.Location = new System.Drawing.Point(672, 26); + this.sbSumI.Location = new System.Drawing.Point(664, 26); this.sbSumI.Margin = new System.Windows.Forms.Padding(0); this.sbSumI.Name = "sbSumI"; - this.sbSumI.Size = new System.Drawing.Size(213, 20); + this.sbSumI.Size = new System.Drawing.Size(209, 20); this.sbSumI.TabIndex = 1; this.sbSumI.Text = "--"; this.sbSumI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1212,10 +1212,10 @@ this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbSumE.Location = new System.Drawing.Point(967, 26); + this.sbSumE.Location = new System.Drawing.Point(955, 26); this.sbSumE.Margin = new System.Windows.Forms.Padding(0); this.sbSumE.Name = "sbSumE"; - this.sbSumE.Size = new System.Drawing.Size(211, 20); + this.sbSumE.Size = new System.Drawing.Size(209, 20); this.sbSumE.TabIndex = 1; this.sbSumE.Text = "--"; this.sbSumE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1224,14 +1224,61 @@ // this.taHist.ClearBeforeFill = true; // + // prb1 + // + this.prb1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.prb1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prb1.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prb1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); + this.prb1.BorderColorOver = System.Drawing.Color.Red; + this.prb1.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prb1.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.tableLayoutPanel3.SetColumnSpan(this.prb1, 4); + this.prb1.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prb1.Dock = System.Windows.Forms.DockStyle.Fill; + this.prb1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.prb1.ForeColor = System.Drawing.Color.Black; + this.prb1.GradientEnable = true; + this.prb1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prb1.GradientRepeatBG = false; + this.prb1.isButton = false; + this.prb1.Location = new System.Drawing.Point(153, 5); + this.prb1.Margin = new System.Windows.Forms.Padding(5); + this.prb1.MouseDownColor = System.Drawing.Color.Yellow; + this.prb1.MouseOverColor = System.Drawing.Color.Yellow; + this.prb1.msg = null; + this.prb1.Name = "prb1"; + this.prb1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.prb1.ProgressBorderColor = System.Drawing.Color.Black; + this.prb1.ProgressColor1 = System.Drawing.Color.Lime; + this.prb1.ProgressColor2 = System.Drawing.Color.Green; + this.prb1.ProgressEnable = true; + this.prb1.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prb1.ProgressForeColor = System.Drawing.Color.White; + this.prb1.ProgressMax = 100F; + this.prb1.ProgressMin = 0F; + this.prb1.ProgressPadding = new System.Windows.Forms.Padding(0); + this.prb1.ProgressValue = 50F; + this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prb1.Sign = ""; + this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.prb1.SignColor = System.Drawing.Color.Yellow; + this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.prb1.Size = new System.Drawing.Size(1007, 11); + this.prb1.TabIndex = 32; + this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.prb1.TextShadow = false; + this.prb1.TextVisible = true; + this.toolTip1.SetToolTip(this.prb1, "구매대상 중 구매완료 율"); + // // panel3 // this.panel3.Controls.Add(this.tableLayoutPanel1); this.panel3.Controls.Add(this.tableLayoutPanel2); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 403); + this.panel3.Location = new System.Drawing.Point(0, 439); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1179, 218); + this.panel3.Size = new System.Drawing.Size(1165, 218); this.panel3.TabIndex = 7; // // toolStrip2 @@ -1254,7 +1301,7 @@ this.cmbSort}); this.toolStrip2.Location = new System.Drawing.Point(5, 30); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(949, 27); + this.toolStrip2.Size = new System.Drawing.Size(935, 27); this.toolStrip2.TabIndex = 8; this.toolStrip2.Text = "toolStrip2"; // @@ -1388,7 +1435,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1179, 55); + this.panel1.Size = new System.Drawing.Size(1165, 55); this.panel1.TabIndex = 9; // // btSearch @@ -1396,7 +1443,7 @@ this.btSearch.Dock = System.Windows.Forms.DockStyle.Right; this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btSearch.Location = new System.Drawing.Point(954, 5); + this.btSearch.Location = new System.Drawing.Point(940, 5); this.btSearch.Name = "btSearch"; this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0); this.btSearch.Size = new System.Drawing.Size(122, 45); @@ -1411,7 +1458,7 @@ this.button1.Dock = System.Windows.Forms.DockStyle.Right; this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(1076, 5); + this.button1.Location = new System.Drawing.Point(1062, 5); this.button1.Name = "button1"; this.button1.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); this.button1.Size = new System.Drawing.Size(98, 45); @@ -1432,60 +1479,13 @@ this.tableLayoutPanel3.Controls.Add(this.label17, 0, 0); this.tableLayoutPanel3.Controls.Add(this.prb1, 1, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 359); + this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 395); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1179, 21); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1165, 21); this.tableLayoutPanel3.TabIndex = 34; // - // prb1 - // - this.prb1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); - this.prb1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); - this.prb1.BackgroundImagePadding = new System.Windows.Forms.Padding(0); - this.prb1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(24)))), ((int)(((byte)(24)))), ((int)(((byte)(24))))); - this.prb1.BorderColorOver = System.Drawing.Color.Red; - this.prb1.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); - this.prb1.ColorTheme = arCtl.arLabel.eColorTheme.Custom; - this.tableLayoutPanel3.SetColumnSpan(this.prb1, 4); - this.prb1.Cursor = System.Windows.Forms.Cursors.Arrow; - this.prb1.Dock = System.Windows.Forms.DockStyle.Fill; - this.prb1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.prb1.ForeColor = System.Drawing.Color.Black; - this.prb1.GradientEnable = true; - this.prb1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; - this.prb1.GradientRepeatBG = false; - this.prb1.isButton = false; - this.prb1.Location = new System.Drawing.Point(153, 5); - this.prb1.Margin = new System.Windows.Forms.Padding(5); - this.prb1.MouseDownColor = System.Drawing.Color.Yellow; - this.prb1.MouseOverColor = System.Drawing.Color.Yellow; - this.prb1.msg = null; - this.prb1.Name = "prb1"; - this.prb1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); - this.prb1.ProgressBorderColor = System.Drawing.Color.Black; - this.prb1.ProgressColor1 = System.Drawing.Color.Lime; - this.prb1.ProgressColor2 = System.Drawing.Color.Green; - this.prb1.ProgressEnable = true; - this.prb1.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); - this.prb1.ProgressForeColor = System.Drawing.Color.White; - this.prb1.ProgressMax = 100F; - this.prb1.ProgressMin = 0F; - this.prb1.ProgressPadding = new System.Windows.Forms.Padding(0); - this.prb1.ProgressValue = 50F; - this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb1.Sign = ""; - this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; - this.prb1.SignColor = System.Drawing.Color.Yellow; - this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb1.Size = new System.Drawing.Size(1021, 11); - this.prb1.TabIndex = 32; - this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.prb1.TextShadow = false; - this.prb1.TextVisible = true; - this.toolTip1.SetToolTip(this.prb1, "구매대상 중 구매완료 율"); - // // label17 // this.label17.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1500,7 +1500,7 @@ // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1179, 646); + this.ClientSize = new System.Drawing.Size(1165, 682); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.panel1); diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 8a000ab..d6821ff 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -510,7 +510,7 @@ namespace FPJ0000 { tableLayoutPanel3.Visible = true; var perc = int.Parse(stR_result); - this.label17.Text = string.Format("구매 진행율 ({0}%)", perc); + this.label17.Text = string.Format("구매 완료율 ({0}%)", perc); this.prb1.ProgressMin = 0; this.prb1.ProgressMax = 100; this.prb1.ProgressValue = perc; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index b20b042..ef91e46 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,39 +230,36 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGiVpc5NWhotMFCK - kEIlZm3ThpoMkyxL15SbuVLWWotRWW7pZGrq0pb0ai+zl+2uzW2trYzu6d7vLrq7/Kk+cLhwn3MOD18e - 6r8x2D+i7ZYfest76IaWcHrwDdT0q8fCWMTAeETTP7ay3P8oDJMzhN6HIVCJ1C9kq+7iLCtkRNCuyPds - L3XW0wy9WwPdmBqnnA3kZ63xGYSMiD7XVzIfXLwC2ncZpvkLoJAFbzhyaWHDAuNoiMwzoczuIDLFGw53 - eUUFlWaZopzei5IeKZS9MpGfskwGhK40oVgKqnMzawWV5mKFvKuIbRptROt4E0o7d5Mgz9BEIF1gmw7C - NhWAYzaAt1/i2N8+RQqUA8UKWecuVn2vDvuMpSg8kwdpy3YMe4Kw8Jpk/t7g9acYyls8UNB7Kko6pGyD - oxYSbT5boM3Zabi9jFhyFdZphnht3JcUkC24Daycqi2HIO8rQtX1AzhuP4pt2i3sVu3mHfxGrdYPiCZW - YZ9hcGc2LWrkCYN4cv1lVVcroHOpccxWjUJtHpvbmA7zNA+/w8q3n7jrTW/wYJ47JMccg0wpe+SQtOWj - QJeD3JOb1sI8mhtLpGCEC/JhUnCTe4hMXvijUBk8G96B+tpLRLgC59MQ8bp8XAEfyFZZu+u3kBFRTz9H - OP4DTDSFz+Ek/EwCVJnejWxJ6u/bhIyIE6bFiZpuX6KmewFV57042LF+L/8IRf0BNaQtLf9Mjj8AAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGiVpa5NWhotMFCK + kEIlZm3ThpqsDBNL15SbuVLWWotRWW7pZGqzpS3p1V5mL9tdm9taWxnd073fXXR3+VN94HDhPuccHr48 + 1H9jsH9E+80A9Jb30A0v4tTQG6jpV4+EsYjBiahmYHx5aeBhBCZnGH0PwqCS6V/IVX23lxUyImhX9Huu + lzrjaYHerYFuXI2Tzkbys874DEJGRL/rK5kPLVwG7b8E01w3KOTAGw5fnF+3wDgWJvNsKLM7hGzxhkMX + fKKCKrNMUUHvRlmvFMo+mchPWaaCQleGcDwNVad3taDKXKqQd5WwzWNNaJtoRvn5nSTIMzwZzBTYZkKw + TQfhmA3i7ZcE9nVMkwLlYKlC1rmDVd+tx15jOYpPF0DauhUjnhAsvKaYvzd4/SmOilYPFPSuyrKzUrbR + UQeJtpAt0uZtN9xaQjy1AusMQ7w27ksKyBbcBlZONZaDkPeXoPrafhyzH8EW7SZ2s3bjNn6jNusHxJIr + sHsZ3J7NiBp9wiCRWntZ1ZVK6FxqHLXVoFhbwOY3ZcI8LSPvsPztJ+74Mhvcn+MOyfGYQbaUvXJI2gtR + pMtD/okNq2EezfVFUjDKBfkwKbjBPUQ2LwIxqAyede9AffUlolyB82mYeF1+roAP5ErW4fotZEQ00M8R + SfwAE0vjcySFAJMEtUfvRq4kDfdsQkbEcdPCZG2PP1nbM4/qLh8OnFu7l3+Eov4AJ5ItJ4lVSPEAAAAA SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVHfEuDJx4Qq7 - M5G4AReKCQsXKFEQNYHwUCMQUEFeRVCLhJYQgoGWN7UdoJS2TEuptAJTZjqPTqdzvC2j4MLEx8k9mbmT - +53//+9Q/63lwTxHwFqoBEeMh3xVWRs67/O+O3XU15uX9YtH8rLGxgqO6DhFOU0GWdNSADSy0t5/T0pR - hMaKExv2IvmHw/O3pYC9NOD+cKZQxymKHsiPaaoEOVQDwV8HgWmDGOiDlmRJVhyayhPv7e+Tu5AELuHu - N9A6TlGeztNcStkjcCPi3gZwSxXYmSlGdPYmWFclWOd9sI672F0sIy4lnUXg6T/L6zgJMOUrSXELLN2I - 3YVqRMbvQIxMk6qcXj39jP3sID2e05Qr6Xi6g3NKZv6UTCwCqpABVdENOfwMNN0Ds20KraMMuiY2YV0M - Yq69QNZxEvDSkNBUESo3hSRrgbLdh8RWC6SNp3A52zE4H8HaVwHr2zKmfRyGHd/w0dym6jj5C00GOaVw - UHbMSEQ6MlWlYCVEfxl6bWEsh3jMMCJsfgGTxK6wjO7PDHScBNTmSprCEvg15M06SIEKApdC8BRl2vZG - Zdh8cUx44xh185gPyugYDx0ErD7OCYsxOra91JWKr7WC9zwH764Bv1KFbjLz8qaAcc8+nPbchoymodWD - AHdV9i139clO+tGJqKM6RzrsTwOv1GkvhwUC2RkJs6S6+QuPuuZezVJ+8Zoe8XvVW5hjTVbmnoncRc9k - GM3WlVRtc7/mGm7BVIORe1uSbdSP/rnel1+6YX9xnfVb6jH04IKgf/47vSk5bhx+eFm0PrlycBf/Jor6 - DvTKJcXzkSMVAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPpZFJTBNRHMbn4J2bdw9eRCSKVE9q4sl48SJy + M8F4AQ8EEw4eUEJA1ARlcUklEAXZF7VIaA0hGGhZZO1Yh9KW6UKlZZky01k6nc7naxkFDyYuX96XmTd5 + v+///7+h/luuobxFv/WqGrBdO+ACdXX4rNfTf+Kwtycv6xd/zMsaGzt/yMApaqnHpOh6CoBOVtp770k5 + itBYcSLoKFJ+ODxXKvsdZX7m3akCA6coejA/pmsylFAdRF89RLYVkr8PepIjWXHomkC8u7dP7kCK7yaY + ARNt4BTl7jjJp9RdAjch7mkE/6US2zPFiM7eAuesBrd8D9ziHewslBOXkc4icA+cFgycBPTmq0lpAxzd + hJ35WkTGb0OKTJOqvFE9/Yz97CA93lJvrmzg6Q7OqJn5UwqxBGhiBtQkBkr4KWi6Gxb7FFpGWXROrMO2 + EMBs2znFwEnAC1NC1yRo/BSSnBXqVh8SG82Qg4/gXG7D0FwEq99ErG0pmPbyGFncxHtLi2bg5C+YTUpK + 5aFuW5CItGeqyoFqSL5y9NjDcIUEzLAS7D4Rk8TOsIKuTywMnAQ8zpV1lSPwKyjr9ZD9lQQug+i+kWnb + E1Vg98Yx4YljlBEwF1DQPh7aD1h5kBOWYnRsk+5MxVdbILifQWDqIHytQReZ2bUuYty9B6f9OajAPLyy + H8DUZJcytcc76PvHogu1OfJBfxhs1aY9POYJ5GBlzJLqliUBT8zdurXi4nUj4vdqsLJHzDb2bi+5i+7J + MF7aXKk6c7/uHGnGVGMh/6Yku9A4+ud6W3HppuN5EeezNmC46oJofP47vS45WjhSdVmyPbyyfxf/Jor6 + DpFxJZqzAb7fAAAAAElFTkSuQmCC - - 17, 17 - 387, 17 @@ -320,18 +317,12 @@ 561, 17 - - 561, 17 - 731, 17 647, 17 - - 731, 17 - 169, 56 diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs index e0c1d7f..e356577 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs @@ -211,7 +211,6 @@ namespace FPJ0000 return false; } - if (cbProcess.Text.Trim() == "") { FCOMMON.Util.MsgE("프로세스를 선택하세요."); @@ -327,7 +326,7 @@ namespace FPJ0000 var SQLExist = " select count(*) from Purchase" + " where import = 1" + - " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}'" + + " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}' and state in ('---','PR','')" + " and projectidx = {1}"; SQLExist = string.Format(SQLExist, dtPdate.Value.ToShortDateString(), this.ProjectIndex.ToString()); var ExistCnt = FCOMMON.DBM.ExecuteScalarI(SQLExist); @@ -339,7 +338,7 @@ namespace FPJ0000 SQLExist = " delete from Purchase" + " where import = 1" + - " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}'" + + " and gcode = '" + FCOMMON.info.Login.gcode + "' and pdate = '{0}' and state in ('---','PR','')" + " and projectidx = {1}"; SQLExist = string.Format(SQLExist, dtPdate.Value.ToShortDateString(), this.ProjectIndex.ToString()); var delCnt = FCOMMON.DBM.ExecuteNonQuery(SQLExist); diff --git a/SubProject/FPJ0000/Resources/action_refresh.gif b/SubProject/FPJ0000/Resources/action_refresh.gif new file mode 100644 index 0000000..8268958 Binary files /dev/null and b/SubProject/FPJ0000/Resources/action_refresh.gif differ diff --git a/SubProject/FPJ0000/fHistAdd.Designer.cs b/SubProject/FPJ0000/fHistAdd.Designer.cs index 10edae9..7628701 100644 --- a/SubProject/FPJ0000/fHistAdd.Designer.cs +++ b/SubProject/FPJ0000/fHistAdd.Designer.cs @@ -1,115 +1,116 @@ -namespace FPJ0000 -{ - partial class fHistAdd - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.mcDate = new System.Windows.Forms.MonthCalendar(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.tbRemark = new System.Windows.Forms.TextBox(); - this.btOK = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // mcDate - // - this.mcDate.Location = new System.Drawing.Point(13, 38); - this.mcDate.Name = "mcDate"; - this.mcDate.TabIndex = 4; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(13, 17); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(44, 12); - this.label1.TabIndex = 2; - this.label1.Text = "등록일"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label2.Location = new System.Drawing.Point(247, 17); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(31, 12); - this.label2.TabIndex = 0; - this.label2.Text = "내용"; - // - // tbRemark - // - this.tbRemark.Location = new System.Drawing.Point(247, 38); - this.tbRemark.Multiline = true; - this.tbRemark.Name = "tbRemark"; - this.tbRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.tbRemark.Size = new System.Drawing.Size(524, 291); - this.tbRemark.TabIndex = 1; - this.tbRemark.WordWrap = false; - // - // btOK - // - this.btOK.Location = new System.Drawing.Point(13, 208); - this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(220, 121); - this.btOK.TabIndex = 3; - this.btOK.Text = "확인(&S)"; - this.btOK.UseVisualStyleBackColor = true; - this.btOK.Click += new System.EventHandler(this.btOK_Click); - // - // fHistAdd - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(783, 340); - this.Controls.Add(this.btOK); - this.Controls.Add(this.tbRemark); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.mcDate); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.KeyPreview = true; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fHistAdd"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "History Add/Edit"; - this.Load += new System.EventHandler(this.fHistAdd_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.MonthCalendar mcDate; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox tbRemark; - private System.Windows.Forms.Button btOK; - } +namespace FPJ0000 +{ + partial class fHistAdd + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.mcDate = new System.Windows.Forms.MonthCalendar(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.tbRemark = new System.Windows.Forms.TextBox(); + this.btOK = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // mcDate + // + this.mcDate.Location = new System.Drawing.Point(13, 38); + this.mcDate.Name = "mcDate"; + this.mcDate.TabIndex = 4; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(13, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 12); + this.label1.TabIndex = 2; + this.label1.Text = "등록일"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.Location = new System.Drawing.Point(247, 17); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(31, 12); + this.label2.TabIndex = 0; + this.label2.Text = "내용"; + // + // tbRemark + // + this.tbRemark.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbRemark.Location = new System.Drawing.Point(247, 38); + this.tbRemark.Multiline = true; + this.tbRemark.Name = "tbRemark"; + this.tbRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.tbRemark.Size = new System.Drawing.Size(525, 512); + this.tbRemark.TabIndex = 1; + this.tbRemark.WordWrap = false; + // + // btOK + // + this.btOK.Location = new System.Drawing.Point(13, 208); + this.btOK.Name = "btOK"; + this.btOK.Size = new System.Drawing.Size(220, 64); + this.btOK.TabIndex = 3; + this.btOK.Text = "확인(&S)"; + this.btOK.UseVisualStyleBackColor = true; + this.btOK.Click += new System.EventHandler(this.btOK_Click); + // + // fHistAdd + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(784, 561); + this.Controls.Add(this.btOK); + this.Controls.Add(this.tbRemark); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.mcDate); + this.KeyPreview = true; + this.MinimizeBox = false; + this.Name = "fHistAdd"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "History Add/Edit"; + this.Load += new System.EventHandler(this.fHistAdd_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.MonthCalendar mcDate; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox tbRemark; + private System.Windows.Forms.Button btOK; + } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fHistAdd.cs b/SubProject/FPJ0000/fHistAdd.cs index 59a6460..3ca0d0b 100644 --- a/SubProject/FPJ0000/fHistAdd.cs +++ b/SubProject/FPJ0000/fHistAdd.cs @@ -1,41 +1,41 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FPJ0000 -{ - public partial class fHistAdd : Form - { - dsPRJ.ProjectsHistoryRow dr = null; - public fHistAdd(dsPRJ.ProjectsHistoryRow dr_) - { - InitializeComponent(); - this.dr = dr_; - this.KeyDown += fHistAdd_KeyDown; - } - - void fHistAdd_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Escape) this.Close(); - } - - private void fHistAdd_Load(object sender, EventArgs e) - { - this.tbRemark.Text = this.dr.remark; - this.mcDate.SetDate(DateTime.Parse( dr.pdate)); - } - - private void btOK_Click(object sender, EventArgs e) - { - this.Validate(); - this.dr.remark = tbRemark.Text.Trim(); - this.dr.pdate = mcDate.SelectionStart.ToShortDateString(); - DialogResult = System.Windows.Forms.DialogResult.OK; - } - } -} +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FPJ0000 +{ + public partial class fHistAdd : Form + { + dsPRJ.ProjectsHistoryRow dr = null; + public fHistAdd(dsPRJ.ProjectsHistoryRow dr_) + { + InitializeComponent(); + this.dr = dr_; + this.KeyDown += fHistAdd_KeyDown; + } + + void fHistAdd_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Escape) this.Close(); + } + + private void fHistAdd_Load(object sender, EventArgs e) + { + this.tbRemark.Text = this.dr.remark; + this.mcDate.SetDate(DateTime.Parse( dr.pdate)); + } + + private void btOK_Click(object sender, EventArgs e) + { + this.Validate(); + this.dr.remark = tbRemark.Text.Trim(); + this.dr.pdate = mcDate.SelectionStart.ToShortDateString(); + DialogResult = System.Windows.Forms.DialogResult.OK; + } + } +} diff --git a/SubProject/FPJ0000/fHistAdd.resx b/SubProject/FPJ0000/fHistAdd.resx index 1af7de1..29dcb1b 100644 --- a/SubProject/FPJ0000/fHistAdd.resx +++ b/SubProject/FPJ0000/fHistAdd.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file