From 35d6c64b992184c6903d8c7e733a2d145351a7eb Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 19 Mar 2021 14:08:42 +0900 Subject: [PATCH] .. --- Project/EETGW.csproj | 3 + Project/fMain.Designer.cs | 42 +- Project/fMain.resx | 60 +-- SubProject/FEQ0000/Purchase/fPurchase.cs | 2 +- .../FPJ0000/EBoard/fEboardList.Designer.cs | 169 ++++--- SubProject/FPJ0000/EBoard/fEboardList.resx | 31 +- .../Project/fPartBuyStatus.Designer.cs | 59 ++- SubProject/FPJ0000/Project/fPartBuyStatus.cs | 34 +- .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- .../FPJ0000/Project/fPartList.Designer.cs | 86 +++- SubProject/FPJ0000/Project/fPartList.cs | 46 +- SubProject/FPJ0000/Project/fPartList.resx | 28 +- .../FPJ0000/Project/fProjectList.Designer.cs | 478 +++++++++--------- SubProject/FPJ0000/Project/fProjectList.cs | 2 +- SubProject/FPJ0000/Project/fProjectList.resx | 58 +-- SubProject/FPJ0000/dsPRJ.Designer.cs | 71 ++- SubProject/FPJ0000/dsPRJ.xsd | 52 +- SubProject/FPJ0000/dsPRJ.xss | 20 +- 18 files changed, 731 insertions(+), 538 deletions(-) diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 9fe5229..9525f8e 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -579,6 +579,9 @@ Settings.settings True + + PreserveNewest + PreserveNewest diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 87d73c3..477e18c 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -239,14 +239,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 +257,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 +284,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 +299,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); // @@ -343,15 +343,15 @@ // 목록ToolStripMenuItem // this.목록ToolStripMenuItem.Name = "목록ToolStripMenuItem"; - this.목록ToolStripMenuItem.Size = new System.Drawing.Size(162, 24); + this.목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.목록ToolStripMenuItem.Text = "목록"; this.목록ToolStripMenuItem.Click += new System.EventHandler(this.목록ToolStripMenuItem_Click); // // 구매진행현황ToolStripMenuItem // this.구매진행현황ToolStripMenuItem.Name = "구매진행현황ToolStripMenuItem"; - this.구매진행현황ToolStripMenuItem.Size = new System.Drawing.Size(162, 24); - this.구매진행현황ToolStripMenuItem.Text = "구매진행현황"; + this.구매진행현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.구매진행현황ToolStripMenuItem.Text = "CR구매현황"; this.구매진행현황ToolStripMenuItem.Click += new System.EventHandler(this.구매진행현황ToolStripMenuItem_Click); // // mn_dailyhistory @@ -550,39 +550,39 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 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(180, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -591,7 +591,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -600,7 +600,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -608,7 +608,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -616,7 +616,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -625,7 +625,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -634,7 +634,7 @@ // this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red; this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24); + this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24); this.toolStripMenuItem5.Text = "(test)휴가등록"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // diff --git a/Project/fMain.resx b/Project/fMain.resx index cf3ef9f..182be84 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -374,53 +374,53 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJGSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB - QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQUhXUZjBB6jyLWjPZtQbCpI7Z5t7teTs/53StLVOiByz7ce55z - nnPO1P9O1lC+r4aak9+CPHbKUL+fGOqP+3rjkY/HMobKE5DvPYKF4BksDp7DUtgPeQf3s7UjbN75JpXL - tW7FQuA0itf9KI0EUArtwnKkFT9nB1ANbrAgu0nF0oay8qeOoRjpx48r7bCiHtgjO1Afc55fyUHYV9dZ - kG1S0yKtvjhwFqXbAVTC21B3gfbUbtSedaH66ijs3CjKb5tXLyAzwUtD51GeCKJ2y+MAE22oPj8EK90D - 68tJ/djfx1F+72ks4M2UTWaC7eHtGlx73AHro1eDvqW9uP+yG6FkG0Y/DGFL7J8TaBhvpuwV5prZDStz - AssCnn7RBd/sTnQ8asHeh82Ivgth84S7gFEx0+KNC6hca2kwC7jwuQc3U3vQ6QKPxwPoG08gbn7CgUsz - zgLmzKgqscvaMN5M2WQmeJ8AD947jL47CUyaGUyZ87j7NOMsEHYfS8KcGRXZtWGubDITHI4nNTA6+Qa9 - EVPA8dr+/pnXNG+ODWNJmDOjots0jDdTNpkJ9g+nNLDz4oN2LZ0jCgqsJxumb5ecyU63aRhvpmwyE+zC - GiMLbHab9dTypSRcwKg0uxhGdspexbwyvJ9/DHZb11MaxpIwZ0ZFtx3D1mHnMD5Rof8Y7DbryYaxJMyZ - TvPRhq0Zpf4Ceg/0YoD8hh0AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB + QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQUgjUGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z + nnPO1P9OzlC+r4aal9+iPHbaUL9nDfXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn + W7djMXAWpZt+lEcCKIf2YCXSip9zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss + yDWpaZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg + fjmtH/v7OCrvPY0FvJmyyUywPbxTg63ZDpgfvRr0LePFw5fdCKXaMPphCNti/5xAw3gzZa8yW8lumNlT + WBHw9Isu+OZ2o+NJC/Y/bkb0XQhbJ9wFjIqZlm5dQvVGS4NZwMXPPbid3odOF3gyHkDfeALx5CccujLj + LGDOjKoau6oN482UTWaCDwjw8IOj6LuXwGQyi6nkAu4/zToLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv + JCnguHWwf+Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/KhdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw + xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm + 03y0YetGqb9z/fRfd2rziQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Us99ZTmU0S3iCJIst6i - hxAqGg22hlPadIri5ly4Nadjd7q55XRymVdqM5sOQmUPbjqX00J0oEwwRd96EgYhW32dc7yJUlF9cLjw + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Us99ZTaU0S3iCLIsN6i + hxAqWgy2hlPadIri5ly4Nadjd7q55XRymVdqM5sOQmUPbjqX00J0oEwwRd96EgYhW32dc7yJUlF9cLjw nfv9//f9/+H+hOfSDWhDV/AoUIrbvnPfZPrf8XSgrBD91IM3GQE33Wf/v8Az8RLefvRA+uBEues0ZJoL - hUIIBoPo7e2F1+t9zKVSKdAzPT2Nqakp6KVbqBKvw/juAV7PCwim7HgycA2XbSdR1nqC/VsoFLC9vQ1B - ELLczMwMisUidnd32VENXIQl9hDheTeEuAHW91XoSbRCIZbjgvlUcWdnB6urq+jo6Pjc3t5exSWTSUZs + hUIIBoPo7e2F1+t9zKVSKdAzPT2Nqakp6KVbqBKvw/juAV7PCwim7HgycA2XbSdxofUE+7dQKGB7exuC + IGS5mZkZFItF7O7usqMauAhL7CHC824IcQOs76vQk2iFQixHmflUcWdnB6urq+jo6Pjc3t5exSWTSUZs bW0hnU5jc3MTlf4SGCL3IKYd8CVfQBmqIK4qMTw8jGw2i0gkAiIul1NxXDwex+zsLGKxGJ9IJDAyMsLf Ec5AI1VALd1FqelYioq7urp4SZJYfqvVWiLLOW58fBxLS0tsBuvr65icnERuLQf+5VHc917d7zw4OIjF xUXaHWaz+bgs30M0GkU+n8fExARIF35sbAyBQICndp1OJ0/Fdrud7+vrQ0tLy/5W9hEOh42ZTAa5XA5U vLKyAsJheXkZdHW0MymIhYUFNDY2fpdlhyGKIvr7++H3+9Hd3Q2XywWHw0HzwmKxUNsYHR2FwWD4fYG/ gRQ4UldXh+rq6i8ytQeS6/wrAp/PRydNM9O8aGtrY12bm5vR0NCA2tpall2j0eSZ8CfIWoz063a7dZ2d nRtErGMXB6DX63U1NTUbWq1Wp1arv8r0Hjwej5E8S7auubk5DA0NsUk3NTWhvr4eRAxikD1j8v6hUCjW - ZOlh2Gw2NiyTyfSLA2Jbp1KpoFQqD6yQ434AUizCP4s75dUAAAAASUVORK5CYII= + ZOlh2Gw2NiyTyfSLA2Jbp1KpoFQqD6yQ434ARtfCPK3Ya1cAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMUSURBVDhPfZNdTJtlGIZ7amI8YMEOR3+2eYDgTBZdgkYP - dBkjEdiYHfIzun0wKC0/c3bSYRGp0NIWWqD8FCguQ0uRrdjoZHSKQ7KZJbolujC7pXOuC06LwXhGQqaX - 5V2XbMR4J/fJk+e+vud93veTDVWqWW9vhZoBSUXfISW9WiXd5QpcZek4SzZhL96EtegpPtCk0bpvIwLw - x7fu//aFLpbmO4mfd/L7l3bunrXx65k2FkMW7pxuoaVQLgCLkU+PEZ+3Epssuu+J/dz2v8Gtk4X87Csg - OvA6N3pyiTh3ca39Va67NPziN9O8U34vAVCVTtt2iy+Gm3YwffwFTHmpBI9uZ6JhO2OG5xip3iZqbm0m - 9pIMfvQ1EmzM4d2CJwdla/JK6stXxqpZOPUOU/VPi+aPdFsYrdzM4EE1PQdUotauUfKx5QAXnYcS4ZSl - ozlPpAhAv6R4ecKUzd2vOgg1vSiahys201euoqtEha1IKWqtmi18P/A2H+qzaczbUCrCD9SrVYyfd+3n - ks/A3FA9Mx4Dn/foCbn1nO6s4ROHjmlXLZ815WHKT/0mGbuvfkPm44OSMtRWrrjXVZD+9/qrWtt28x75 - 2pk5np/6j2VfmjsZlcl8lekpQ5L6z2Dza8x7dY94blDH7ICOc33VnO2t4kx3FVNOif66l2gtlLcJwNBB - VXSqZRcXRmoJHtvBZMOzTNRn4a/L4qQhi1FdJt7Dz+CRMnBpMxgx7mbcJtFdk52YSB6S9ZSn/bUQNBE0 - Ps94zVaxrP9z8x4FbsNOTnXWiiMJwJ05O7Evmrg19RY3J+uIBnTcGDvMT6NaFrylXPUU8YNrL1fs+Vxu - z+U7S+JBjZrW9pEEfN2RCJURObGXE302PB6P8KzjTS5acnj/PTNGoxG9Xs9StEz4ms8kJhKA2+esLM46 - iIU7CPi6icViRCIR/H4/DoeDcDjMysoKVZUVXB1uFOFHAA//ca6GXGZmZojH46yurgovLy8TCATQaV4R - Yz+8E3ET62W1Wo+Yzebog7ElSfqtuLh4WKPRPJZsSUom+xfHJDVkCC0l7wAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJNnGIZ7umTZAQYrk/7odsBgLjGbCS7b + wVxEkoGKq4wfqX4glJafzVWprIxRpaUttED5KVA0spUytKzZHFI3JiO6LNk02QxaTTdnDerKwrIzEuJ2 + rbzWRMmyO7lPnjz39T3v876fbKBCzWp7y9X0SSp6Dijp1irpLFPgKk3HWbwee9F6rIXPckyTRsuedQjA + H9+5/9sXO1iYbSd+wcnvX9m5d87G3bPHmQ9ZuHOmmeYCuQDMRz47THzWSmy88KHH9nLb/za3ThXwq28n + 0b63uNmVS8S5nWutb3DDpeE3v5mmbfIHCYCqZNK2Q3wx3LiFyaOvYMpLJXhoM2P1mxkxvMRQ1SZRc2sz + sRdn8LOvgWBDDh/sXNsvW5FXUl++MlLF3OkjTNQ9L5o/1m1kuGID/fvVdO1TiVqrRsknln1cch5IhFMW + DuU8kyIAvZLitTFTNve+biPUuFU0D5ZvoKdMRUexCluhUtRaNBv5se99TuizachbUyLCj9StVYxecO3l + e5+BmYE6pjwGvujSE3LrOdNezacOHZOuGj5vzMOUn/ptMvZQvYbMp/slZehYmeJBR37636uvamXbTbvk + K2fmaH7qP5Y9ae5kVCbzVaSnDEjqP4NN25j16p7wTL+O6T4d53uqONddydnOSiacEr21r9JSID8uAAP7 + VdGJ5u1cHKoheHgL4/UvMlaXhb82i1OGLIZ1mXgPvoBHysClzWDIuINRm0RndXZiInlI1lWW9tdc0ETQ + +DKj1c+JZf2fm3YpcBve5HR7jTiSANyZsRP7spFbE+/xy3gt0YCOmyMHuT6sZc5bwlVPIT+5dnPFns/l + 1lx+sCQe1LBpZR9JwDdtiVApkZO7Odljw+PxCE873uGSJYePPjRjNBrR6/UsREuFr/lMYiIBuH3eyvy0 + g1i4jYCvk1gsRiQSwe/343A4CIfDLC0tUVlRztXBBhF+AvD4H+eqz2Vqaop4PM7y8rLw4uIigUAAneZ1 + MfbjOxE3sVpWq/Vds9kcfTS2JEn3i4qKBjUazVPJlqRksn8Bv2E1Yb7Fq4gAAAAASUVORK5CYII= diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index be55ad9..109179b 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -1209,7 +1209,7 @@ namespace FEQ0000 private void toolStripButton3_Click_1(object sender, EventArgs e) { - var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "Manual.pdf"); + var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "PurcManual.pdf"); if (System.IO.File.Exists(fn)) { FCOMMON.Util.RunExplorer(fn); diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs index 0593874..1726f78 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs @@ -30,27 +30,27 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -94,8 +94,10 @@ this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearE = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); @@ -128,8 +130,6 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -232,6 +232,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -331,6 +332,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -524,11 +526,11 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType15.DecimalPlaces = 0; - numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType15.MaximumValue = 2147483647D; - numberCellType15.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType15; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -536,97 +538,97 @@ this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer"; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료일"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType35; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line"; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType37; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType38; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType39; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName"; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType40; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격"; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType41; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F; - numberCellType16.DecimalPlaces = 0; - numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType16.MaximumValue = 2147483647D; - numberCellType16.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType16; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F; - numberCellType17.MaximumValue = 999999999999999D; - numberCellType17.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType17; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType18.MaximumValue = 999999999999999D; - numberCellType18.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType18; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F; - numberCellType19.MaximumValue = 999999999999999D; - numberCellType19.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType19; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType20.MaximumValue = 999999999999999D; - numberCellType20.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType20; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction"; this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]"; @@ -636,11 +638,11 @@ this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType42; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체"; - numberCellType21.MaximumValue = 999999999999999D; - numberCellType21.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType21; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)"; @@ -690,6 +692,16 @@ this.cmbYearS.Name = "cmbYearS"; this.cmbYearS.Size = new System.Drawing.Size(100, 27); // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(24, 24); + this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click_1); + // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; @@ -702,6 +714,16 @@ this.cmbYearE.Name = "cmbYearE"; this.cmbYearE.Size = new System.Drawing.Size(100, 27); // + // toolStripButton5 + // + this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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(24, 24); + this.toolStripButton5.Text = "toolStripButton4"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; @@ -717,6 +739,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 27); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -742,6 +765,7 @@ // // tbSd // + this.tbSd.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbSd.Name = "tbSd"; this.tbSd.Size = new System.Drawing.Size(20, 27); this.tbSd.Text = "2"; @@ -755,6 +779,7 @@ // // tbSD2 // + this.tbSD2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbSD2.Name = "tbSD2"; this.tbSD2.Size = new System.Drawing.Size(20, 27); this.tbSD2.Text = "7"; @@ -1037,26 +1062,6 @@ // this.ta.ClearBeforeFill = true; // - // toolStripButton4 - // - this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(24, 24); - this.toolStripButton4.Text = "toolStripButton4"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click_1); - // - // toolStripButton5 - // - this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(24, 24); - this.toolStripButton5.Text = "toolStripButton4"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); - // // fEboardList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx index 1e3f3ba..135adbe 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.resx +++ b/SubProject/FPJ0000/EBoard/fEboardList.resx @@ -223,20 +223,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9 - WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO - 98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2 - 1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ - QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30 - xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9 - IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T - 8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9 - ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN - yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt - kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh - EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC - WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV - LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPhZLrS1NhHMf3Kv+EsF70UohS0qioF6XpmhrY + zVLMvM0pmtrQhUG1mEblJTRRoUKUohcVWqZTm5pzTjeckZeszOZdc3NNdzlHd8769pyz5QyEfvDhefGc + 74fz+54j4Cbipjr5dKlOFVOm+yWU6yhy0jzl3KmnY0oH6KgH2rFjMk3l3tiXO/jQ1om826cx2eiVmSUz + a3Gsw2L3sWLjoPFl0YZbzbOIL/vqFOUo/bxRz0Tf15oWli3swLQL+hkG+lkGumkG2qkNqL+vo33cgXUG + aPlK4dabGaQ9GqP+kQjlHdSacwNDcyw+zjHkZDDISzbQO7mO9+NOInBjaJGFfsGFYuUswm50v+DDceWh + xovy2N+SmvNIq76A6o4GFDWWI0weiFCCqPgoIhSHUNFSwa9ipxksW52IkPYyvOBSadjr7tFWtE48RbWu + gJckVUWh4HkichviIa49g9TaVLQML6N1zI53I2tYJT0JFX00LxBVivyE8jxW960Hz0YVKFHn8JLkmmgS + PovMxxnQTDr4VbomKKhID1aHC8Kifo+Am8j7vbS0LgWGSS1q9ddxrzMfceUnkVwVC8O0EwZSLFew5oen + EwsRRCi2CI7flrsOF+5BYqUIQz8GUNyTBYVSiviH4WhQv8WneQYGUuzAlAv9BJPNhbA7XkGwzF8SItuN + 3PoEXK6JRELFKV4iVSZC1phB3iQc3P3QLItB7hMTbKTI4DytRxAi2zkfIttFHvJHSIE/zpWEI/tJCjTj + KhSrCpH1KgXimkswEIGe/Bs6IqBdbgTlqX0rnMjroxdXaQzPszy93xZwrS4T6SQoqY1Hfv3VzTsO5wZL + BM0+AWebs/gE/8NBVgjKaPIJjkg/OEeMP39v9/B2mH+tuvcntdi9cVJkZqdxZs1pG5kyuY1mCkYThUkv + ZruLh2veTrNYMlvdFEWtBlxp++yNCwQHMzuyg8TtnQckKkuQpIneJN1D4F/ETXSAuM26L7WtKzBFmSYQ + CAR/AF7/oOjSHDLtAAAAAElFTkSuQmCC @@ -254,9 +254,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 252, 17 diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index e1df466..90be500 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -60,6 +60,7 @@ this.prb1 = new arCtl.arLabel(); this.prb3 = new arCtl.arLabel(); this.prb2 = new arCtl.arLabel(); + this.prb4 = new arCtl.arLabel(); this.panel2 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); this.panel7 = new System.Windows.Forms.Panel(); @@ -194,6 +195,7 @@ this.tableLayoutPanel1.Controls.Add(this.prb1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.prb3, 2, 0); this.tableLayoutPanel1.Controls.Add(this.prb2, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.prb4, 3, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Left; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -237,7 +239,7 @@ this.prb1.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); this.prb1.ProgressValue = 50F; this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb1.Sign = "담당자 요청"; + this.prb1.Sign = "구매요청"; this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb1.SignColor = System.Drawing.Color.Black; this.prb1.SignFont = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -283,7 +285,7 @@ this.prb3.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); this.prb3.ProgressValue = 50F; this.prb3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb3.Sign = "입고 진행 중"; + this.prb3.Sign = "구매진행"; this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb3.SignColor = System.Drawing.Color.Black; this.prb3.SignFont = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Bold); @@ -297,7 +299,7 @@ // // prb2 // - this.prb2.BackColor = System.Drawing.Color.OrangeRed; + this.prb2.BackColor = System.Drawing.Color.Gold; this.prb2.BackColor2 = System.Drawing.Color.Orange; this.prb2.BackgroundImagePadding = new System.Windows.Forms.Padding(0); this.prb2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); @@ -330,7 +332,7 @@ this.prb2.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); this.prb2.ProgressValue = 50F; this.prb2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); - this.prb2.Sign = "PO 대기"; + this.prb2.Sign = "발주대기"; this.prb2.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb2.SignColor = System.Drawing.Color.Black; this.prb2.SignFont = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Bold); @@ -341,6 +343,52 @@ this.prb2.TextShadow = false; this.prb2.TextVisible = true; // + // prb4 + // + this.prb4.BackColor = System.Drawing.Color.Tomato; + this.prb4.BackColor2 = System.Drawing.Color.Red; + this.prb4.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prb4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prb4.BorderColorOver = System.Drawing.Color.Red; + this.prb4.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prb4.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.prb4.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prb4.Dock = System.Windows.Forms.DockStyle.Fill; + this.prb4.Font = new System.Drawing.Font("Consolas", 36F, System.Drawing.FontStyle.Bold); + this.prb4.ForeColor = System.Drawing.Color.Black; + this.prb4.GradientEnable = true; + this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prb4.GradientRepeatBG = false; + this.prb4.isButton = false; + this.prb4.Location = new System.Drawing.Point(674, 5); + this.prb4.Margin = new System.Windows.Forms.Padding(5); + this.prb4.MouseDownColor = System.Drawing.Color.Yellow; + this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.prb4.msg = null; + this.prb4.Name = "prb4"; + this.prb4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.prb4.ProgressBorderColor = System.Drawing.Color.Black; + this.prb4.ProgressColor1 = System.Drawing.Color.Yellow; + this.prb4.ProgressColor2 = System.Drawing.Color.Gold; + this.prb4.ProgressEnable = false; + this.prb4.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prb4.ProgressForeColor = System.Drawing.Color.Black; + this.prb4.ProgressMax = 100F; + this.prb4.ProgressMin = 0F; + this.prb4.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); + this.prb4.ProgressValue = 50F; + this.prb4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prb4.Sign = "수량오류"; + this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.prb4.SignColor = System.Drawing.Color.Black; + this.prb4.SignFont = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Bold); + this.prb4.Size = new System.Drawing.Size(216, 82); + this.prb4.TabIndex = 32; + this.prb4.Text = "0000"; + this.prb4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.prb4.TextShadow = false; + this.prb4.TextVisible = true; + // // panel2 // this.panel2.Dock = System.Windows.Forms.DockStyle.Right; @@ -1108,7 +1156,7 @@ this.Controls.Add(this.bn); this.Controls.Add(this.panel1); this.Name = "fPartBuyStatus"; - this.Text = "파트 구매 현황"; + this.Text = "CR구매현황"; this.Load += new System.EventHandler(this.fPartList_Load); this.panel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); @@ -1188,5 +1236,6 @@ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.TextBox tbDue; private System.Windows.Forms.LinkLabel linkLabel1; + private arCtl.arLabel prb4; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs index 332bce1..8efe797 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs @@ -158,6 +158,7 @@ namespace FPJ0000 var PO대상수량 = 0; var 구매진행 = 0; var 구매완료 = 0; + var 입력오류 = 0; //var 검토완료건수 = 0; @@ -209,15 +210,34 @@ namespace FPJ0000 if (bPR == false) { //PR이 입력되지 않았따. - 구매요청건C += 1; - row.ForeColor = Color.Black; - row.BackColor = Color.LightSkyBlue; + if (qty_in > 0 ) + { + 입력오류 += 1; + row.ForeColor = Color.White; + row.BackColor = Color.Red; + } + else + { + 구매요청건C += 1; + row.ForeColor = Color.Black; + row.BackColor = Color.LightSkyBlue; + } } else if (bPO == false) //PO 입력대기 (발주완율) { - PO대상수량 += 1; - row.ForeColor = Color.White; - row.BackColor = Color.OrangeRed; + if (qty_in > 0 ) + { + 입력오류 += 1; + row.ForeColor = Color.White; + row.BackColor = Color.Red; + } + else + { + PO대상수량 += 1; + row.ForeColor = Color.White; + row.BackColor = Color.OrangeRed; + } + } else { @@ -251,7 +271,7 @@ namespace FPJ0000 prb3.Text = string.Format("{0}", 구매진행); - + prb4.Text = string.Format("{0}", 입력오류); //prb1.Text = string.Format("수량 검토 완료 ({0}/{1})", 검토완료건수, 전체건수); diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 66c4545..bd9ccd4 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY - zXSY6XRO0dREFwbZYi4yL6GJEypEK3pRol10avM253TDLTKXqXm/gZel7nLO3Jl+e87ZUgOhH3x4Xjzn - ++H8vufw2Am5r0m4VKxXR5bof4fK9BQ5aY5S9jTQkcV9dPgTnfmsVFvuF/VuHxfaPWGPerRLVnrFbDa7 - LXYnLLYdVqwsNH4uWJH/aQbCkmGHIEO13xv1TEShbokN9025YJhmYJhhoJ9ioJvcgOaXEy1DdjgZoHGY - Qv6HaSQ9M1P/SEJlLdS6YwOmWTe+zjLkZNDPSTbQPebElyEHEWzCtOCGYd4FhWoG/Hsdb7lwTGnQxA1Z - 1JZEeQ1JlddR2VqLgvpS8GX+CCIIFGcQIj+JssYybhUbzWBx1YGQ+G6GE0QX8+s6BpvQNPoSlfpcThJf - EY7cN3HIrBVCXHUZiVWJaBxYRJPZhs/f17FGegqV99CcQFAu2O8ny3LrR7rwelCOIk0GJ0lQRpDwFaQ+ - T4F2zM6t0j5KQU16WLW7EFrQ6xGwE1bYTWdXi2Ac06HKcBeP23IQU3oBCRVRME45YCTFsgVrxz2dWIgg - RL5LcO6BzHUq7zDiygUwjfdB0ZUGuSobwqfBqNV8xLc5BkZSbN+kC72EJasL/IdewXGpjyRQegiZNbG4 - qQxDbNlFTpKtioO0PoW8STDYe9OMG/3sJyZYSZEBWTqPIFB6YC5QepA85IPAXB9cLQpG+gsRtENqKNR5 - SHsvglgZDSMRGMi/oScC2rVJBJqdFc5n9dALazQG5twc3SPzuFOdimQSlFQJkVNze/uOxbHhJoKGHQFr - m7XsCP6HnV0hZZfgdHanQ/mqbmuvh/eis7Nz82h8o80bJ0Wmtk1Mrzus7MXEMoWJJQpjXpZtLg62eRvt - CVMUteZ7q/mHN87jnUhtTQ8Qt7Qdk6gtAZIGeptkD/5/ETfQvuLm1SOJze3+IlUSj8fj/QELsJ4bx30B - QQAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6XpmhrY + zVTMvM0pmtrQhUG2mEbmJVyiQhdRioIK7aJTm7c5pxvOyFymNu8X8LLUXc5x50y/PedsqYHQDz48L57z + /XB+33ME3ATf1cRfKNarw0v0v4VyPUVOmqeUOw10eHEvHfpIZzot0yp9It7u4UM7J+RBt3bRSi+bTCaX + xb4Oi22bZSsHjZ/zVuR9mkZ0ybBDlKHa64m6J6xQt8iFeycZGKZYGKZZ6CdZ6Cac0PxaR/OQHess0DBM + Ie/DFJKemKh/JEJ5M7XmcKJ/xoWvMyw5WfTxEie6zOv4MuQggg30z7tgmGNQoJpG4J3213w4qjRg/Jo8 + YlNSeQVJFVdR0VKL/LpSBMp9EUAQFZxCsOI4yhrK+FVsNIuFFQeC47pYXhBZHPi+fbARjaPPUaHP4SVx + 5aHIeRWLzNpoiKsuIrEqEQ0DC2g02fD5+xpWSU9CRTfNC0RK0V4feZZLP9KJl4MKFGkyeEl8ZRgJX0Lq + 0xRozXZ+lbZRCmrSw4qdgTC/xy3gJqSwi5ZWJ8Bo1qHKcBsPW7MRVXoO8eURME46YCTFcgVrx9ydWIgg + WLFDcOaenDmRexCxShH6x3pR0JkGhUqK6MdBqNV8xLdZFkZSbO8Egx7CopVB4H2P4KjMS+IvO4DMmhhc + rwxBTNl5XiJVxUJWl0LeJAjcff+0C33cJyZYSZF+WTq3wF+2b9Zftp885AX/HC9cLgpC+rMEaIfUKFDn + Iu1dAsSVkTASgYH8G3oioJkNItBsr3A2q5ueX6UxMOvi6RqZw63qVCSToKQqGtk1N7fuOBxOFxHUbws4 + 24xlW/A/7NwKKTsEJ6UdDuWLN5u7PbwbHR0dG4fjGmyeOCkytXV8as1h5S7GlyiML1Iwe1iyMTxc8zba + HaYoatX7RtMPT1wgOJbaku4nbm49IlFb/CT19BbJbnz/Iq6nvcVNK4cSm9p8E1RJAoFA8AcA2Z4MAUEQ + ugAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 088cdc1..946bf01 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -99,6 +99,7 @@ this.prb5 = new arCtl.arLabel(); this.prb4 = new arCtl.arLabel(); this.prb3 = new arCtl.arLabel(); + this.prb6 = new arCtl.arLabel(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -549,17 +550,19 @@ // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 5; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnCount = 6; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel1.Controls.Add(this.prb2, 1, 0); this.tableLayoutPanel1.Controls.Add(this.prb1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.prb5, 4, 0); this.tableLayoutPanel1.Controls.Add(this.prb4, 3, 0); this.tableLayoutPanel1.Controls.Add(this.prb3, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.prb6, 5, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 119); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -585,7 +588,7 @@ this.prb2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb2.GradientRepeatBG = false; this.prb2.isButton = false; - this.prb2.Location = new System.Drawing.Point(274, 5); + this.prb2.Location = new System.Drawing.Point(229, 5); this.prb2.Margin = new System.Windows.Forms.Padding(5); this.prb2.MouseDownColor = System.Drawing.Color.Yellow; this.prb2.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -607,7 +610,7 @@ this.prb2.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb2.SignColor = System.Drawing.Color.Yellow; this.prb2.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb2.Size = new System.Drawing.Size(259, 41); + this.prb2.Size = new System.Drawing.Size(214, 41); this.prb2.TabIndex = 32; this.prb2.Text = "구매요청건"; this.prb2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -653,7 +656,7 @@ this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb1.SignColor = System.Drawing.Color.Yellow; this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb1.Size = new System.Drawing.Size(259, 41); + this.prb1.Size = new System.Drawing.Size(214, 41); this.prb1.TabIndex = 32; this.prb1.Text = "비 구매"; this.prb1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -678,7 +681,7 @@ this.prb5.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb5.GradientRepeatBG = false; this.prb5.isButton = false; - this.prb5.Location = new System.Drawing.Point(1081, 5); + this.prb5.Location = new System.Drawing.Point(901, 5); this.prb5.Margin = new System.Windows.Forms.Padding(5); this.prb5.MouseDownColor = System.Drawing.Color.Yellow; this.prb5.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -700,7 +703,7 @@ this.prb5.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb5.SignColor = System.Drawing.Color.Yellow; this.prb5.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb5.Size = new System.Drawing.Size(259, 41); + this.prb5.Size = new System.Drawing.Size(214, 41); this.prb5.TabIndex = 32; this.prb5.Text = "구매 완료"; this.prb5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -725,7 +728,7 @@ this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb4.GradientRepeatBG = false; this.prb4.isButton = false; - this.prb4.Location = new System.Drawing.Point(812, 5); + this.prb4.Location = new System.Drawing.Point(677, 5); this.prb4.Margin = new System.Windows.Forms.Padding(5); this.prb4.MouseDownColor = System.Drawing.Color.Yellow; this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -747,7 +750,7 @@ this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb4.SignColor = System.Drawing.Color.Yellow; this.prb4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb4.Size = new System.Drawing.Size(259, 41); + this.prb4.Size = new System.Drawing.Size(214, 41); this.prb4.TabIndex = 32; this.prb4.Text = "구매진행중"; this.prb4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -757,7 +760,7 @@ // // prb3 // - this.prb3.BackColor = System.Drawing.Color.OrangeRed; + this.prb3.BackColor = System.Drawing.Color.Gold; this.prb3.BackColor2 = System.Drawing.Color.Orange; this.prb3.BackgroundImagePadding = new System.Windows.Forms.Padding(0); this.prb3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); @@ -772,7 +775,7 @@ this.prb3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; this.prb3.GradientRepeatBG = false; this.prb3.isButton = false; - this.prb3.Location = new System.Drawing.Point(543, 5); + this.prb3.Location = new System.Drawing.Point(453, 5); this.prb3.Margin = new System.Windows.Forms.Padding(5); this.prb3.MouseDownColor = System.Drawing.Color.Yellow; this.prb3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -794,13 +797,59 @@ this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb3.SignColor = System.Drawing.Color.Yellow; this.prb3.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb3.Size = new System.Drawing.Size(259, 41); + this.prb3.Size = new System.Drawing.Size(214, 41); this.prb3.TabIndex = 32; this.prb3.Text = "PO대기"; this.prb3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.prb3.TextShadow = false; this.prb3.TextVisible = true; // + // prb6 + // + this.prb6.BackColor = System.Drawing.Color.Tomato; + this.prb6.BackColor2 = System.Drawing.Color.Red; + this.prb6.BackgroundImagePadding = new System.Windows.Forms.Padding(0); + this.prb6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90))))); + this.prb6.BorderColorOver = System.Drawing.Color.Red; + this.prb6.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4); + this.prb6.ColorTheme = arCtl.arLabel.eColorTheme.Custom; + this.prb6.Cursor = System.Windows.Forms.Cursors.Arrow; + this.prb6.Dock = System.Windows.Forms.DockStyle.Fill; + this.prb6.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.prb6.ForeColor = System.Drawing.Color.Black; + this.prb6.GradientEnable = true; + this.prb6.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal; + this.prb6.GradientRepeatBG = false; + this.prb6.isButton = false; + this.prb6.Location = new System.Drawing.Point(1125, 5); + this.prb6.Margin = new System.Windows.Forms.Padding(5); + this.prb6.MouseDownColor = System.Drawing.Color.Yellow; + this.prb6.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.prb6.msg = null; + this.prb6.Name = "prb6"; + this.prb6.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.prb6.ProgressBorderColor = System.Drawing.Color.Black; + this.prb6.ProgressColor1 = System.Drawing.Color.Yellow; + this.prb6.ProgressColor2 = System.Drawing.Color.Gold; + this.prb6.ProgressEnable = false; + this.prb6.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold); + this.prb6.ProgressForeColor = System.Drawing.Color.Black; + this.prb6.ProgressMax = 100F; + this.prb6.ProgressMin = 0F; + this.prb6.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5); + this.prb6.ProgressValue = 50F; + this.prb6.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); + this.prb6.Sign = ""; + this.prb6.SignAlign = System.Drawing.ContentAlignment.BottomRight; + this.prb6.SignColor = System.Drawing.Color.Yellow; + this.prb6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); + this.prb6.Size = new System.Drawing.Size(215, 41); + this.prb6.TabIndex = 32; + this.prb6.Text = "입력오류"; + this.prb6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.prb6.TextShadow = false; + this.prb6.TextVisible = true; + // // cm1 // this.cm1.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -1042,8 +1091,8 @@ // toolStripLabel2 // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(31, 24); - this.toolStripLabel2.Text = "검색"; + this.toolStripLabel2.Size = new System.Drawing.Size(45, 24); + this.toolStripLabel2.Text = "검색(&F)"; // // tbFind // @@ -1530,5 +1579,6 @@ private arCtl.arLabel prb4; private arCtl.arLabel prb3; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private arCtl.arLabel prb6; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 0971ef5..3a94a9e 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -199,6 +199,7 @@ namespace FPJ0000 var PO대기 = 0; //PR이 체크되어있으나 PO가 체크안된데이터 var 구매진행 = 0; // PO가 체크되어있으나 입고수량이 구매수량보다 적은 경우 var 구매완료 = 0; // 입고수량 >= 구매수량 + var 입력오류 = 0; for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) @@ -234,7 +235,7 @@ namespace FPJ0000 if (value_in != null) qty_in = (int)value_in; if (value_buy != null) qty_buy = (int)value_buy; - if(b_cancel == true) + if (b_cancel == true) { row.ForeColor = Color.White; row.BackColor = Color.Red; @@ -250,19 +251,37 @@ namespace FPJ0000 //여기서부터는 무조건 구매대상이다 if (bPR == false) { - 구매요청 += 1; - row.ForeColor = Color.Black; - row.BackColor = Color.SkyBlue; + if (qty_in > 0 ) + { + 입력오류 += 1; + row.ForeColor = Color.White; + row.BackColor = Color.Red; + } + else + { + 구매요청 += 1; + row.ForeColor = Color.Black; + row.BackColor = Color.SkyBlue; + } } else if (bPO == false) { - PO대기 += 1; - row.ForeColor = Color.White; - row.BackColor = Color.OrangeRed; + if (qty_in > 0 ) + { + 입력오류 += 1; + row.ForeColor = Color.White; + row.BackColor = Color.Red; + } + else + { + PO대기 += 1; + row.ForeColor = Color.White; + row.BackColor = Color.OrangeRed; + } } else { - if (qty_in < qty_buy) + if (qty_in != qty_buy) { 구매진행 += 1; row.ForeColor = Color.White; @@ -289,6 +308,7 @@ namespace FPJ0000 var 구매율 = (구매완료 + 비구매) / (전체건수 * 1.0); prb5.Text = string.Format("구매완료 ({0:N0}%)", 구매율 * 100.0); + prb6.Text = string.Format("수량오류 ({0:})", 입력오류); //prb1.Text = string.Format("수량 검토 완료 ({0}/{1})", 검토완료건수, 전체건수); //prb1.ProgressMax = 전체건수; @@ -310,9 +330,9 @@ namespace FPJ0000 var rows = dsPRJ.ProjectsPart.Select(this.bsPart.Filter); decimal s1 = 0; - decimal s2 = 0; - foreach(dsPRJ.ProjectsPartRow dr in rows) - { + decimal s2 = 0; + foreach (dsPRJ.ProjectsPartRow dr in rows) + { if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) continue; s1 += dr.amt; s2 += dr.amtn; @@ -555,7 +575,7 @@ namespace FPJ0000 if (e.KeyCode == Keys.Enter) { var search = tbFind.Text.Trim(); - var ColumnList = new string[] { "ItemGroup","option1","ItemName", "ItemModel", "ItemSupply", "ItemManu", "ItemSid" }; + var ColumnList = new string[] { "ItemGroup", "option1", "ItemName", "ItemModel", "ItemSupply", "ItemManu", "ItemSid" }; var Filter = ""; if (search != "") { @@ -578,7 +598,7 @@ namespace FPJ0000 tbFind.BackColor = SystemColors.Window; } - RefreshSum(); + RefreshSum(); //FormattingData(); } diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index dbf76c4..5fa2f48 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -396,20 +396,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6WpTQ3s - Zipm3uYUTU10YZAtppGpC02cUCFK0YsK7aLzMm/bnNtyRuYyNa/zAl6Wuss5urP57TlnyxkI/eDD8+I5 - 3w/n9z2Hx07ofWXSpXKdIqpC9ztMrKPISXNI2VNPR5Vr6YgnGuNZkbrKL/rtPi60e8If9amXLfSq0Wh0 - mm2bMFu9rFpYaPxctKDokwlxFaN2frZ8vyfqnshSzTIb1s44oJ9loDcx0M0w0ExvQflrE20jNmwyQPMo - haIPs0h9ZqT+kYSJ26gN+xYG55z4OseQk8EAJ9mCamITHSN2InBhcNEJ/YIDJXITgu91v+HCsdKgqRvi - 6G2h7BpSa66jpr0BxY1SBIv9EUTgl5xBqOQkKpsruVWsNIOlNTtCE1UMJ4gpD37fPdyClvGXqNEVcJLE - 6ggUvE5ATkMcBLWXkVKbguahJbQYrfj8fQPrpKcwSR/NCfhV/P1+4lynbqwXr4YlKFNmc5IkWSQJX0HG - 83SoJ2zcKl3jFBSkhzWbA2HF/W4BO+GlKjqvLhmGCQ1q9XfxuDMfsdILSKqOhmHGDgMpli1YPenuxEwE - oZJdgnMPxI5ThYeRUMXH4KQWJb2ZkMjzEPc0BA3Kj/g2z8BAitVOO9BPWLY4EPzQIzgu8hEGig4hpz4e - N2XhiK+8yEny5AkQNaaTNwkBez9ocmKA/cQECykyIFfjFgSKDswHig6Sh3wQWOCDq2UhyHqRDPWIAiWK - QmS+S4ZAFgMDEejJv6EjAtrhIgKld4XzuX304jqNoXknh2psAXfqMpBGgsLaOOTX3965Y7FvOYmgyStg - bXNmr+B/2NgV0ncJTuf12Bs7+rb3engvtF8MrqOJzVZPnBSZ0Tk1u2G39PT0u6ZWKEwtU5jwsGJ1cLDN - W2kn1NoBF0VR6763Wn944jzeiYz2rABBW+cxocIcIGyid0hz4/8XQRPtK2hdO5LS2uWfLE/l8Xi8P1vw - nqKxv6G/AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s + Zipm3uYUTU10YZAt5iLzEprooEKUohcZ2kWnNm9zm9twi8xlat5v4GWpu5wzdza/PedsqYHQDz48L57z + /XB+33N47IQ9UCZfLtcpoit0v8PFOoqcNEcle+rp6HItHflUYzonUlX7x7w7wIX2TsRjtWrFQq+ZTCaX + 2eaA2brLmoWFxs8lC4o/zSG+YtTOz5H7eKOeiSrVrLBh7YwT+lkG+jkGuhkGmuktKH850DFig4MBWkcp + FH+YRdpzE/WPJFzcQW3at2Ccd+HrPENOBoOcZAv9Ew58GbETgRvGJRf0i05I5XMIud/zlgvHVQZP3RTH + bAvrriOt9gZqOxtR0lyJEHEAggl86VmESU6hqrWKW8VKM1hetyMsqZ/hBLHlIe97htvQNv4KtbpCTpJU + E4nCN4nIbYyHQHYFqbJUtA4to81kxefvm9ggPYVL1DQn4FfzffzFeS7dWB9eD0tQpszhJMl1USR8FZkv + MqCasHGrdI9TUJAe1m1OhJcMeATsRJT20/n1KTBMaCDT38OTrgLEVV5Eck0MDDN2GEixbMGqSU8nZiII + k+wRnH8odp4uOoLEaj6Mk1pI+7Igkecj/lkoGpUf8W2BgYEUq512YoCwYnEi5JFXcELkKwwSHUZuQwJu + 1UUgoeoSJ8mXJ0LUnEHeJBTsvXHOhUH2ExMspMjAPI1HECQ6uBAkOkQe8kVQoS+ulYUi+2UKVCMKSBVF + yGpKgaAuFgYi0JN/Q0cEtNNNBMrdFS7kqemlDRpDCy6O/rFF3K3PRDoJCmXxKGi4s3PHYt9yEUHLroC1 + zZt3Bf/Dxq6QsUdwJr/X3tSu3N7v4f1Qa/XuY0mtVm+cFJnZNTW7abf09qrcU6sUplYoTHhZtTo52Oat + tAt9ap2boqgNv9vtP7xxHu9kZmd2oKCj67hQYQ4UttA7pHsI+IughfYTtK8fTW3vDkiRp/F4PN4fTFGe + hGBEMZkAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 0a30c23..1046687 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,25 +30,25 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -98,7 +98,6 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -160,13 +159,13 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); @@ -176,6 +175,7 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -217,7 +217,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1165, 25); + this.bn.Size = new System.Drawing.Size(1339, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -266,6 +266,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -388,6 +389,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -432,7 +434,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(299, 440); + this.cm.Size = new System.Drawing.Size(299, 418); // // columnSizeToolStripMenuItem // @@ -600,181 +602,10 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1165, 340); + this.fpSpread1.Size = new System.Drawing.Size(1339, 340); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 19; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType16.DecimalPlaces = 0; - numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType16.MaximumValue = 2147483647D; - numberCellType16.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType16; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType43; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType44; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType45; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "category"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType46; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType47; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType48; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType49; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType50; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType51; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType52; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType53; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType54; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 78F; - numberCellType17.DecimalPlaces = 0; - numberCellType17.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType17.MaximumValue = 2147483647D; - numberCellType17.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType17; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 59F; - numberCellType18.MaximumValue = 999999999999999D; - numberCellType18.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType18; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType19.MaximumValue = 999999999999999D; - numberCellType19.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType19; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType20.MaximumValue = 999999999999999D; - numberCellType20.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType20; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType55; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType56; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -794,7 +625,7 @@ this.tbRequest}); this.toolStrip1.Location = new System.Drawing.Point(5, 5); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(935, 25); + this.toolStrip1.Size = new System.Drawing.Size(1109, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -892,6 +723,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 25); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -904,7 +736,7 @@ this.label1.Location = new System.Drawing.Point(0, 416); this.label1.Name = "label1"; this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1165, 23); + this.label1.Size = new System.Drawing.Size(1339, 23); this.label1.TabIndex = 5; this.label1.Text = "--"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -924,7 +756,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1165, 171); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1339, 171); this.tableLayoutPanel1.TabIndex = 11; // // panel4 @@ -932,10 +764,10 @@ this.panel4.Controls.Add(this.label11); this.panel4.Controls.Add(this.label4); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(582, 0); + this.panel4.Location = new System.Drawing.Point(669, 0); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(583, 25); + this.panel4.Size = new System.Drawing.Size(670, 25); this.panel4.TabIndex = 0; // // label11 @@ -943,7 +775,7 @@ this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Location = new System.Drawing.Point(0, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(483, 25); + this.label11.Size = new System.Drawing.Size(570, 25); this.label11.TabIndex = 14; this.label11.Text = "주간 진행 내용"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -954,7 +786,7 @@ this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true)); this.label4.Dock = System.Windows.Forms.DockStyle.Right; this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(483, 0); + this.label4.Location = new System.Drawing.Point(570, 0); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(100, 25); @@ -975,7 +807,7 @@ this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(582, 25); + this.label2.Size = new System.Drawing.Size(669, 25); this.label2.TabIndex = 0; this.label2.Text = "요청 사항"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -988,7 +820,7 @@ this.richTextBox1.Location = new System.Drawing.Point(3, 28); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(576, 140); + this.richTextBox1.Size = new System.Drawing.Size(663, 140); this.richTextBox1.TabIndex = 1; this.richTextBox1.Text = ""; // @@ -997,10 +829,10 @@ this.richTextBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true)); this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox2.Location = new System.Drawing.Point(585, 28); + this.richTextBox2.Location = new System.Drawing.Point(672, 28); this.richTextBox2.Name = "richTextBox2"; this.richTextBox2.ReadOnly = true; - this.richTextBox2.Size = new System.Drawing.Size(577, 140); + this.richTextBox2.Size = new System.Drawing.Size(664, 140); this.richTextBox2.TabIndex = 1; this.richTextBox2.Text = ""; this.richTextBox2.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged); @@ -1038,7 +870,7 @@ this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1165, 47); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1339, 47); this.tableLayoutPanel2.TabIndex = 12; // // label6 @@ -1057,7 +889,7 @@ // this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(877, 1); + this.label5.Location = new System.Drawing.Point(1009, 1); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(74, 24); this.label5.TabIndex = 0; @@ -1070,7 +902,7 @@ this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label9.Location = new System.Drawing.Point(295, 1); + this.label9.Location = new System.Drawing.Point(339, 1); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(74, 24); this.label9.TabIndex = 0; @@ -1083,7 +915,7 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label3.Location = new System.Drawing.Point(586, 1); + this.label3.Location = new System.Drawing.Point(674, 1); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(74, 24); this.label3.TabIndex = 0; @@ -1097,7 +929,7 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Location = new System.Drawing.Point(85, 1); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(203, 24); + this.label7.Size = new System.Drawing.Size(247, 24); this.label7.TabIndex = 1; this.label7.Text = "--"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1106,9 +938,9 @@ // this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); this.label8.Dock = System.Windows.Forms.DockStyle.Fill; - this.label8.Location = new System.Drawing.Point(376, 1); + this.label8.Location = new System.Drawing.Point(420, 1); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(203, 24); + this.label8.Size = new System.Drawing.Size(247, 24); this.label8.TabIndex = 1; this.label8.Text = "--"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1117,9 +949,9 @@ // this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.label10.Dock = System.Windows.Forms.DockStyle.Fill; - this.label10.Location = new System.Drawing.Point(667, 1); + this.label10.Location = new System.Drawing.Point(755, 1); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(203, 24); + this.label10.Size = new System.Drawing.Size(247, 24); this.label10.TabIndex = 1; this.label10.Text = "--"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1129,9 +961,9 @@ this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label12.Location = new System.Drawing.Point(958, 1); + this.label12.Location = new System.Drawing.Point(1090, 1); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(203, 24); + this.label12.Size = new System.Drawing.Size(245, 24); this.label12.TabIndex = 1; this.label12.Text = "--"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1145,7 +977,7 @@ this.label13.Location = new System.Drawing.Point(1, 26); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(290, 20); + this.label13.Size = new System.Drawing.Size(334, 20); this.label13.TabIndex = 0; this.label13.Text = "Cost Summary"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1155,7 +987,7 @@ this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(292, 26); + this.label14.Location = new System.Drawing.Point(336, 26); this.label14.Margin = new System.Windows.Forms.Padding(0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(80, 20); @@ -1168,7 +1000,7 @@ this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(583, 26); + this.label15.Location = new System.Drawing.Point(671, 26); this.label15.Margin = new System.Windows.Forms.Padding(0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(80, 20); @@ -1181,7 +1013,7 @@ this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(874, 26); + this.label16.Location = new System.Drawing.Point(1006, 26); this.label16.Margin = new System.Windows.Forms.Padding(0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(80, 20); @@ -1194,10 +1026,10 @@ this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumO.Location = new System.Drawing.Point(373, 26); + this.sbSumO.Location = new System.Drawing.Point(417, 26); this.sbSumO.Margin = new System.Windows.Forms.Padding(0); this.sbSumO.Name = "sbSumO"; - this.sbSumO.Size = new System.Drawing.Size(209, 20); + this.sbSumO.Size = new System.Drawing.Size(253, 20); this.sbSumO.TabIndex = 1; this.sbSumO.Text = "--"; this.sbSumO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1207,10 +1039,10 @@ this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumI.Location = new System.Drawing.Point(664, 26); + this.sbSumI.Location = new System.Drawing.Point(752, 26); this.sbSumI.Margin = new System.Windows.Forms.Padding(0); this.sbSumI.Name = "sbSumI"; - this.sbSumI.Size = new System.Drawing.Size(209, 20); + this.sbSumI.Size = new System.Drawing.Size(253, 20); this.sbSumI.TabIndex = 1; this.sbSumI.Text = "--"; this.sbSumI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1220,10 +1052,10 @@ this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbSumE.Location = new System.Drawing.Point(955, 26); + this.sbSumE.Location = new System.Drawing.Point(1087, 26); this.sbSumE.Margin = new System.Windows.Forms.Padding(0); this.sbSumE.Name = "sbSumE"; - this.sbSumE.Size = new System.Drawing.Size(209, 20); + this.sbSumE.Size = new System.Drawing.Size(251, 20); this.sbSumE.TabIndex = 1; this.sbSumE.Text = "--"; this.sbSumE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1272,7 +1104,7 @@ this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb1.SignColor = System.Drawing.Color.Yellow; this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb1.Size = new System.Drawing.Size(1007, 11); + this.prb1.Size = new System.Drawing.Size(1181, 11); this.prb1.TabIndex = 32; this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.prb1.TextShadow = false; @@ -1286,7 +1118,7 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel3.Location = new System.Drawing.Point(0, 439); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1165, 218); + this.panel3.Size = new System.Drawing.Size(1339, 218); this.panel3.TabIndex = 7; // // toolStrip2 @@ -1309,7 +1141,7 @@ this.cmbSort}); this.toolStrip2.Location = new System.Drawing.Point(5, 30); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(935, 27); + this.toolStrip2.Size = new System.Drawing.Size(1109, 27); this.toolStrip2.TabIndex = 8; this.toolStrip2.Text = "toolStrip2"; // @@ -1445,7 +1277,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1165, 55); + this.panel1.Size = new System.Drawing.Size(1339, 55); this.panel1.TabIndex = 9; // // btSearch @@ -1453,7 +1285,7 @@ this.btSearch.Dock = System.Windows.Forms.DockStyle.Right; this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btSearch.Location = new System.Drawing.Point(940, 5); + this.btSearch.Location = new System.Drawing.Point(1114, 5); this.btSearch.Name = "btSearch"; this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0); this.btSearch.Size = new System.Drawing.Size(122, 45); @@ -1468,7 +1300,7 @@ this.button1.Dock = System.Windows.Forms.DockStyle.Right; this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(1062, 5); + this.button1.Location = new System.Drawing.Point(1236, 5); this.button1.Name = "button1"; this.button1.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); this.button1.Size = new System.Drawing.Size(98, 45); @@ -1493,7 +1325,7 @@ this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1165, 21); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1339, 21); this.tableLayoutPanel3.TabIndex = 34; // // label17 @@ -1507,10 +1339,182 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 19; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 78F; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 59F; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1165, 682); + this.ClientSize = new System.Drawing.Size(1339, 682); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.tableLayoutPanel3); this.Controls.Add(this.panel1); @@ -1528,7 +1532,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1541,6 +1544,7 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1637,7 +1641,6 @@ private System.Windows.Forms.RichTextBox richTextBox2; private System.Windows.Forms.ToolStripMenuItem 공유폴더ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton4; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStrip toolStrip2; private System.Windows.Forms.ToolStripButton chk검토; private System.Windows.Forms.ToolStripButton chk대기; @@ -1659,5 +1662,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; private arCtl.arLabel prb1; private System.Windows.Forms.Label label17; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index bf4937e..4fabaa8 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -146,7 +146,7 @@ namespace FPJ0000 // var orgQuery = this.ta.Adapter.SelectCommand.CommandText; - string State_Select = " SELECT *, dbo.getLastHistory(idx) AS lasthistory FROM Projects"; + string State_Select = " SELECT *,dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory FROM Projects"; string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and "; if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index b361a6d..a5550af 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,39 +230,36 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rtEWlaUSuEhbtNmm - qzVXU9ewAI2pMZa9zVJCdzMpHRHRWGUJKQ4xjTRyvdoL9gKXQCCCsnVP9365Uy75U322s7vd55yzZ989 - 1H9jdHxE580g9Nb30A0t4MTgG6jpV4+EsYiB8Zimf2xpsf9hFGZXBL0PIqBSmV/IV+NZHytkRNDu2Pd8 - L3XK2wa9RwPdmBrHXc3kZ4PpGYSMiD73VzIfnL8MOnAJ5tkLoJAHbzh4cW7NAtNohMxzoSyeMHLFGw6c - 94sKaiwyRRW9ExU9Uih7ZSI/ZZ0MCV1ZIokMVF3TKwU1lnKFvKuMbR1tQcd4KyrPbCdBnqGJULbAPhWG - 3ReCcyaEt1+S2GPwkQLlQLlCZtzGqu82YrepEqUniyBt34xhbxhWXpPM3xu8/pRAVbsXCnpHdYVByjY7 - GyDRFrMl2oKtxluLSKSXYZtiiNfOfUkB2YLbwMapzrof8r4y1F7biyOOQ9ik3cBu1K7fwm/UYfuAeGoZ - jmkGt2eyokaeMEimV19WdaUaOrcah+11KNUWsYUt2TBP2/A7LH37iTv+7Ab3Z7lDcj5mkCtljxySzmKU - 6ApQeGzdSphHc32BFIxwQT5MCm5wD5HLi2AcKqN3zTtQX32JGFfgehohXneAK+AD+So3uH8LGRFN9HNE - kz/AxDP4HE0jyKRA7dJ7kC9J0z27kBFx1Dw/Ud8dSNV3z6H2nB/7Tq/eyz9CUX8A/U0tFfLjRd0AAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGjVSl2btDRaYKAU + IYVKzNqmDacyLCostSk3c6WstRajstzS2dTUpS3p1V5mL9tdm9taWxnd073fXXR3+VN94HDhPuccHr48 + 1H9jcnxE680ADNb30A8u4tTAG2joV4+FsYj+sai2b3R5qe9hBGZXGN0PwqCS6V/IVV3HI1bIiKDd0e+5 + XqrN2wyDRwv9qAYnXQ3kZ23PMwgZEb3ur2Q+sHAZtP8SzHMXQCEH3nD44vy6BT0jYTLPhrJ4QsgWbzh0 + 3icqqLTIleX0bpR2SaHqlov8lHUiKHRlCMfTUJ+ZXi2otJQoFSYZ2zTSCONYE8rO7iRBnsHxYKbAPhWC + fTII50wQb78ksK99khSo+kuU8rYdrOZuHfb2lKH4dAGkLVsx5A3BymuC+XuD15/iKG/xQknvqig1StkG + Zy0kukK2SJe33XRrCfHUCmxTDPHauS8pIFtwG9g4VVsPQtErQ9W1/TjmOIItuk3sZt3GbfxGRtsHxJIr + cEwzuD2TETX8hEEitfay6isV0Ls1OGqvRrGugM1vzIR5mofeYfnbT9zxZTa4P8cdknOWQbZUXQpIWgtR + pM9D/okNq2Ee7fVFUjDMBfkwKbjBPUQ2LwIxqE3ede9Ac/UlolyB62mYeN1+roAP5ErW7v4tZETU088R + SfwAE0vjcySFAJMEtcfgQa4k9ffsQkbEcfPCeE2nP1nTOY+qcz4c6Fi7l3+Eov4A0xctA1rLaFoAAAAA SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ9SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVBMXLNzozqgx - 7Eg0bsBEgwkLFwgxIErE8LIJEIyCvAW1WGkNIRhoCwgFOmIpbZ2WUmmFTpnpPDqdzvG2jIILEx8n92Tm - Tu53/v+/Q/23VkYLFgPmi0rw3eV9vqSsmU/7vC+PHfQNFOT84vcFORMTRQd0nKIWeg2ypqUBaGRlvPue - kqIITZQm1+0l8g+H529KAXt5wP36xBUdpyh6pDCuqRLkUAMEfyME5inEwBC0FEuyEtBUnnhnd5+Kgd+J - Jd3DBlrHKcrTc5xLKzsEbkHC2wzuUzW2Z0sRnbsB1lUDdrkK7OIdxJwVxOWkswg8wyd5HScBg4VKStwE - S7cgtlCHyORtiJEZUpXTq2ee8Z8dZMZzDuZLOp7p4JSSnT8tE4uAKmRBVXRDDreCpvthsjnQOc6gd2oD - VmcQjq4zso6TgFZDUlNFqJwDKdYCZWsIyc0OSOv1cC13YXQ+grWvAr5syZjxcRhb/IY3pnZVx8lfaDPI - aYWDsm1CMtKdrSoFayD6KzBgC2MlxGOWEWHzC5gmdoVl9H1goOMU5XycL2kKS+BnkDcaIQWqCVwOwXMt - 27Y3KsPmS2DKm8C4m8d8UEb3ZGgvYPVBXliM0/HNpd50Yq0TvOcJeHcD+M+16CMzr2wImPTswhl/XJfR - Zl7dC3DX5t5y1x3toe8fiTrr8qT9fjvSoc54OSwQyM5ImCPVTUs8Hhl7NEvl2RI94vdqsjCH2qzM3UFy - F/3TYbRbXel644DmGuuAo7mYe1GWW6wf/XO9qjx/3W68yvotTTDfKxL0z3+n52WHi8eqzonWhxf27uLf - RFHfAYHRJStazxuMAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ9SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVHYuTExciRvD + wsRE4wZMNJiwcAESA1ZMMEB9IcEoyFtQi4TWEIKBtoDQSisOpa3T0lZaoFNmOo9Op3O8LaPgwsTHyT2Z + uZP7nf//71D/reXRElfQfFYJjZ7b43JldazM73t1ZL9/oKTgF78vKZicPLlPxylqvtsga1oWgEZWzjvv + GSmO8GRles1+Qf7h6MI1KWivDtJvjp3XcYryjJQmNVWCHG6GEGiBwDyDGByClmFJVgqayhNv7+wzCSQT + G2l62ODRcYry9hzlsso2gU1I+drAfa7H1lwl4vNXwbobwC7dAuu6iYSzhriadBaDd/g4r+MkYLBUyYjr + YD0mJBaNiE3dgBibJVU5vXrumfzZQW4852CxpOO5Dk4o+fmzMrEIqEIeVEUacvQBPJ5+mG0OdE4w6J2O + wOoMwdFVJus4CTAZ0poqQuUcyLAWKJtDSK93QFq7B/dSF0YXYlj9JuDrpoxZP4dx1wbemh+rOk7+QrtB + zioclC0z0rHufFUp1AAxUIMBWxTLYR5zjAhbQMAMsTsqo+8DAx2nKOf9YklTWAI/hxxpgRSsJ3A1BO/l + fNu+uAybP4VpXwoTNI+FkIzuqfBuwMrdoqiY9CQji73Z1GoneO9D8HQz+C+N6CMzL0cETHl34Jw/rslo + H1vZDaAbC6/TxsM9njuH4k5jkbTX70aeqLM+DosEsjMS5kl18yceTaYuzVJ76qIe8Xu1WpgD7VambpDc + Rf9MFE+trqzR1Ku5xzvgaKvgXlYVVuhH/1yva89csT+6xAYsrRi7fVLQP/+dXlQdrBivOy1am8p37+Lf + RFHfAYswJMpC6AkvAAAAAElFTkSuQmCC - - 17, 17 - 387, 17 @@ -312,7 +309,7 @@ 248, 17 - 17, 56 + 275, 56 455, 17 @@ -320,21 +317,12 @@ 561, 17 - - 561, 17 - - - 561, 17 - 731, 17 647, 17 - - 731, 17 - 169, 56 diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index e50b7b2..01c5616 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -909,6 +909,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columncrdue; + private global::System.Data.DataColumn columnProgressPrj; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsDataTable() : @@ -1319,6 +1321,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ProgressPrjColumn { + get { + return this.columnProgressPrj; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1401,7 +1411,8 @@ namespace FPJ0000 { bool bCost, bool bFanOut, string div, - string crdue) { + string crdue, + double ProgressPrj) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1449,7 +1460,8 @@ namespace FPJ0000 { bCost, bFanOut, div, - crdue}; + crdue, + ProgressPrj}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1501,7 +1513,8 @@ namespace FPJ0000 { bool bCost, bool bFanOut, string div, - string crdue) { + string crdue, + double ProgressPrj) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1549,7 +1562,8 @@ namespace FPJ0000 { bCost, bFanOut, div, - crdue}; + crdue, + ProgressPrj}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1625,6 +1639,7 @@ namespace FPJ0000 { this.columnbFanOut = base.Columns["bFanOut"]; this.columndiv = base.Columns["div"]; this.columncrdue = base.Columns["crdue"]; + this.columnProgressPrj = base.Columns["ProgressPrj"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1722,6 +1737,8 @@ namespace FPJ0000 { base.Columns.Add(this.columndiv); this.columncrdue = new global::System.Data.DataColumn("crdue", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columncrdue); + this.columnProgressPrj = new global::System.Data.DataColumn("ProgressPrj", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnProgressPrj); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1766,6 +1783,7 @@ namespace FPJ0000 { this.columnCMP_After.MaxLength = 2147483647; this.columndiv.MaxLength = 2; this.columncrdue.MaxLength = 10; + this.columnProgressPrj.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10820,6 +10838,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double ProgressPrj { + get { + try { + return ((double)(this[this.tableProjects.ProgressPrjColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'ProgressPrj\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjects.ProgressPrjColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -11323,6 +11357,18 @@ namespace FPJ0000 { public void SetcrdueNull() { this[this.tableProjects.crdueColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsProgressPrjNull() { + return this.IsNull(this.tableProjects.ProgressPrjColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetProgressPrjNull() { + this[this.tableProjects.ProgressPrjColumn] = global::System.Convert.DBNull; + } } /// @@ -19365,6 +19411,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("bFanOut", "bFanOut"); tableMapping.ColumnMappings.Add("div", "div"); tableMapping.ColumnMappings.Add("crdue", "crdue"); + tableMapping.ColumnMappings.Add("ProgressPrj", "ProgressPrj"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -19725,7 +19772,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, div, crdue + bCost, bFanOut, div, crdue, dbo.getScheduleProgress(idx) AS ProgressPrj FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -19745,7 +19792,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut + bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -19754,7 +19801,7 @@ WHERE (idx = @idx)"; this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut + bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -29180,8 +29227,10 @@ WHERE (idx = @idx)"; a.crdue FROM Projects AS a INNER JOIN ProjectsPart AS b ON a.idx = b.Project -WHERE (a.gcode = @gcode) AND (ISNULL(b.qtybuy, 0) > 0) AND (ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) AND (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bCancel, 0) = 0) AND - (ISNULL(a.orderno, '') <> '') +WHERE (a.gcode = @gcode) AND (ISNULL(b.qtybuy, 0) > 0) AND (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bCancel, 0) = 0) AND (ISNULL(a.orderno, '') <> '') AND (ISNULL(b.bbuy, 0) + = 0 OR + ISNULL(b.bconfirm, 0) = 0 OR + ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) ORDER BY ISNULL(b.bbuy, 0), ISNULL(b.bconfirm, 0), ISNULL(a.userManager, ''), ISNULL(b.Project, 0)"; 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, "", "", "")); @@ -29192,7 +29241,9 @@ ORDER BY ISNULL(b.bbuy, 0), ISNULL(b.bconfirm, 0), ISNULL(a.userManager, ''), IS a.crdue FROM Projects AS a INNER JOIN ProjectsPart AS b ON a.idx = b.Project -WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND (ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) AND (a.status IN ('진행', '완료', '완료(보고)'))"; +WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bbuy, 0) = 0 OR + ISNULL(b.bconfirm, 0) = 0 OR + ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0))"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index c36a011..45384a6 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -141,7 +141,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, div, crdue + bCost, bFanOut, div, crdue, dbo.getScheduleProgress(idx) AS ProgressPrj FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -272,7 +272,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat - + @@ -323,6 +323,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -347,7 +348,7 @@ WHERE (import = 1) AND (gcode = @gcode) SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut + bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj FROM Projects WHERE (idx = @idx) @@ -361,7 +362,7 @@ WHERE (idx = @idx) SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut + bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -1749,8 +1750,10 @@ WHERE (idx = @idx) a.crdue FROM Projects AS a INNER JOIN ProjectsPart AS b ON a.idx = b.Project -WHERE (a.gcode = @gcode) AND (ISNULL(b.qtybuy, 0) > 0) AND (ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) AND (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bCancel, 0) = 0) AND - (ISNULL(a.orderno, '') <> '') +WHERE (a.gcode = @gcode) AND (ISNULL(b.qtybuy, 0) > 0) AND (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bCancel, 0) = 0) AND (ISNULL(a.orderno, '') <> '') AND (ISNULL(b.bbuy, 0) + = 0 OR + ISNULL(b.bconfirm, 0) = 0 OR + ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) ORDER BY ISNULL(b.bbuy, 0), ISNULL(b.bconfirm, 0), ISNULL(a.userManager, ''), ISNULL(b.Project, 0) @@ -1838,7 +1841,9 @@ WHERE (idx = @idx) a.crdue FROM Projects AS a INNER JOIN ProjectsPart AS b ON a.idx = b.Project -WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND (ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) AND (a.status IN ('진행', '완료', '완료(보고)')) +WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bbuy, 0) = 0 OR + ISNULL(b.bconfirm, 0) = 0 OR + ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) @@ -2695,7 +2700,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -2930,10 +2935,11 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + - + @@ -2977,7 +2983,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3022,7 +3028,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3138,7 +3144,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3263,7 +3269,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3301,7 +3307,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3417,7 +3423,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3468,7 +3474,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3481,7 +3487,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3651,7 +3657,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3828,7 +3834,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3873,7 +3879,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -3942,7 +3948,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -4132,7 +4138,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + @@ -4271,7 +4277,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 2d38ae5..123ceb7 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -6,23 +6,23 @@ --> - - + + - - - + + + - - + + - - - + + + \ No newline at end of file