diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 86a890d..e2d7e9c 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("21.07.12.2250")] -[assembly: AssemblyFileVersion("21.07.12.2250")] +[assembly: AssemblyVersion("21.07.16.1300")] +[assembly: AssemblyFileVersion("21.07.16.1300")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index f809a63..4905012 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -63,6 +63,7 @@ this.목록ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.자동입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.업무현황전자실ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.교육목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.비용절감ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mn_jago = new System.Windows.Forms.ToolStripMenuItem(); this.관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -118,7 +119,7 @@ this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.교육목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -239,14 +240,14 @@ // this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.codesToolStripMenuItem.Text = "공용코드"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.itemsToolStripMenuItem.Text = "품목정보"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // @@ -257,7 +258,7 @@ this.myAccouserToolStripMenuItem, this.권한설정ToolStripMenuItem}); this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.userInfoToolStripMenuItem.Text = "사용자"; // // userAccountToolStripMenuItem @@ -284,14 +285,14 @@ // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.customerToolStripMenuItem.Text = "업체정보"; this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); // // mn_kuntae // this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(153, 24); + this.mn_kuntae.Size = new System.Drawing.Size(180, 24); this.mn_kuntae.Text = "월별 근무표"; this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); // @@ -299,7 +300,7 @@ // this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일양식ToolStripMenuItem.Text = "메일 양식"; this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); // @@ -367,7 +368,8 @@ // this.mn_dailyhistory.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.목록ToolStripMenuItem1, - this.자동입력ToolStripMenuItem}); + this.자동입력ToolStripMenuItem, + this.양식ToolStripMenuItem}); 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(208, 24); @@ -377,14 +379,14 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); // // 자동입력ToolStripMenuItem // this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; - this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); // @@ -395,6 +397,13 @@ this.업무현황전자실ToolStripMenuItem.Text = "업무현황(전자실)"; this.업무현황전자실ToolStripMenuItem.Click += new System.EventHandler(this.업무현황전자실ToolStripMenuItem_Click); // + // 교육목록ToolStripMenuItem + // + this.교육목록ToolStripMenuItem.Name = "교육목록ToolStripMenuItem"; + this.교육목록ToolStripMenuItem.Size = new System.Drawing.Size(208, 24); + this.교육목록ToolStripMenuItem.Text = "교육목록"; + this.교육목록ToolStripMenuItem.Click += new System.EventHandler(this.교육목록ToolStripMenuItem_Click); + // // 비용절감ToolStripMenuItem // this.비용절감ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; @@ -876,12 +885,12 @@ this.toolStripButton2.Text = "품목정보"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // - // 교육목록ToolStripMenuItem + // 양식ToolStripMenuItem // - 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); + this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; + this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.양식ToolStripMenuItem.Text = "양식"; + this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // // fMain // @@ -1004,6 +1013,7 @@ private System.Windows.Forms.ToolStripMenuItem aLLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem layoutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 교육목록ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 양식ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index b550d3b..8b25390 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -1038,5 +1038,12 @@ namespace Project if (!ShowForm(formkey)) AddForm(formkey, new FED0000.fEdulist()); } + + private void 양식ToolStripMenuItem_Click(object sender, EventArgs e) + { + string formkey = "JRFORM"; + if (!ShowForm(formkey)) + AddForm(formkey, new FCM0000.fJRForm()); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 3e7311c..2a4c800 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= @@ -325,6 +305,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= @@ -374,25 +374,25 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJGSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB - QwoXhVCNrK1o6oJog+iDkJrIvjRlkJUUgXUZjBB6jyLWjPZtQbCpI7Z5t7teTs/53StLVOiByz7ce55z - nnPO1P9O1lC+r4aak9+CPHbKUL/vG+qP+3rjkY/HMobKE5DvPYKF4BksDp7DUtgPeQf3s7UjbN75JpXL - tW7FQuA0itf9KI0EUArtwnKkFT9nB1ANbrAgu0nF0oay8qeOoRjpx48r7bCiHtgjO1Afc55fyUHYV9dZ - kG1S0yKtvjhwFqXbAVTC21B3gfbUbtSedaH66ijs3CjKb5tXLyAzwUtD51GeCKJ2y+MAE22oPj8EK90D - 68tJ/djfx1F+72ks4M2UTWaC7eHtGlx70gHro1eDvqW9ePCyG6FkG0Y/DGFL7J8TaBhvpuwV5prZDStz - AssCnn7RBd/sTnQ8bsHeR82Ivgth84S7gFEx0+KNC6hca2kwC7jwuQc3U3vQ6QKPxwPoG08gbn7CgUsz - zgLmzKgqscvaMN5M2WQmeJ8AD947jL47CUyaGUyZ87j7NOMsEHYfS8KcGRXZtWGubDITHI4nNTA6+Qa9 - EVPA8dr+/pnXNG+ODWNJmDOjots0jDdTNpkJ9g+nNLDz4sN2LZ0jCgqsJxumb5ecyU63aRhvpmwyE+zC - GiMLbHab9dTypSRcwKg0uxhGdspexbwyvJ9/DHZb11MaxpIwZ0ZFtx3D1mHnMD5Rof8Y7DbryYaxJMyZ - TvPRhq0Zpf4CQ230R4xxr70AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB + QwoXhVCNrK1o6oJog+iDkJrIvjRloJQUgTUGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z + nnPO1P9OzlC+r4aal9+iPHbaUL+nDfXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn + W7djMXAWpZt+lEcCKIf2YCXSip9zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss + yDWpGZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg + fjmtH/v7OCrvPY0FvJmyyUywPbxTg60nHTA/ejXoW8aLBy+7EUq1YfTDELbF/jmBhvFmyl5ltpLdMLOn + sCLgmRdd8M3tRsfjFux/1IzouxC2TrgLGBUzLd26hOqNlgazgIufe3A7vQ+dLvBkPIC+8QTiyU84dGXW + WcCcGVU1dlUbxpspm8wEHxDg4emj6LuXwGQyi6nkAu4/zToLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv + JCnguHWwf/Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/LBdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw + xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm + 03y0YetGqb83SfRBW2HAggAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Us91UtaTxHdIgohQXuL + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Uu91FNaTxHdIgohQXuL HkKoaDDYGk5p0ymKm3Ph1pyO3enmltPJZV6pzWw6CJU9uOlcTgvRgTLBFH3rSRiEbPV1zvEmSkX1weHC - d+73/9/3/4f7E55Ld6AN3cDjQCnKfBe+yfS/QzF4sRD91Is3GQFl7vP/X+CZeA1vP3ogfXCi3HUWMs2F + d+73/9/3/4f7E55Ld6AN3cDjQCnKfBe/yfS/QzF4oRD91Is3GQFl7vP/X+CZeA1vP3ogfXCi3HUWMs2F QiEEg0H09fXB6/U+4VKpFOiZmZnB9PQ09NJdVIu3YXz3EK8XBARTdjwdvIXrttO40naK/VsoFLCzswNB ELLc7OwsisUi9vb22FENXoUl9gjhBTeEuAHW99XoTbRBIZbjsvlMcXd3F2tra+js7Pzc0dFRzSWTSUZs b28jnU5ja2sLVf4SGCL3IaYd8CVfQBmqIK6qMDIygmw2i0gkAiIul1NxXDwex9zcHGKxGJ9IJDA6OspX @@ -401,26 +401,26 @@ Xl1dBeGwsrICujramRTE4uIimpqavsuyoxBFEQMDA/D7/ejp6YHL5YLD4aB5YbFYqG2MjY3BYDD8vsDf QAocq6+vR01NzReZ2gfJdekVgc/no5OmmWletLe3s64tLS1obGxEXV0dy67RaPJM+BNkLUb6dbvduq6u rk0i1rGLQ9Dr9bra2tpNrVarU6vVX2V6Hx6Px0ieJVvX/Pw8hoeH2aSbm5vR0NAAIgYxyJ4xef9QKBTr - svQobDYbG5bJZPrFAbGtU6lUUCqVh1bIcT8AEerCLsQNbOgAAAAASUVORK5CYII= + svQobDYbG5bJZPrFAbGtU6lUUCqVh1bIcT8ACoLCLFq5OiIAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7arJ4gMGKoz+bHiDokmUuwUUP - 1MBIhG3MjvEzun0wKC0/OjvpsIxRR0tbaIHyU6BsGVqKbMVGJ6NTHJLNmOiW6MKsS3WuC07LwrIzEjK9 - LO+6ZCPGO7lPnjz39T3v876fbLBSzVp7K9T0Syp6Dyjp0SrpKlfgKkvHWbIee/F6rEXP8qEmjdbdzyAA - d751/7cvdrI410H8gpO/vrRz+5yNP84eZyFk4daZFloK5QKwEPn0MPE5K7GJogce38NN/9vcOFXIb74d - RPvf4np3HhFnDtfaXucXl4bf/Waat8nvJwCq0inbdvHFcNNWpo68jCk/leChzYw3bGbUsInh6pdEza3N - xF6SwU++RoKNuXyw4+kB2aq8kvryldFq5k+/z2T986L5I91GRio3MLBfTfc+lai1aZR8bNnHJeeBRDhl - 8VDukykC0CcpXh03ZXP7q3ZCTa+I5qGKDfSWq+gsUWErUopaq2YjP/S/xwl9No35T5WK8EP1aBVjF1x7 - +M5nYHawnmmPgc+79YTces501PCJQ8eUq5bPmvIxFaR+k4w9UJ8hc92ApAwdK1fc78xJ/3vtVa1uu3mn - fPXMHClI/ceyO82djMpkvsr0lEFJfTfY/AZzXt1jnh3QMdOv43xvNed6qjjbVcWkU6KvbhuthfLjAjC4 - XxWdbMnh4nAtwcNbmWh4kfH6LPx1WZwyZDGiy8R78AU8UgYubQbDxu2M2SS6arITE8lDsu7ytHvzQRNB - 4xbGap4Ty/o/N+9U4Da8yemOWnEkAbg1ayf2RRM3Jt/l14k6ogEd10cP8vOIlnlvKVc9Rfzo2sUVewGX - 2/L43pJ4UCOm1X0kAV+3J0JlRE7u4mSvDY/HIzzj2MslSy7HjpoxGo3o9XoWo2XC13wmMZEA3DxvZWHG - QSzcTsDXRSwWIxKJ4Pf7cTgchMNhlpeXqaqs4OpQowg/Bnj0j3M15DE9PU08HmdlZUV4aWmJQCCATvOa - GPvRnYibWCur1fqO2WyOPhxbkqQ/i4uLhzQazRPJlqRksn8BjHU1TowEz/cAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJNnGIZ7umTZAQt2TPqj2wHCtsRsJmi2 + g82IJAMVVxk/Uv1AKC0/m6ujsjKkSktbaIHyU6BoZCtlaLFRh9SNyYguSzZNNoPrTDdnDXMrC8vOSIh6 + rbzWRMmyO7lPnjz39T3v876fbKBCzWp7y9X0SSp69ivp1irpLFPgKk3HWbwWe9FarIXPc1STRsvu5xCA + v75x/7cvd7Aw2078kpM/v7Bz94KN388fYz5k4c7pZpoL5AIwHzlziPisldh44UOP7eG2/x1unSzgV98O + on1vc7Mrl4hzGzda3+Rnl4bf/GaasuX3EgBVyaRtu/hiuHETk4dfw5SXSvDgRsbqNzJieIWhqpdFza3N + xF6cwY++BoINOXy0Y02/bEVeSX312kgVc6c+ZKLuRdH8iW49wxXr6N+npmuvStRaNUo+tezlinN/Ipyy + cDDnmRQB6JUUr4+Zsrn7ZRuhxs2iebB8HT1lKjqKVdgKlaLWolnP930fcFyfTUPesyUi/EjdWsXoJdce + vvUZmBmoY8pj4FyXnpBbz+n2aj5z6Jh01XC2MQ9TfurXydhD9Royn+6XlKEjZYp7HVvT76++qpVtN+2U + r5yZw/mpDyy709zJqEzmq0hPGZDUfweb3mLWq3vCM/06pvt0XOyp4kJ3Jec7K5lwSvTWbqGlQH5MAAb2 + qaITzdu4PFRD8NAmxutfYqwuC39tFicNWQzrMvEe2IBHysClzWDIuJ1Rm0RndXZiInlI1lWW9s9c0ETQ + +Cqj1S+IZf2fm3YqcBu2cqq9RhxJAO7M2Il93sitiff5ZbyWaEDHzZED/DSsZc5bwnVPIT+4dnHNns/V + 1ly+syQe1LBpZR9JwFdtiVApkRO7ONFjw+PxCE873uWKJYcjH5sxGo3o9XoWoqXCN3wmMZEA3L5oZX7a + QSzcRsDXSSwWIxKJ4Pf7cTgchMNhlpaWqKwo5/pggwg/AXj8j3PV5zI1NUU8Hmd5eVl4cXGRQCCATvOG + GPvxnYibWC2r1fqe2WyOPhpbkqQ/ioqKBjUazVPJlqRksn8BgWc1SqHalBIAAAAASUVORK5CYII= diff --git a/SubProject/FCM0000/DSMail.xsd b/SubProject/FCM0000/DSMail.xsd index 24dd9ec..21b5f3f 100644 --- a/SubProject/FCM0000/DSMail.xsd +++ b/SubProject/FCM0000/DSMail.xsd @@ -409,7 +409,7 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, - + @@ -494,7 +494,7 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, - + @@ -504,7 +504,7 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, - + @@ -599,7 +599,7 @@ SELECT idx, enable, fidx, gcode, fromlist, tolist, bcc, cc, sdate, edate, stime, - + diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index cdfc331..82cd842 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -91,6 +91,9 @@ False True + + ..\..\packages\NetSpell.2.1.7\lib\NetSpell.SpellChecker.dll + ..\..\packages\NetOffice.Core.1.7.4.4\lib\net40\OfficeApi.dll False @@ -101,6 +104,12 @@ False True + + ..\..\packages\RichTextBoxEx.1.0.0\lib\PrintRichTextBox.dll + + + ..\..\packages\RichTextBoxEx.1.0.0\lib\RichTextBoxEx.dll + @@ -167,6 +176,12 @@ fMailBackup.cs + + Form + + + fJRForm.cs + Form @@ -371,6 +386,9 @@ fMailBackup.cs + + fJRForm.cs + fMailList.cs diff --git a/SubProject/FCM0000/Mail/fJRForm.Designer.cs b/SubProject/FCM0000/Mail/fJRForm.Designer.cs new file mode 100644 index 0000000..67e02e6 --- /dev/null +++ b/SubProject/FCM0000/Mail/fJRForm.Designer.cs @@ -0,0 +1,347 @@ +namespace FCM0000 +{ + partial class fJRForm + { + /// + /// 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.Windows.Forms.Label subjectLabel; + System.Windows.Forms.Label bodyLabel; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJRForm)); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL1 = new FCM0000.dsMSSQL(); + 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.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); + this.mailFormBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.mailFormDataGridView = new System.Windows.Forms.DataGridView(); + this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1 = new System.Windows.Forms.Panel(); + this.subjectTextBox = new System.Windows.Forms.TextBox(); + this.ta = new FCM0000.dsMSSQLTableAdapters.EETGW_DocuFormTableAdapter(); + this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); + subjectLabel = new System.Windows.Forms.Label(); + bodyLabel = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).BeginInit(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // subjectLabel + // + subjectLabel.AutoSize = true; + subjectLabel.Location = new System.Drawing.Point(15, 15); + subjectLabel.Name = "subjectLabel"; + subjectLabel.Size = new System.Drawing.Size(50, 12); + subjectLabel.TabIndex = 12; + subjectLabel.Text = "subject:"; + // + // bodyLabel + // + bodyLabel.AutoSize = true; + bodyLabel.Location = new System.Drawing.Point(28, 41); + bodyLabel.Name = "bodyLabel"; + bodyLabel.Size = new System.Drawing.Size(37, 12); + bodyLabel.TabIndex = 16; + bodyLabel.Text = "body:"; + // + // bn + // + this.bn.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + 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.bindingNavigatorAddNewItem, + this.bindingNavigatorDeleteItem, + this.mailFormBindingNavigatorSaveItem}); + this.bn.Location = new System.Drawing.Point(0, 591); + 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(833, 25); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // 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(65, 22); + this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); + // + // bs + // + this.bs.DataMember = "EETGW_DocuForm"; + this.bs.DataSource = this.dsMSSQL1; + this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); + // + // dsMSSQL1 + // + this.dsMSSQL1.DataSetName = "dsMSSQL"; + this.dsMSSQL1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + 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(23, 22); + 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(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // 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, 25); + // + // 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(23, 22); + 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(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // 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(78, 22); + this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; + this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); + // + // mailFormBindingNavigatorSaveItem + // + this.mailFormBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("mailFormBindingNavigatorSaveItem.Image"))); + this.mailFormBindingNavigatorSaveItem.Name = "mailFormBindingNavigatorSaveItem"; + this.mailFormBindingNavigatorSaveItem.Size = new System.Drawing.Size(67, 22); + this.mailFormBindingNavigatorSaveItem.Text = "Save(&S)"; + this.mailFormBindingNavigatorSaveItem.Click += new System.EventHandler(this.mailFormBindingNavigatorSaveItem_Click); + // + // mailFormDataGridView + // + this.mailFormDataGridView.AllowUserToAddRows = false; + this.mailFormDataGridView.AutoGenerateColumns = false; + this.mailFormDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.mailFormDataGridView.ColumnHeadersHeight = 30; + this.mailFormDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.mailFormDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.cateDataGridViewTextBoxColumn, + this.titleDataGridViewTextBoxColumn}); + this.mailFormDataGridView.DataSource = this.bs; + this.mailFormDataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.mailFormDataGridView.Location = new System.Drawing.Point(0, 0); + this.mailFormDataGridView.Name = "mailFormDataGridView"; + this.mailFormDataGridView.RowTemplate.Height = 23; + this.mailFormDataGridView.Size = new System.Drawing.Size(317, 591); + this.mailFormDataGridView.TabIndex = 2; + this.mailFormDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.mailFormDataGridView_DataError); + // + // cateDataGridViewTextBoxColumn + // + this.cateDataGridViewTextBoxColumn.DataPropertyName = "cate"; + this.cateDataGridViewTextBoxColumn.HeaderText = "cate"; + this.cateDataGridViewTextBoxColumn.Name = "cateDataGridViewTextBoxColumn"; + this.cateDataGridViewTextBoxColumn.Width = 54; + // + // titleDataGridViewTextBoxColumn + // + this.titleDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.titleDataGridViewTextBoxColumn.DataPropertyName = "title"; + this.titleDataGridViewTextBoxColumn.HeaderText = "title"; + this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn"; + // + // panel1 + // + this.panel1.Controls.Add(this.richTextBoxEx1); + this.panel1.Controls.Add(subjectLabel); + this.panel1.Controls.Add(this.subjectTextBox); + this.panel1.Controls.Add(bodyLabel); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(317, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(516, 591); + this.panel1.TabIndex = 3; + // + // subjectTextBox + // + this.subjectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.subjectTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "title", true)); + this.subjectTextBox.Location = new System.Drawing.Point(74, 12); + this.subjectTextBox.Name = "subjectTextBox"; + this.subjectTextBox.Size = new System.Drawing.Size(430, 21); + this.subjectTextBox.TabIndex = 13; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // richTextBoxEx1 + // + this.richTextBoxEx1.AllowBullets = true; + this.richTextBoxEx1.AllowDefaultInsertText = true; + this.richTextBoxEx1.AllowDefaultSmartText = true; + this.richTextBoxEx1.AllowHyphenation = true; + this.richTextBoxEx1.AllowPictures = true; + this.richTextBoxEx1.AllowSpellCheck = true; + this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; + this.richTextBoxEx1.FilePath = ""; + this.richTextBoxEx1.Location = new System.Drawing.Point(74, 41); + this.richTextBoxEx1.Name = "richTextBoxEx1"; + this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + + "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + + "Ex1\\par\r\n}\r\n"; + this.richTextBoxEx1.SetColorWithFont = true; + this.richTextBoxEx1.ShowToolStrip = true; + this.richTextBoxEx1.Size = new System.Drawing.Size(430, 531); + this.richTextBoxEx1.TabIndex = 59; + // + // fJRForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(833, 616); + this.Controls.Add(this.panel1); + this.Controls.Add(this.mailFormDataGridView); + this.Controls.Add(this.bn); + this.Name = "fJRForm"; + this.Text = "문서 양식"; + this.Load += new System.EventHandler(this.fMailform_Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; + 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.ToolStripButton mailFormBindingNavigatorSaveItem; + private System.Windows.Forms.DataGridView mailFormDataGridView; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.TextBox subjectTextBox; + private dsMSSQL dsMSSQL1; + private dsMSSQLTableAdapters.EETGW_DocuFormTableAdapter ta; + private System.Windows.Forms.DataGridViewTextBoxColumn cateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn; + private RichTextBoxEx.RichTextBoxEx richTextBoxEx1; + } +} \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fJRForm.cs b/SubProject/FCM0000/Mail/fJRForm.cs new file mode 100644 index 0000000..32b2824 --- /dev/null +++ b/SubProject/FCM0000/Mail/fJRForm.cs @@ -0,0 +1,96 @@ +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 YARTE.UI.Buttons; + +namespace FCM0000 +{ + public partial class fJRForm : FCOMMON.fBase + { + public fJRForm() + { + InitializeComponent(); + this.dsMSSQL1.EETGW_DocuForm.TableNewRow += MailForm_TableNewRow; + } + + void MailForm_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + e.Row["wuid"] = FCOMMON.info.Login.no; + e.Row["wdate"] = DateTime.Now; + e.Row["title"] = "분류제목"; + e.Row["cate"] = "--"; + e.Row["gcode"] = FCOMMON.info.Login.gcode; + } + + private void fMailform_Load(object sender, EventArgs e) + { + refreshData(); + } + + void refreshData() + { + try + { + ta.Fill(this.dsMSSQL1.EETGW_DocuForm, FCOMMON.info.Login.gcode); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void mailFormBindingNavigatorSaveItem_Click(object sender, EventArgs e) + { + this.Validate(); + this.dr.body = this.richTextBoxEx1.Rtf; + this.bs.EndEdit(); + this.ta.Update(this.dsMSSQL1.EETGW_DocuForm); + + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + + } + dsMSSQL.EETGW_DocuFormRow dr = null; + private void bs_CurrentChanged(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + dr = drv.Row as dsMSSQL.EETGW_DocuFormRow; + try + { + this.richTextBoxEx1.Rtf = dr.body; + } + catch (Exception ex) + { + this.richTextBoxEx1.Text = dr.body; + } + + //this.htmlEditor2.Html = dr.tail; + } + + + private void mailFormDataGridView_DataError(object sender, DataGridViewDataErrorEventArgs e) + { + + } + + private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + var dlg = FCOMMON.Util.MsgQ("선택된 자료를 삭제하시겠습니까?"); + if (dlg != System.Windows.Forms.DialogResult.Yes) return; + bs.RemoveCurrent(); + } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/SubProject/FCM0000/Mail/fJRForm.resx b/SubProject/FCM0000/Mail/fJRForm.resx new file mode 100644 index 0000000..9e402c2 --- /dev/null +++ b/SubProject/FCM0000/Mail/fJRForm.resx @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + False + + + False + + + 81, 17 + + + + + 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== + + + + 17, 17 + + + 147, 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/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 + wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + 147, 17 + + + 258, 17 + + \ No newline at end of file diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index 43b5809..7bb3935 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -44,6 +44,8 @@ namespace FCM0000 { private InventoryUserDataTable tableInventoryUser; + private EETGW_DocuFormDataTable tableEETGW_DocuForm; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -102,6 +104,9 @@ namespace FCM0000 { if ((ds.Tables["InventoryUser"] != null)) { base.Tables.Add(new InventoryUserDataTable(ds.Tables["InventoryUser"])); } + if ((ds.Tables["EETGW_DocuForm"] != null)) { + base.Tables.Add(new EETGW_DocuFormDataTable(ds.Tables["EETGW_DocuForm"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -220,6 +225,16 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public EETGW_DocuFormDataTable EETGW_DocuForm { + get { + return this.tableEETGW_DocuForm; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -317,6 +332,9 @@ namespace FCM0000 { if ((ds.Tables["InventoryUser"] != null)) { base.Tables.Add(new InventoryUserDataTable(ds.Tables["InventoryUser"])); } + if ((ds.Tables["EETGW_DocuForm"] != null)) { + base.Tables.Add(new EETGW_DocuFormDataTable(ds.Tables["EETGW_DocuForm"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -410,6 +428,12 @@ namespace FCM0000 { this.tableInventoryUser.InitVars(); } } + this.tableEETGW_DocuForm = ((EETGW_DocuFormDataTable)(base.Tables["EETGW_DocuForm"])); + if ((initTable == true)) { + if ((this.tableEETGW_DocuForm != null)) { + this.tableEETGW_DocuForm.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -440,6 +464,8 @@ namespace FCM0000 { base.Tables.Add(this.tableHolidayLIst); this.tableInventoryUser = new InventoryUserDataTable(); base.Tables.Add(this.tableInventoryUser); + this.tableEETGW_DocuForm = new EETGW_DocuFormDataTable(); + base.Tables.Add(this.tableEETGW_DocuForm); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -502,6 +528,12 @@ namespace FCM0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeEETGW_DocuForm() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -587,6 +619,9 @@ namespace FCM0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void InventoryUserRowChangeEventHandler(object sender, InventoryUserRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void EETGW_DocuFormRowChangeEventHandler(object sender, EETGW_DocuFormRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -5523,6 +5558,360 @@ namespace FCM0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class EETGW_DocuFormDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnidx; + + private global::System.Data.DataColumn columngcode; + + private global::System.Data.DataColumn columncate; + + private global::System.Data.DataColumn columntitle; + + private global::System.Data.DataColumn columnbody; + + private global::System.Data.DataColumn columnwuid; + + private global::System.Data.DataColumn columnwdate; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormDataTable() { + this.TableName = "EETGW_DocuForm"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal EETGW_DocuFormDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected EETGW_DocuFormDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn idxColumn { + get { + return this.columnidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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", "16.0.0.0")] + public global::System.Data.DataColumn titleColumn { + get { + return this.columntitle; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn bodyColumn { + get { + return this.columnbody; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wuidColumn { + get { + return this.columnwuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wdateColumn { + get { + return this.columnwdate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormRow this[int index] { + get { + return ((EETGW_DocuFormRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event EETGW_DocuFormRowChangeEventHandler EETGW_DocuFormRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event EETGW_DocuFormRowChangeEventHandler EETGW_DocuFormRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event EETGW_DocuFormRowChangeEventHandler EETGW_DocuFormRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event EETGW_DocuFormRowChangeEventHandler EETGW_DocuFormRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddEETGW_DocuFormRow(EETGW_DocuFormRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormRow AddEETGW_DocuFormRow(string gcode, string cate, string title, string body, string wuid, System.DateTime wdate) { + EETGW_DocuFormRow rowEETGW_DocuFormRow = ((EETGW_DocuFormRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + gcode, + cate, + title, + body, + wuid, + wdate}; + rowEETGW_DocuFormRow.ItemArray = columnValuesArray; + this.Rows.Add(rowEETGW_DocuFormRow); + return rowEETGW_DocuFormRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormRow FindByidx(int idx) { + return ((EETGW_DocuFormRow)(this.Rows.Find(new object[] { + idx}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + EETGW_DocuFormDataTable cln = ((EETGW_DocuFormDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new EETGW_DocuFormDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnidx = base.Columns["idx"]; + this.columngcode = base.Columns["gcode"]; + this.columncate = base.Columns["cate"]; + this.columntitle = base.Columns["title"]; + this.columnbody = base.Columns["body"]; + this.columnwuid = base.Columns["wuid"]; + this.columnwdate = base.Columns["wdate"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + 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.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); + this.columncate = new global::System.Data.DataColumn("cate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columncate); + this.columntitle = new global::System.Data.DataColumn("title", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columntitle); + this.columnbody = new global::System.Data.DataColumn("body", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbody); + 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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx}, true)); + this.columnidx.AutoIncrement = true; + this.columnidx.AutoIncrementSeed = -1; + this.columnidx.AutoIncrementStep = -1; + this.columnidx.AllowDBNull = false; + this.columnidx.ReadOnly = true; + this.columnidx.Unique = true; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; + this.columncate.MaxLength = 2; + this.columntitle.MaxLength = 100; + this.columnbody.MaxLength = 2147483647; + this.columnwuid.AllowDBNull = false; + this.columnwuid.MaxLength = 20; + this.columnwdate.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormRow NewEETGW_DocuFormRow() { + return ((EETGW_DocuFormRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new EETGW_DocuFormRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(EETGW_DocuFormRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.EETGW_DocuFormRowChanged != null)) { + this.EETGW_DocuFormRowChanged(this, new EETGW_DocuFormRowChangeEvent(((EETGW_DocuFormRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.EETGW_DocuFormRowChanging != null)) { + this.EETGW_DocuFormRowChanging(this, new EETGW_DocuFormRowChangeEvent(((EETGW_DocuFormRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.EETGW_DocuFormRowDeleted != null)) { + this.EETGW_DocuFormRowDeleted(this, new EETGW_DocuFormRowChangeEvent(((EETGW_DocuFormRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.EETGW_DocuFormRowDeleting != null)) { + this.EETGW_DocuFormRowDeleting(this, new EETGW_DocuFormRowChangeEvent(((EETGW_DocuFormRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveEETGW_DocuFormRow(EETGW_DocuFormRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsMSSQL ds = new dsMSSQL(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "EETGW_DocuFormDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -9502,6 +9891,149 @@ namespace FCM0000 { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class EETGW_DocuFormRow : global::System.Data.DataRow { + + private EETGW_DocuFormDataTable tableEETGW_DocuForm; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal EETGW_DocuFormRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableEETGW_DocuForm = ((EETGW_DocuFormDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int idx { + get { + return ((int)(this[this.tableEETGW_DocuForm.idxColumn])); + } + set { + this[this.tableEETGW_DocuForm.idxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tableEETGW_DocuForm.gcodeColumn])); + } + set { + this[this.tableEETGW_DocuForm.gcodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string cate { + get { + if (this.IscateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_DocuForm.cateColumn])); + } + } + set { + this[this.tableEETGW_DocuForm.cateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string title { + get { + if (this.IstitleNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_DocuForm.titleColumn])); + } + } + set { + this[this.tableEETGW_DocuForm.titleColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string body { + get { + if (this.IsbodyNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_DocuForm.bodyColumn])); + } + } + set { + this[this.tableEETGW_DocuForm.bodyColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string wuid { + get { + return ((string)(this[this.tableEETGW_DocuForm.wuidColumn])); + } + set { + this[this.tableEETGW_DocuForm.wuidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public System.DateTime wdate { + get { + return ((global::System.DateTime)(this[this.tableEETGW_DocuForm.wdateColumn])); + } + set { + this[this.tableEETGW_DocuForm.wdateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IscateNull() { + return this.IsNull(this.tableEETGW_DocuForm.cateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetcateNull() { + this[this.tableEETGW_DocuForm.cateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IstitleNull() { + return this.IsNull(this.tableEETGW_DocuForm.titleColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SettitleNull() { + this[this.tableEETGW_DocuForm.titleColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsbodyNull() { + return this.IsNull(this.tableEETGW_DocuForm.bodyColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetbodyNull() { + this[this.tableEETGW_DocuForm.bodyColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -9841,6 +10373,40 @@ namespace FCM0000 { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class EETGW_DocuFormRowChangeEvent : global::System.EventArgs { + + private EETGW_DocuFormRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormRowChangeEvent(EETGW_DocuFormRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace FCM0000.dsMSSQLTableAdapters { @@ -18277,6 +18843,458 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class EETGW_DocuFormTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public EETGW_DocuFormTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "EETGW_DocuForm"; + tableMapping.ColumnMappings.Add("idx", "idx"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("cate", "cate"); + tableMapping.ColumnMappings.Add("title", "title"); + tableMapping.ColumnMappings.Add("body", "body"); + tableMapping.ColumnMappings.Add("wuid", "wuid"); + tableMapping.ColumnMappings.Add("wdate", "wdate"); + 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 [eetgw_docuform] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + 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("@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_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.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.DeleteCommand.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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_title", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "title", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.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.DeleteCommand.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.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [eetgw_docuform] ([gcode], [cate], [title], [body], [wuid], [wdate]) VALUES (@gcode, @cate, @title, @body, @wuid, @wdate); +SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, title"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + 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("@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("@title", global::System.Data.SqlDbType.VarChar, 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("@body", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "body", 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.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [eetgw_docuform] SET [gcode] = @gcode, [cate] = @cate, [title] = @title, [body] = @body, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); +SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx = @idx) ORDER BY cate, title"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + 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("@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("@title", global::System.Data.SqlDbType.VarChar, 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("@body", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "body", 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("@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("@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_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, 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_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.VarChar, 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("@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("@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()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FCM0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "select * from eetgw_docuform\r\nwhere gcode =@gcode\r\norder by cate,title"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + 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, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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.EETGW_DocuFormDataTable dataTable, string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual dsMSSQL.EETGW_DocuFormDataTable GetData(string gcode) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + dsMSSQL.EETGW_DocuFormDataTable dataTable = new dsMSSQL.EETGW_DocuFormDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsMSSQL.EETGW_DocuFormDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsMSSQL dataSet) { + return this.Adapter.Update(dataSet, "EETGW_DocuForm"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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_gcode, string Original_cate, string Original_title, string Original_wuid, System.DateTime Original_wdate) { + this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_gcode)); + } + if ((Original_cate == null)) { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_cate)); + } + if ((Original_title == null)) { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_title)); + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_wuid)); + } + this.Adapter.DeleteCommand.Parameters[7].Value = ((System.DateTime)(Original_wdate)); + 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)) { + this.Adapter.DeleteCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.DeleteCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] + public virtual int Insert(string gcode, string cate, string title, string body, string wuid, System.DateTime wdate) { + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.InsertCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((cate == null)) { + this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[1].Value = ((string)(cate)); + } + if ((title == null)) { + this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(title)); + } + if ((body == null)) { + this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(body)); + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(wuid)); + } + this.Adapter.InsertCommand.Parameters[5].Value = ((System.DateTime)(wdate)); + 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)) { + this.Adapter.InsertCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.InsertCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 gcode, string cate, string title, string body, string wuid, System.DateTime wdate, int Original_idx, string Original_gcode, string Original_cate, string Original_title, string Original_wuid, System.DateTime Original_wdate, int idx) { + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((cate == null)) { + this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(cate)); + } + if ((title == null)) { + this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(title)); + } + if ((body == null)) { + this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(body)); + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(wuid)); + } + this.Adapter.UpdateCommand.Parameters[5].Value = ((System.DateTime)(wdate)); + this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_idx)); + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_gcode)); + } + if ((Original_cate == null)) { + this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_cate)); + } + if ((Original_title == null)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_title)); + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_wuid)); + } + this.Adapter.UpdateCommand.Parameters[13].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[14].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)) { + this.Adapter.UpdateCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.UpdateCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 gcode, string cate, string title, string body, string wuid, System.DateTime wdate, int Original_idx, string Original_gcode, string Original_cate, string Original_title, string Original_wuid, System.DateTime Original_wdate) { + return this.Update(gcode, cate, title, body, wuid, wdate, Original_idx, Original_gcode, Original_cate, Original_title, Original_wuid, Original_wdate, Original_idx); + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -18309,6 +19327,8 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, private InventoryUserTableAdapter _inventoryUserTableAdapter; + private EETGW_DocuFormTableAdapter _eETGW_DocuFormTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -18464,6 +19484,20 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public EETGW_DocuFormTableAdapter EETGW_DocuFormTableAdapter { + get { + return this._eETGW_DocuFormTableAdapter; + } + set { + this._eETGW_DocuFormTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -18523,6 +19557,10 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, && (this._inventoryUserTableAdapter.Connection != null))) { return this._inventoryUserTableAdapter.Connection; } + if (((this._eETGW_DocuFormTableAdapter != null) + && (this._eETGW_DocuFormTableAdapter.Connection != null))) { + return this._eETGW_DocuFormTableAdapter.Connection; + } return null; } set { @@ -18566,6 +19604,9 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, if ((this._inventoryUserTableAdapter != null)) { count = (count + 1); } + if ((this._eETGW_DocuFormTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -18667,6 +19708,15 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, allChangedRows.AddRange(updatedRows); } } + if ((this._eETGW_DocuFormTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._eETGW_DocuFormTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -18757,6 +19807,14 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, allAddedRows.AddRange(addedRows); } } + if ((this._eETGW_DocuFormTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._eETGW_DocuFormTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -18767,6 +19825,14 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateDeletedRows(dsMSSQL dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; + if ((this._eETGW_DocuFormTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.EETGW_DocuForm.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._eETGW_DocuFormTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._inventoryUserTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.InventoryUser.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -18926,6 +19992,10 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, && (this.MatchTableAdapterConnection(this._inventoryUserTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); } + if (((this._eETGW_DocuFormTableAdapter != null) + && (this.MatchTableAdapterConnection(this._eETGW_DocuFormTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager에 연결 정보가 없습니다. 각 TableAdapterManager TableAdapter 속성을 올바른 Tabl" + @@ -19047,6 +20117,15 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, adaptersWithAcceptChangesDuringUpdate.Add(this._inventoryUserTableAdapter.Adapter); } } + if ((this._eETGW_DocuFormTableAdapter != null)) { + revertConnections.Add(this._eETGW_DocuFormTableAdapter, this._eETGW_DocuFormTableAdapter.Connection); + this._eETGW_DocuFormTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._eETGW_DocuFormTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._eETGW_DocuFormTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._eETGW_DocuFormTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._eETGW_DocuFormTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -19145,6 +20224,10 @@ SELECT idx, pdate, invtype, uid, item, ItemName, serial, dr_qty, dr_amt, cr_qty, this._inventoryUserTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._inventoryUserTableAdapter])); this._inventoryUserTableAdapter.Transaction = null; } + if ((this._eETGW_DocuFormTableAdapter != null)) { + this._eETGW_DocuFormTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._eETGW_DocuFormTableAdapter])); + this._eETGW_DocuFormTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 567ad2f..2dfc97b 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -1540,6 +1540,84 @@ ORDER BY pdate + + + + + + DELETE FROM [eetgw_docuform] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + + + + + + + + + + + + + + + INSERT INTO [eetgw_docuform] ([gcode], [cate], [title], [body], [wuid], [wdate]) VALUES (@gcode, @cate, @title, @body, @wuid, @wdate); +SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, title + + + + + + + + + + + + + select * from eetgw_docuform +where gcode =@gcode +order by cate,title + + + + + + + + UPDATE [eetgw_docuform] SET [gcode] = @gcode, [cate] = @cate, [title] = @title, [body] = @body, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); +SELECT idx, gcode, cate, title, body, wuid, wdate FROM EETGW_DocuForm WHERE (idx = @idx) ORDER BY cate, title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1548,7 +1626,7 @@ ORDER BY pdate - + @@ -1640,7 +1718,7 @@ ORDER BY pdate - + @@ -1692,7 +1770,7 @@ ORDER BY pdate - + @@ -1760,7 +1838,7 @@ ORDER BY pdate - + @@ -1849,7 +1927,7 @@ ORDER BY pdate - + @@ -1962,7 +2040,7 @@ ORDER BY pdate - + @@ -2027,7 +2105,7 @@ ORDER BY pdate - + @@ -2168,7 +2246,7 @@ ORDER BY pdate - + @@ -2289,7 +2367,7 @@ ORDER BY pdate - + @@ -2319,7 +2397,7 @@ ORDER BY pdate - + @@ -2396,6 +2474,49 @@ ORDER BY pdate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2438,5 +2559,9 @@ ORDER BY pdate + + + + \ No newline at end of file diff --git a/SubProject/FCM0000/dsMSSQL.xss b/SubProject/FCM0000/dsMSSQL.xss index f356093..0fe5fbf 100644 --- a/SubProject/FCM0000/dsMSSQL.xss +++ b/SubProject/FCM0000/dsMSSQL.xss @@ -6,16 +6,17 @@ --> - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FCM0000/packages.config b/SubProject/FCM0000/packages.config index 383fa6c..93c3455 100644 --- a/SubProject/FCM0000/packages.config +++ b/SubProject/FCM0000/packages.config @@ -4,4 +4,6 @@ + + \ No newline at end of file diff --git a/SubProject/FCOMMON/Auth.cs b/SubProject/FCOMMON/Auth.cs index f7b1009..cec7a74 100644 --- a/SubProject/FCOMMON/Auth.cs +++ b/SubProject/FCOMMON/Auth.cs @@ -15,6 +15,7 @@ namespace FCOMMON project, jobreport, savecost, + equipment, } public static int getAuth(eAuthType type, string uid) { diff --git a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs index 9475531..b9947e4 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs @@ -95,7 +95,7 @@ this.cmbPlant = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.btImport = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton(); this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); @@ -720,7 +720,7 @@ // this.toolStrip1.AutoSize = false; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton5, + this.btImport, this.toolStripSeparator3, this.toolStripButton2, this.toolStripButton4, @@ -736,14 +736,14 @@ this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton5 + // btImport // - 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(63, 27); - this.toolStripButton5.Text = "Import"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + this.btImport.Image = ((System.Drawing.Image)(resources.GetObject("btImport.Image"))); + this.btImport.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btImport.Name = "btImport"; + this.btImport.Size = new System.Drawing.Size(63, 27); + this.btImport.Text = "Import"; + this.btImport.Click += new System.EventHandler(this.toolStripButton5_Click); // // toolStripSeparator3 // @@ -988,7 +988,7 @@ private System.Windows.Forms.ToolStripButton btFind; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton toolStripButton4; - private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripButton btImport; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripButton btRefresh; private System.Windows.Forms.ToolStripComboBox cmbDate; diff --git a/SubProject/FEQ0000/Equipment/fEquipment.resx b/SubProject/FEQ0000/Equipment/fEquipment.resx index 8a21bd5..81b7beb 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.resx +++ b/SubProject/FEQ0000/Equipment/fEquipment.resx @@ -264,7 +264,7 @@ 662, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY8AFvCu2KMV3H9sMwiA2VJh4EFCxxbh+1ZP/ @@ -276,12 +276,12 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95rSQFq1rqoi3dmi - laaCRJ0U1J26ak2TVX5BShaC6NIHhTH3OlMa8zB64MBlzv3OMDAkS5yTlfF5SR9b5TrM4riYAPBGqjnz - m3OwN1LMwiW6rq+6bO0s9Lfn/KXPwTDDGWRiLV0I23F4ucSxlWFmCQTeFR2G/k4CloYS2Ek8B9/MVDMP - loadKaODRQkMU5sOisDSWBIxWDKxyloYbH3K8OF2lzcbVZz7XY2f9mo4N4wqZnLvKTj8eLyobBLnMl5w - d93ihig4PtL4Sfe7wDDW+f1NK15gVTbwGS6j7ddZ+02Gvxl2gUFYymXq3nPQeU8Dlp0KS7k23c8rgQwu - EuvpyipBOMrEWr5+lvwJlvKYcgDgv2AQfJKJVao50T9Z/LqECPkCQFvo8kh4xsQAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIKlSV1URd7Zo + pakgUScFdaeuWtNklV8Q20Wh6NIHhTH3OlMa8zB64MBlzv3OMDAkS5yTlcFFSR/Y5S2YxXExAeD3VSsM + zDnY7ytW4RJd11c9tnY+Drbn/KXDwTDDGWRiLV0IO3F4ucR1lF5mCQT+Ne2Ng50ELA0lsJN4Dr6ZqVYe + LA07I0a7ixIYRg7tFoGlsSRisGRol7VJWP+U4ePdLq+bVZw7LY2ftWs4m0YVM7k3DQ8/ni4rm8S9ihfc + 3zS4IQpOjjV+2vouMIx1/nDbiBfYlQ18hsdo8/W5+SbD3wy7wCAs5TF1bxYevacBy06FpTyH7ueVQAYX + ifV0ZZUgHGViLV8/S/4ES/lMOQDwXzAIPsnQLtXc6J8sfl1ChHwB8t3o2JbHURQAAAAASUVORK5CYII= @@ -291,11 +291,11 @@ s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6 Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW - d/+7t3/4X7/u2p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb + d/+7t3/4X7/u6p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY - APJdLweoPgUPAAAAAElFTkSuQmCC + AO4qLwXbx/l9AAAAAElFTkSuQmCC @@ -313,14 +313,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3 - BqQwSzN1W9vW2nLNLLfN3VazVhNDs+gFDTsVSBFFmXWJKDKn3RixtSXtgd9lfv9nmGEYTTl01EaPxb2N - W+gtp8UVMOpxbyeq/kaHL7dhTMgfSN2/JrMQykk85iF3cpGVNiIBADVo9DdSWW3ziKHTh9y3WJrw2c3n - tGsLR+O/mXLy/fvp6w81uRDhJJ3RkitdSFFCclFWTfqZROYTmpb9BqQoWQwchtWk0uDrIQopSub5fUFN - +JmEFIt7B0OKEqPDrz26fVMVCxHPL190Nk8PUpQMmOlmkhGf1EQ58uvMuEUWjSsBgKqfpFgfthPP2bx7 - z8d37wo5lrrKzawGg8PjRAtSigAMazQucZEFLpyfsHs8fQTRYF0JjNiFmG+ej8ZnuQhrdPp7NRBWIaUI - MFGtJge/y0WTcHKB2ZTkWlSVZxB3tJtp/oCPnUEDxYoArNWhqjyjU3SHld48FeIpKB0/PKS3N6GqMvQk - MyccnEP5BPIHQsuVo7U5uscINyFfAy39A43mC+KPl0d6N00oAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNbLwNBGIZLEBHHG4lfIK78hf4XibhxJeLO + JA2p6kkPtta2lm5V6Vrd7aqy2qbSA6HSSl2RIBLifCNCVMeujOjqRutJ3pt5v2cyk8moKqEl19RW3yZm + pTY8Vm/YqMMC3aj6Gy222GGnI6Fw/uYl9wChlOx9EbKZkwdxIwIAUIdGyxHLWodfiBzeFr7E34nlLj+m + vBsYGi/H5OEGUmcX70ryd/jM2Z2GWOpBihyCTTBKUmmydx/QvBgyIEXOfHgvpiT9DrYaIZEix8WleCWh + NFkxVt+WHSlyjO6QZv/qVVH8jnB8+qx1+NVIkTNooVoJWnhUEqVIrzPtExg0LgcAslFPMuu2rXTBEdh5 + Orh+k8nJ/Hlhenl7e2QCb0PKD8BubzYusHFXIFqcdPr9/TjeZFsKjzr55LqLS6Rn2Dhj9IT6VBDWIOUH + YCbbzW4uyiZyUD9HB0W5HlWVGcLcnRaK2+WSR9BAMgIAKw2oqsyYieqyUcFDPp2H4vFjwzpnC6qqQ0fQ + s/zuMZROIH0gtFw9Goe7dxz34dI10NI/UKk+AdEclz8RrkwTAAAAAElFTkSuQmCC diff --git a/SubProject/FEQ0000/Equipment/fImpEquipment.cs b/SubProject/FEQ0000/Equipment/fImpEquipment.cs index a94649a..a4426b3 100644 --- a/SubProject/FEQ0000/Equipment/fImpEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fImpEquipment.cs @@ -28,6 +28,18 @@ namespace FEQ0000 FCOMMON.Util.SetFormStatus(ref form, this.Name, true); this.Show(); Application.DoEvents(); + + //권하니없으면 button3을 막는다 + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.equipment)); + if (curLevel >= 5) + { + button3.Enabled = true; + } + else + { + button3.Enabled = false; + } + } void __Closed(object sender, FormClosedEventArgs e) diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index bac2f17..5bd93de 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -836,7 +836,7 @@ this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); this.tbPumPriceD.TabIndex = 36; this.tbPumPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.tbPumPriceD.TextChanged += new System.EventHandler(this.textBox1_TextChanged); + this.tbPumPriceD.TextChanged += new System.EventHandler(this.tbDolloerPrice_TextChanged); // // label8 // diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 9837e80..64d3f5b 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -15,6 +15,7 @@ namespace FEQ0000 BindingSource bsModel; dsPurchase.PurchaseRow dr; public Boolean repeatAdd = false; + Boolean binit = false; public fPurchase_Add(dsPurchase.PurchaseRow dr_) { InitializeComponent(); @@ -268,6 +269,7 @@ namespace FEQ0000 } } } + binit = true; @@ -932,10 +934,11 @@ namespace FEQ0000 FCOMMON.Util.RunExplorer(path); } - private void textBox1_TextChanged(object sender, EventArgs e) + private void tbDolloerPrice_TextChanged(object sender, EventArgs e) { //단가에 금액이 없는경우에는 환율을 곱해준다. //if ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0) + if(binit) { if (decimal.TryParse(tbPumPriceD.Text, out decimal priced) == true) { diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 89fbbbf..7fdbda7 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -1821,11 +1821,11 @@ namespace FEQ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public decimal pumpriceD { get { - try { - return ((decimal)(this[this.tablePurchase.pumpriceDColumn])); + if (this.IspumpriceDNull()) { + return 0m; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'pumpriceD\' 열의 값이 DBNull입니다.", e); + else { + return ((decimal)(this[this.tablePurchase.pumpriceDColumn])); } } set { diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index c722bac..2e90695 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -340,7 +340,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - + @@ -530,7 +530,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - + diff --git a/SubProject/FPJ0000/Auth.cs b/SubProject/FPJ0000/Auth.cs index 8c788c9..667f884 100644 --- a/SubProject/FPJ0000/Auth.cs +++ b/SubProject/FPJ0000/Auth.cs @@ -23,5 +23,6 @@ namespace FPJ0000 public Nullable jobreport { get; set; } public Nullable savecost { get; set; } public Nullable scheapp { get; set; } + public Nullable equipment { get; set; } } } diff --git a/SubProject/FPJ0000/EETGW_DocuForm.cs b/SubProject/FPJ0000/EETGW_DocuForm.cs new file mode 100644 index 0000000..1a983f3 --- /dev/null +++ b/SubProject/FPJ0000/EETGW_DocuForm.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace FPJ0000 +{ + using System; + using System.Collections.Generic; + + public partial class EETGW_DocuForm + { + public int idx { get; set; } + public string gcode { get; set; } + public string cate { get; set; } + public string title { get; set; } + public string body { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } + } +} diff --git a/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs b/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs index 2767314..bc1e6ea 100644 --- a/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs +++ b/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs @@ -47,5 +47,6 @@ namespace FPJ0000 public System.DateTime wdate { get; set; } public string 원인2 { get; set; } public string 결과2 { get; set; } + public Nullable refdata { get; set; } } } diff --git a/SubProject/FPJ0000/EETGW_SaveCost.cs b/SubProject/FPJ0000/EETGW_SaveCost.cs index 3e6a055..6d4da5c 100644 --- a/SubProject/FPJ0000/EETGW_SaveCost.cs +++ b/SubProject/FPJ0000/EETGW_SaveCost.cs @@ -46,5 +46,7 @@ namespace FPJ0000 public Nullable fanout { get; set; } public Nullable weekly { get; set; } public Nullable Highlight { get; set; } + public Nullable bef_time { get; set; } + public Nullable aft_time { get; set; } } } diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 061eb57..4fe5d24 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -216,6 +216,9 @@ fEBoardReport.cs + + Model1.tt + Model1.tt diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index ef1b786..2eb8ebe 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -393,6 +393,7 @@ namespace FPJ0000 private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) { var newdr = this.dsMSSQL.JobReport.NewJobReportRow(); + newdr.status = "진행 중"; newdr.pdate = DateTime.Now.ToShortDateString(); if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday || DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0; diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index df6ee89..a11b429 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -323,6 +323,7 @@ this.cmbState.Name = "cmbState"; this.cmbState.Size = new System.Drawing.Size(160, 20); this.cmbState.TabIndex = 4; + this.cmbState.SelectedIndexChanged += new System.EventHandler(this.chkform_indexchan); // // cmbPackage // @@ -349,9 +350,12 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; this.tam.JobReportTableAdapter = this.ta; @@ -399,7 +403,7 @@ this.richTextBoxEx1.Location = new System.Drawing.Point(0, 129); this.richTextBoxEx1.Name = "richTextBoxEx1"; this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + - "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + + "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + "Ex1\\par\r\n}\r\n"; this.richTextBoxEx1.SetColorWithFont = true; this.richTextBoxEx1.ShowToolStrip = true; diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 8f1136d..9a376f6 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -160,7 +160,7 @@ namespace FPJ0000.JobReport_ if (this.richTextBoxEx1.Text.Trim() != "") { - this.richTextBoxEx1.Focus(); + this.richTextBoxEx1.Focus(); } else { @@ -168,7 +168,7 @@ namespace FPJ0000.JobReport_ tbProject.SelectAll(); } tbProject.Tag = tbProject.Text; - + // if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description; //editor @@ -179,12 +179,12 @@ namespace FPJ0000.JobReport_ //ed.DisplayEditForm(this.panel1); //ed.AllowRtf = true; - + bInit = true; } - // editform.editor ed; + // editform.editor ed; void ctl_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) @@ -287,7 +287,7 @@ namespace FPJ0000.JobReport_ tbProject.Focus(); return; } - if (cmbType.Text != "휴가" && string.IsNullOrEmpty( this.richTextBoxEx1.Text )==true) + if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true) { FCOMMON.Util.MsgE("진행 내용이 없습니다."); this.richTextBoxEx1.Focus(); @@ -364,7 +364,7 @@ namespace FPJ0000.JobReport_ } double hrs2 = 0.0; - if(double.TryParse(tbHrs.Text,out hrs2) ==false) + if (double.TryParse(tbHrs.Text, out hrs2) == false) { FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요"); tbHrs.Focus(); @@ -421,6 +421,49 @@ namespace FPJ0000.JobReport_ if (predr["process"] != DBNull.Value) cmbProcess.Text = predr["process"].ToString(); //190506 } + + } + chkform_indexchan(sender, e); + + } + + void chkform_indexchan(object sender, EventArgs e) + { + if (cmbType.Text.Trim() != "" && + cmbType.SelectedIndex >= 0 && cmbState.Text.Trim().isEmpty() == false) + { + + + //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다. + var formname = cmbType.Text.Trim() + "|" + cmbState.Text.Trim(); + var db = new EEEntities(); + var dr = db.EETGW_DocuForm.Where(t => t.cate == "J1" && t.title == formname).FirstOrDefault(); + if (dr != null) + { + + + //신규상태이다 + if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached) + { + if (this.richTextBoxEx1.Text.isEmpty()) + { + this.richTextBoxEx1.Rtf = dr.body; + } + else + { + //뭔가 자료가 있는가? + if (this.richTextBoxEx1.Text.Length < 10) + { + if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) + { + this.richTextBoxEx1.Rtf = dr.body + this.richTextBoxEx1.Rtf; + + } + } + } + } + } + } } diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc b/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc index 71e93bf..1c3c879 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc @@ -210,7 +210,7 @@ - 1.12417cm + 1.46813cm @@ -465,7 +465,7 @@ DataSet1 2.17042cm - 7.26188cm + 7.60584cm diff --git a/SubProject/FPJ0000/Model1.Context.cs b/SubProject/FPJ0000/Model1.Context.cs index 6b19689..fdf7f63 100644 --- a/SubProject/FPJ0000/Model1.Context.cs +++ b/SubProject/FPJ0000/Model1.Context.cs @@ -45,5 +45,6 @@ namespace FPJ0000 public virtual DbSet Projects { get; set; } public virtual DbSet vEETGW_Project_LayoutList { get; set; } public virtual DbSet EETGW_Project_Layout { get; set; } + public virtual DbSet EETGW_DocuForm { get; set; } } } diff --git a/SubProject/FPJ0000/Model1.edmx b/SubProject/FPJ0000/Model1.edmx index b57af37..c54a018 100644 --- a/SubProject/FPJ0000/Model1.edmx +++ b/SubProject/FPJ0000/Model1.edmx @@ -18,6 +18,7 @@ + @@ -34,6 +35,18 @@ + + + + + + + + + + + + @@ -71,6 +84,7 @@ + @@ -148,6 +162,8 @@ + + @@ -299,6 +315,7 @@ + @@ -319,6 +336,7 @@ + @@ -481,10 +499,12 @@ + + @@ -581,7 +601,8 @@ [vUserWorkTimeList].[uname] AS [uname], [vUserWorkTimeList].[hrs] AS [hrs], [vUserWorkTimeList].[ot] AS [ot], - [vUserWorkTimeList].[UserProcess] AS [UserProcess] + [vUserWorkTimeList].[UserProcess] AS [UserProcess], + [vUserWorkTimeList].[holyot] AS [holyot] FROM [dbo].[vUserWorkTimeList] AS [vUserWorkTimeList] @@ -670,6 +691,7 @@ + @@ -692,6 +714,7 @@ + @@ -741,6 +764,7 @@ + @@ -778,6 +802,8 @@ + + @@ -861,6 +887,7 @@ + @@ -987,6 +1014,7 @@ + @@ -1043,6 +1071,7 @@ + @@ -1078,6 +1107,18 @@ + + + + + + + + + + + + @@ -1156,6 +1197,7 @@ + @@ -1182,6 +1224,7 @@ + @@ -1221,6 +1264,8 @@ + + @@ -1305,6 +1350,7 @@ + @@ -1461,6 +1507,7 @@ + @@ -1476,6 +1523,7 @@ + @@ -1565,6 +1613,19 @@ + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/Model1.edmx.diagram b/SubProject/FPJ0000/Model1.edmx.diagram index 5f2918e..56174ae 100644 --- a/SubProject/FPJ0000/Model1.edmx.diagram +++ b/SubProject/FPJ0000/Model1.edmx.diagram @@ -25,6 +25,7 @@ + diff --git a/SubProject/FPJ0000/Project/fProjectLayout.cs b/SubProject/FPJ0000/Project/fProjectLayout.cs index 9b459ec..f69da3d 100644 --- a/SubProject/FPJ0000/Project/fProjectLayout.cs +++ b/SubProject/FPJ0000/Project/fProjectLayout.cs @@ -95,7 +95,7 @@ namespace FPJ0000 data.champion = string.Empty; data.duedate = "미 할당"; data.project = -1; - data.reserve = string.Empty; + data.reserve = dr.reserve; // string.Empty; 예약자는 그대로 한다. } else { @@ -381,6 +381,17 @@ namespace FPJ0000 private void 편집ToolStripMenuItem_Click(object sender, EventArgs e) { + var currentime = this.ctlLayout1.items[this.no - 1]; + if (currentime.project == -1 && currentime.reserve.isEmpty() == false) + { + //프로젝트가 할당된 상태가 아니다. + if (currentime.reserve != FCOMMON.info.Login.nameK) + { + FCOMMON.Util.MsgE($"다음 예약자 {currentime.reserve} 가 아닙니다.\r\n해당 예약자가 취소해야 등록 가능 합니다"); + return; + } + } + var f = new FCM0000.fLovProject(string.Empty, "진행"); if (f.ShowDialog() == DialogResult.OK) { @@ -399,7 +410,7 @@ namespace FPJ0000 newdr.col = 1; newdr.rowspan = 1; newdr.colspan = 1; - newdr.wdate = DateTime.Now; + newdr.wdate = DateTime.Now; newdr.wuid = FCOMMON.info.Login.no; db.EETGW_Project_Layout.Add(newdr); db.SaveChanges(); @@ -587,18 +598,18 @@ namespace FPJ0000 private void 프로젝트해제ToolStripMenuItem_Click(object sender, EventArgs e) { - if(this.project < 1) + if (this.project < 1) { FCOMMON.Util.MsgE("선택된 프로젝트가 없습니다"); return; } var dlg = FCOMMON.Util.MsgQ("슬롯 " + this.no.ToString() + "의 프로젝트를 해제 할까요?\n" + "해당 슬롯은 '미사용'이 됩니다"); - if(dlg == DialogResult.Yes) + if (dlg == DialogResult.Yes) { var db = new EEEntities(); - var dr= db.EETGW_Project_Layout.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.no == this.no).FirstOrDefault(); - if(dr != null) + var dr = db.EETGW_Project_Layout.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.no == this.no).FirstOrDefault(); + if (dr != null) { dr.project = -1; db.SaveChanges(); diff --git a/SubProject/FPJ0000/Projects.cs b/SubProject/FPJ0000/Projects.cs index 242a6a1..60b4cca 100644 --- a/SubProject/FPJ0000/Projects.cs +++ b/SubProject/FPJ0000/Projects.cs @@ -65,5 +65,6 @@ namespace FPJ0000 public Nullable EB_RepairTime { get; set; } public Nullable EB_ConstNew { get; set; } public string EB_BoardName { get; set; } + public Nullable bAlert { get; set; } } } diff --git a/SubProject/FPJ0000/Purchase.cs b/SubProject/FPJ0000/Purchase.cs index 4417bb8..3d56551 100644 --- a/SubProject/FPJ0000/Purchase.cs +++ b/SubProject/FPJ0000/Purchase.cs @@ -48,5 +48,6 @@ namespace FPJ0000 public string wuid { get; set; } public System.DateTime wdate { get; set; } public Nullable inqty { get; set; } + public Nullable pumpriceD { get; set; } } } diff --git a/SubProject/FPJ0000/vUserWorkTimeList.cs b/SubProject/FPJ0000/vUserWorkTimeList.cs index 724caf9..1603263 100644 --- a/SubProject/FPJ0000/vUserWorkTimeList.cs +++ b/SubProject/FPJ0000/vUserWorkTimeList.cs @@ -22,5 +22,6 @@ namespace FPJ0000 public Nullable hrs { get; set; } public Nullable ot { get; set; } public string UserProcess { get; set; } + public Nullable holyot { get; set; } } }