diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index cd6f6ee..29b8787 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.10.06.1750")] -[assembly: AssemblyFileVersion("21.10.06.1750")] +[assembly: AssemblyVersion("21.10.12.1100")] +[assembly: AssemblyFileVersion("21.10.12.1100")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 6053bc1..5c43c97 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -242,14 +242,14 @@ // this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.codesToolStripMenuItem.Text = "공용코드"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.itemsToolStripMenuItem.Text = "품목정보"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // @@ -260,7 +260,7 @@ this.myAccouserToolStripMenuItem, this.권한설정ToolStripMenuItem}); this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.userInfoToolStripMenuItem.Text = "사용자"; // // userAccountToolStripMenuItem @@ -287,14 +287,14 @@ // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.customerToolStripMenuItem.Text = "업체정보"; this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); // // mn_kuntae // this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(180, 24); + this.mn_kuntae.Size = new System.Drawing.Size(153, 24); this.mn_kuntae.Text = "월별 근무표"; this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); // @@ -302,7 +302,7 @@ // this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.메일양식ToolStripMenuItem.Text = "메일 양식"; this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); // @@ -382,21 +382,21 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); // // 자동입력ToolStripMenuItem // this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; - this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); // // 양식ToolStripMenuItem // this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; - this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // @@ -445,14 +445,14 @@ // 관리ToolStripMenuItem // this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem"; - this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); + this.관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.관리ToolStripMenuItem.Text = "재고 관리"; this.관리ToolStripMenuItem.Click += new System.EventHandler(this.관리ToolStripMenuItem_Click); // // 재고현황ToolStripMenuItem // this.재고현황ToolStripMenuItem.Name = "재고현황ToolStripMenuItem"; - this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); + this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.재고현황ToolStripMenuItem.Text = "재고 현황"; this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click); // @@ -460,7 +460,7 @@ // this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem"; - this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); + this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.pMP현황ToolStripMenuItem.Text = "PMP 현황"; this.pMP현황ToolStripMenuItem.Visible = false; this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click); @@ -563,39 +563,39 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); this.패치내역ToolStripMenuItem1.Text = "패치 내역"; this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click); // // 메일내역ToolStripMenuItem // this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem"; - this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -604,7 +604,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -613,7 +613,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -621,7 +621,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -629,7 +629,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -638,7 +638,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -647,7 +647,7 @@ // this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red; this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24); + this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24); this.toolStripMenuItem5.Text = "(test)휴가등록"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -833,7 +833,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1065, 594); + this.tabControl1.Size = new System.Drawing.Size(1062, 594); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); @@ -849,9 +849,9 @@ this.toolStripMenuItem6, this.toolStripButton1, this.toolStripButton2}); - this.toolStrip1.Location = new System.Drawing.Point(1066, 28); + this.toolStrip1.Location = new System.Drawing.Point(1063, 28); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(29, 594); + this.toolStrip1.Size = new System.Drawing.Size(32, 594); this.toolStrip1.TabIndex = 35; this.toolStrip1.Text = "toolStrip1"; // @@ -860,7 +860,7 @@ this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem8.Text = "업무일지"; this.toolStripMenuItem8.ToolTipText = "업무일지"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); @@ -870,7 +870,7 @@ this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem7.Text = "구매신청"; this.toolStripMenuItem7.ToolTipText = "구매신청"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); @@ -880,7 +880,7 @@ this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20); + this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); this.toolStripMenuItem6.Text = "프로젝트"; this.toolStripMenuItem6.ToolTipText = "프로젝트"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); @@ -891,7 +891,7 @@ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(26, 20); + this.toolStripButton1.Size = new System.Drawing.Size(29, 20); this.toolStripButton1.Text = "구매진행상황"; this.toolStripButton1.ToolTipText = "구매진행상황"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2); @@ -902,7 +902,7 @@ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(26, 20); + this.toolStripButton2.Size = new System.Drawing.Size(29, 20); this.toolStripButton2.Text = "품목정보"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // diff --git a/Project/fMain.resx b/Project/fMain.resx index 1f03973..ea905b5 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -431,20 +431,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7amI8YGGVjf5seoCwmUxdgkZj - 1IyRCNvYOuRndPtgUFp+dHbSYZHRjZa20ALlp0BxGVqKbGWNTkanOCSbMdEt0YVZl+pcF5wWg/GMhEwv - y7su2ciyO7lPnjz39T3v876fbKBCzWp7y9X0SSp6Dijp1irpLFPgKk3HWbwee9F6rIXrOKZJo2X3kwjA - X9+4H+6LHSzMthO/4OTPL+zcPmfj97PHmQ9ZuHW6meYCuQDMR84cJj5rJTZeeNdje7np38ONkwX86ttB - tO9NrnflEnFu41rra/zs0vCb30zTc/I7CYCqZNK2XXwx3LiVySMvYMpLJXhoC2P1WxgxPMtQ1WZRc2sz - sRdn8KOvgWBDDu/vWNsvW5FXUl++MlLF3Kn3mKh7WjR/pNvIcMUG+ver6dqnErVWjZKPLfu45DyQCKcs - HMp5IkUAeiXFy2OmbG5/2Uao8UXRPFi+gZ4yFR3FKmyFSlFr0Wzk+753+VCfTUPemhIRvqdurWL0gmsv - 3/oMzAzUMeUx8FmXnpBbz+n2aj5x6Jh01fBpYx6m/NSvk7G76jVkPt4vKUNHyxR3Ol5N/3f1Va1su2mn - fOXMHMlP/c+yO82djMpkvor0lAFJ/Xew6XVmvboHPNOvY7pPx/meKs51V3K2s5IJp0Rv7Uu0FMiPC8DA - flV0onkbF4dqCB7eynj9JsbqsvDXZnHSkMWwLhPvwWfwSBm4tBkMGbczapPorM5OTCQPybrK0v6ZC5oI - Gp9ntPopsaxHuWmnArfhDU6114gjCcCtGTuxzxu5MfEOv4zXEg3ouD5ykJ+Gtcx5S7jqKeQH1y6u2PO5 - 3JrLd5bEgxo2rewjCfiqLREqJXJiFyd6bHg8HuFpx1tcsuRw9AMzRqMRvV7PQrRU+JrPJCYSgJvnrcxP - O4iF2wj4OonFYkQiEfx+Pw6Hg3A4zNLSEpUV5VwdbBDhBwD3/3Gu+lympqaIx+MsLy8LLy4uEggE0Gle - EWPfvxNxE6tltVrfNpvN0XtjS5L0R1FR0aBGo3ks2ZKUTPY/ZKs1QNfnysgAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7amJ2gMGOjf5seoCgJkSXoNEs + asZIhG3MDvkZ3T4YlJYfnZ10WGTU0dIWWqD8FChbhpYiW7HRyegUh2QzJrolurDVpTrXBafFYDwjIdNr + 5V2XbGTZndwnT577+p73ed9PNlipZq29FWr6JRW9+5X0aJV0lStwlaXjLNmIvXgj1qINfKRJo3X3egTg + 7+/cD/f5ThbnOoifc/LXV3ZunbHxx+mjLIQs3DzVQkuhXAAWIp8dIj5nJTZRdNfje7jhf4vrJwr5zbeD + aP+bXOvOI+LcxpW21/jFpeF3v5nmbPntBEBVOmXbLr4YbtrC1OEXMeWnEjyYzXhDNqOG5xmufk7U3NpM + 7CUZ/OxrJNiYywc7nhyQrcorqS9eGq1m/uT7TNY/LZo/1m1mpHITA/vUdO9ViVqbRsknlr1ccO5PhFMW + D+auSxGAPknxyrgph1tftxNqekk0D1VsordcRWeJCluRUtRaNZv5sf89julzaMx/olSE76lHqxg759rD + 9z4Ds4P1THsMfNGtJ+TWc6qjhk8dOqZctXzelI+pIPXbZOyu+gyZjw9IytCRcsXtzq3p/629qtVtN++U + r56ZwwWp/1t2p7mTUZnMV5meMiip/wk2v86cV/eAZwd0zPTrONtbzZmeKk53VTHplOire5nWQvlRARjc + p4pOtmzj/HAtwUNbmGh4lvH6LPx1WZwwZDGiy8R74Bk8UgYubQbDxu2M2SS6anISE8lDsu7ytH/ngyaC + xhcYq3lKLOtRbt6pwG14g5MdteJIAnBz1k7syyauT77LrxN1RAM6ro0e4OqIlnlvKZc9Rfzk2sUlewEX + 2/L4wZJ4UCOm1X0kAd+0J0JlRI7v4nivDY/HIzzjeJsLllyOfGjGaDSi1+tZjJYJX/GZxEQCcOOslYUZ + B7FwOwFfF7FYjEgkgt/vx+FwEA6HWV5epqqygstDjSL8AOD+P87VkMf09DTxeJyVlRXhpaUlAoEAOs2r + Yuz7dyJuYq2sVus7ZrM5em9sSZL+LC4uHtJoNI8lW5KSye4AYVs1P57vH+4AAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index a86c39d..6818775 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -115,7 +115,6 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.taPartStatus = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter(); this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.tbProjectName = new System.Windows.Forms.TextBox(); @@ -925,7 +924,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "1대 금액"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "N대 금액"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "PMP"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "구매수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "구매요청"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "PR"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "PO"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "공급사"; @@ -1048,7 +1047,7 @@ this.fpSpread1_Sheet1.Columns.Get(15).DataField = "qtybuy"; this.fpSpread1_Sheet1.Columns.Get(15).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "구매수량"; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "구매요청"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType1; @@ -1134,10 +1133,6 @@ this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist"; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // taPartStatus - // - this.taPartStatus.ClearBeforeFill = true; - // // panel3 // this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); @@ -1333,7 +1328,6 @@ private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Button button4; private System.Windows.Forms.Panel panel7; - private dsPRJTableAdapters.ProjectPartStatusTableAdapter taPartStatus; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.TextBox tbPDate; @@ -1356,7 +1350,7 @@ private System.Windows.Forms.ToolStripMenuItem 선택값POToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem oNToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem oFFToolStripMenuItem1; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.CheckBox chkshowerr; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs index 6325139..6b5136a 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs @@ -131,7 +131,8 @@ namespace FPJ0000 try { - this.taPartStatus.Fill(this.dsPRJ.ProjectPartStatus, FCOMMON.info.Login.gcode); + var taPartStatus = new dsPRJTableAdapters.ProjectPartStatusTableAdapter(); + taPartStatus.Fill(this.dsPRJ.ProjectPartStatus, FCOMMON.info.Login.gcode); //this.bsPart.Sort = "bbuy,bconfirm,userManager,project"; if (this.bsPart.Count > 0) this.bsPart.Position = 0; //210120 (박성민s) } @@ -358,7 +359,8 @@ namespace FPJ0000 try { - var cnt = this.taPartStatus.Update(this.dsPRJ.ProjectPartStatus); + var taPartStatus = new dsPRJTableAdapters.ProjectPartStatusTableAdapter(); + var cnt = taPartStatus.Update(this.dsPRJ.ProjectPartStatus); FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 업데이트 되었습니다."); this.dsPRJ.AcceptChanges(); } diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index f0791ae..d50c0da 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY - zVTMvM0pmtrQhUG2mEamrjRR6YIoRS8qtItObd7mnNtwRuYytXmbF/Cy1F3OcTvTb885W2og9IMPz4vn - fD+c3/ccHjshd1WJF0p1ysgy3e9QqY4iJ80hZ089HVmqpcMfaYynJeoKv6i3e7jQzgl70KtetNLLRqPR - bbGvw2LbZtnKQuPnvBUFn8yILRtxCLIUe71Rz0QUaxbZsHbKBf00A72ZgW6KgWbSCdWvdbQO27HOAE0j - FAo+TCPlqZH6RxIqbaXWHE4MzLjxdYYhJ4N+TuJEj2kdX4YdRLCBgXk39HMuFCnMCLrT+YYLx8gDJ65J - ozZF1VeQUnUVVW31KGyQI0jqj0CCoOgUQmTHUd5Uzq1ioxksrDgQktDDcILo0qD3nUPNaB57iSpdHidJ - qAxH3ut4ZNfHQlhzEck1yWgaXECz0YbP39ewSnoKlfXSnEBQIdjrJ81x60a78WpIhhJVFidJrI4g4UtI - f54GtcnOrdIxRkFJelixuxBa2OcRsBNW3EOLa5NgMGlQo7+Nh+25iJGfQ2JlFAxTDhhIsWzB6nFPJxYi - CJHtEJy5J3WdyD+I+AoBBsa1KOrOgEwhRuzjYNSrPuLbLAMDKVY76UIfYdHqQtB9r+CoxEfElxxAdl0c - rleHIa78PCcRK+IhaUgjbxIM9n7A7EY/+4kJVlJkQI7GI+BL9s3yJfvJQz7g5/ngckkwMl8kQT2sRJEy - HxnvkiCsjoaBCPTk39ARAe3aIALV9gpnc3rp+VUag7Nujp7ROdyqTUcqCYpqYpFbd3PrjsXhdBNB47aA - tc1YtgX/w86ukLZDcFLc5Sh88mxzt4d3o6ura+NwQpPNGydFprdPTK85rOzFxBKFiUUKJi9LNhcH27yN - 9oQpilr1vdHywxvn8Y6lt2UGCFvbj4iUlgBRI71Fqgf/vwgbaV9hy8qh5JYO/yRFCo/H4/0B4nCd4lUc - fowAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s + Zipm3uYUTU10YZCtppGpC03coEKUohcV2kWnNnVuc7rhjMxlavN+AS9L3eUctzP99pyzpQZCP/jwvHjO + 98P5fc/hsRN2T518sUKvjK7U/w4X6yly0hxS9jTQ0RV9dOQTnemMSFvtH/N2HxfaPRGPerRLVnrFZDK5 + LfYNWGw7rFhZaPxcsKL40wziK0cc/ByFjzfqmagy3RIb7ptywTDNwDDDQD/FQDfphPrXBtqG7dhggOYR + CsUfppH2zET9IwkXt1HrDicGZt34OsuQk0E/J3FCY97Al2EHEWxiYMENw7wLpYoZhNztesOF46TBE9fF + MVtC2VWk1V5DbXsDShqlCBEHIJjALz2NMMkJVDVXcavYaAaLqw6EJWkYThBbEfK+a6gFLWMvUasv5CRJ + NZEofJ2I3IZ4COSXkCpPRfPgIlpMNnz+vo410lO4pIfmBPxqvo+/OM+tH+3GqyEJytU5nCRZFkXCl5H5 + PANas51bpXOMgpL0sGp3Ibyk1yNgJ6JMQ+fXpcBo1kFuuIPHHQWIk55Hck0MjFMOGEmxbMHacU8nFiII + k+wSnL0vdp0sOoTEaj4GxvtQ2p0FiSIf8U9D0aD+iG9zDIyk2L5JF3oJS1YXQh54BcdEvsIg0UHk1ifg + hiwCCVUXOEm+IhGixgzyJqFg7wdm3OhnPzHBSooMzNN5BEGi/XNBogPkIV8EFfriSnkosl+kQDusRKmy + CFnvUiCQxcJIBAbyb+iJgHZtEoF6Z4VzeT30whqNwTk3h2Z0HrfrMpFOgkJ5PArqb23fsTicbiJo2hGw + tlnLjuB/2NkVMnYJTuWrHA+l8q29Ht4LlUq1eSSp2eaNkyIzOyam1x1W9mJimcLEEgWzl2Wbi4Nt3kZ7 + whRFrfndbP3hjfN4xzPbswMFbR1HhUpLoLCJ3ibdQ8BfBE20n6B19XBqa2dAiiKNx+Px/gDeGp3c5dRX + 4AAAAABJRU5ErkJggg== @@ -383,7 +383,4 @@ 542, 17 - - 17, 17 - \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 01ed42d..2076af8 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -39,33 +39,33 @@ System.Windows.Forms.Label label1; System.Windows.Forms.Label label2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPartList)); - FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer2 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer3 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer4 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + 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 numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType6 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = 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.NoPrinterPrintInfo noPrinterPrintInfo2 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.button4 = new System.Windows.Forms.Button(); this.panel7 = new System.Windows.Forms.Panel(); @@ -1012,6 +1012,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(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -1069,6 +1070,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, 27); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -1177,12 +1179,12 @@ this.fpSpread1.ContextMenuStrip = this.cm1; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; - this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer1; + this.fpSpread1.FocusRenderer = flatFocusIndicatorRenderer2; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1.HorizontalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.HorizontalScrollBar.Name = ""; - flatScrollBarRenderer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer1; + flatScrollBarRenderer3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.HorizontalScrollBar.Renderer = flatScrollBarRenderer3; this.fpSpread1.Location = new System.Drawing.Point(0, 170); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { @@ -1195,8 +1197,8 @@ this.fpSpread1.TitleInfo.Value = "PartList"; this.fpSpread1.VerticalScrollBar.Buttons = new FarPoint.Win.Spread.FpScrollBarButtonCollection("BackwardLineButton,ThumbTrack,ForwardLineButton"); this.fpSpread1.VerticalScrollBar.Name = ""; - flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; + flatScrollBarRenderer4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer4; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); this.fpSpread1.SetViewportLeftColumn(0, 0, 1); // @@ -1230,7 +1232,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "1대 금액"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "N대 금액"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "PMP"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "구매수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "구매요청"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "PR"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "PO"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "공급사"; @@ -1243,100 +1245,101 @@ this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "ItemGroup"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "중분류"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 89F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "option1"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "소분류"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 86F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.NegativeRed = true; - numberCellType1.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType1; + numberCellType10.DecimalPlaces = 0; + numberCellType10.NegativeRed = true; + numberCellType10.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "no"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "번호"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 79F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoSort = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(3).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemName"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 99F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemManu"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "manu"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemUnit"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(7).Tag = "unit"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType2.DecimalPlaces = 0; - numberCellType2.MaximumValue = 9999999999999.99D; - numberCellType2.MinimumValue = -9999999999999.99D; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "0"; - numberCellType2.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType2; + numberCellType11.DecimalPlaces = 0; + numberCellType11.MaximumValue = 9999999999999.99D; + numberCellType11.MinimumValue = -9999999999999.99D; + numberCellType11.NegativeRed = true; + numberCellType11.NullDisplay = "0"; + numberCellType11.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "price"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - numberCellType3.NegativeRed = true; - numberCellType3.Separator = ","; - numberCellType3.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; + numberCellType12.DecimalPlaces = 0; + numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType12.MaximumValue = 2147483647D; + numberCellType12.MinimumValue = -2147483648D; + numberCellType12.NegativeRed = true; + numberCellType12.Separator = ","; + numberCellType12.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "1대 수량"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.NegativeRed = true; - numberCellType4.Separator = ","; - numberCellType4.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; + numberCellType13.DecimalPlaces = 0; + numberCellType13.NegativeRed = true; + numberCellType13.Separator = ","; + numberCellType13.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType13; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "N대 수량"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5; + numberCellType14.DecimalPlaces = 0; + numberCellType14.MaximumValue = 9999999999999.99D; + numberCellType14.MinimumValue = -9999999999999.99D; + numberCellType14.NegativeRed = true; + numberCellType14.NullDisplay = "--"; + numberCellType14.Separator = ","; + numberCellType14.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-3]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -1344,43 +1347,43 @@ this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amt"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType14; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amtn"; this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-4]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(12).Label = "N대 금액"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amtn"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtyjago"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "PMP"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Visible = false; - numberCellType6.DecimalPlaces = 0; - numberCellType6.NegativeRed = true; - numberCellType6.NullDisplay = "--"; - numberCellType6.Separator = ","; - numberCellType6.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType6; + numberCellType15.DecimalPlaces = 0; + numberCellType15.NegativeRed = true; + numberCellType15.NullDisplay = "--"; + numberCellType15.Separator = ","; + numberCellType15.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType15; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "qtybuy"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "구매수량"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "구매요청"; this.fpSpread1_Sheet1.Columns.Get(14).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = checkBoxCellType4; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "PR"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType5; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "bconfirm"; this.fpSpread1_Sheet1.Columns.Get(16).Label = "PO"; this.fpSpread1_Sheet1.Columns.Get(16).Tag = "bconfirm"; this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(17).ImeMode = System.Windows.Forms.ImeMode.Hangul; @@ -1388,33 +1391,33 @@ this.fpSpread1_Sheet1.Columns.Get(17).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "option2"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(18).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType7.DecimalPlaces = 0; - numberCellType7.NegativeRed = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType7; + numberCellType16.DecimalPlaces = 0; + numberCellType16.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType16; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = checkBoxCellType6; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "bCancel"; this.fpSpread1_Sheet1.Columns.Get(20).Label = "취소"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "cancel"; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(21).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType17; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "Item"; this.fpSpread1_Sheet1.Columns.Get(22).Tag = "item"; this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType18; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "ItemSupplyidx"; this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; @@ -1428,11 +1431,11 @@ this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; - noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo1.HardMarginX = 0F; - noPrinterPrintInfo1.HardMarginY = 0F; - noPrinterPrintInfo1.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; + noPrinterPrintInfo2.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo2.HardMarginX = 0F; + noPrinterPrintInfo2.HardMarginY = 0F; + noPrinterPrintInfo2.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo2; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -1455,7 +1458,7 @@ this.Controls.Add(this.panel1); this.MinimumSize = new System.Drawing.Size(500, 200); this.Name = "fPartList"; - this.Text = "파트리스트"; + this.Text = "부품목록"; this.Load += new System.EventHandler(this.fPartList_Load); this.panel1.ResumeLayout(false); this.panel2.ResumeLayout(false); diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 07a59ca..b04ee4b 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -238,6 +238,12 @@ 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -379,20 +385,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s - Zipm3uYUTU10YZAtppGpC01UqBCliKjQLnNqU+ec0w1nZC5T06nzAl6Wuss5c2fz23POlhoI/eDD8+I5 - 3w/n9z2Hx07YPVXyxQqtIrpS+ztcrKXISXNI2VNHR1cM0JGPNYYzInW1f8zbfVxo90Q87FMvW+hVg8Hg - MtscMFt3WLWw0Pi5aEHxJxPiK8fs/By5jzfqmagyzTIbHphxQjfLQGdioJ1hoJnehOqXA+2jNjgYQDZG - ofjDLNKeGqh/JOHidmrDvomhORe+zjHkZDDISTbRO+nAl1E7EbgxtOiCbsGJUrkJIXe7X3PhOGmw8bo4 - ZktYdxVptddQ29GEkmYpQsQBCCbwS08jTHICVbIqbhUrzWBpzY6wpF6GE8RWhLzvHmlF68QL1GoLOUlS - TSQKXyUitykegvpLSK1PhWx4Ca0GKz5/38A66Slc0kdzAn4138dfnOfSjvfg5YgE5aocTpJcF0XCl5H5 - LAPqSRu3StcEBQXpYc3mRHhJv0fATkRZL53fkAL9pAb1ujt41FmAOOl5JNfEQD9jh54UyxasnvJ0YiaC - MMkuwdn7YufJokNIrOZjaGoApT1ZkMjzEf8kFE2qj/g2z0BPih2YdqKfsGxxIuSBV3BM5CsMEh1EbmMC - btRFIKHqAifJlydC1JxB3iQU7P2QyYVB9hMTLKTIwDyNRxAk2j8fJDpAHvJFUKEvrpSHIvt5CtSjCpQq - ipD1LgWCuljoiUBH/g0tEdBONxGodlY4l9dHL67TGJ53cfSOL+B2QybSSVBYH4+Cxlvbdyz2TRcRtOwI - WNuceUfwP2zsChm7BKfylfY3su6tvR7eC1Vfv/tIkszqjZMiMzuNsxt2i1LZ4zauUDAuU5j0smJ1crDN - W2kXlCqNm6Kodb+bbT+8cR7veGZHdqCgvfOoUGEOFLbQ26R7CPiLoIX2E7StHU5t6wpIkafxeDzeHz1U - nmgPM2D2AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY + zVTMdDqnaGqiC4NsMY3MS2iigwpRioIKrdSpTd3mnG64ReYyNe838LLUXc7Rnc1vzzlbaiD0gw/Pi+d8 + P5zf9xweOyH3NYmXSvXKyDL971CpniInzVHOngY6srSPDn+iM5+VaCv9ot7t40K7J+xRj3bJSq+YzWaX + xb4Bi22HFSsLjZ8LVhR8nkFs2bBDkKnY7416JqJYt8SG+6acMEwzMMww0E8x0E1uQvNrA21DdmwwQPMw + hYKP00h+Zqb+kYRK26h1xyZMsy58nWXIyaCfk2yie2wDX4YcROCGacEFw7wTRYoZ8O91veHCMeVBEzek + UVvimmtIrr6O6vZ6FDaUgy/1RxBBUHQGIbKTqGiu4Fax0QwWVx0ISehmOEF0Kf9D12ALWkZfolqfx0kS + qsKR9zoeWfWxEMkvI0mehOaBRbSYbWj6vo410lOorIfmBIJKwX4/abZLP6LGq0EZSjSZnCSxJoKEryDt + eSq0Y3Zulc5RCkrSw6rdidDCXo+AnbDibjqnVgjjmA5yw1087shFTPkFJFZFwTjlgJEUyxasHfd0YiGC + ENkuwbkHUuep/MOIrxTANN6HInU6ZIocxD4NRr3mE77NMTCSYvsmneglLFmd4D/0Co5LfMSBkkPIqovD + zZowxFVc5CQ5inhIGlLJmwSDvTfNuNDPfmKClRQZkK3zCAIlB+YCJQfJQz4IzPPB1ZJgZLwQQjukRJEy + H+nvhRDVRMNIBAbyb+iJgHa6iUCzs8L57B56YY3GwJyLo3tkHndq05BCgmJ5LHLrbm/fsTg2XUTQuCNg + bbOWHcH/sLMrpO4SnM5ROd42dW7t9fBeqLU699GEZps3TopM65iYXndYVSqVe2KZwsQShTEvyzYnB9u8 + jXZBpe5xUxS15nur9Yc3zuOdSGvPCBC1dRwTKy0B4kZ6mxQP/n8RNdK+otbVI0mtnf5CRTKPx+P9AThw + nl886jlzAAAAAElFTkSuQmCC @@ -440,4 +446,7 @@ 711, 18 + + 614, 18 + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index f0a62a4..10c7a28 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -434,7 +434,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(299, 418); + this.cm.Size = new System.Drawing.Size(299, 440); // // columnSizeToolStripMenuItem // @@ -495,7 +495,7 @@ // this.partListToolStripMenuItem.Name = "partListToolStripMenuItem"; this.partListToolStripMenuItem.Size = new System.Drawing.Size(298, 36); - this.partListToolStripMenuItem.Text = "파트리스트"; + this.partListToolStripMenuItem.Text = "부품목록"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // // iOMapToolStripMenuItem diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index c5bf350..37a6601 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL15TLXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6LYwl9o1Fd78jSYu+jCMyuMLofhkEl07+Qq3rawYkZCYw7+j3X - S532tsDg0UE/osUJVyP5WWd6BjEjocf9lcz756+A8V+GefYiKOQgGA5dmluzwDQcJvNsKIsnhGwJhoMX - fJKCKotCVcHsQlmXHOpuhcRPWceDYleGcDwNzdmplYIqS6lKSZdwzcNNaBttRvm5HSQoMDAWzBTYJ0Ow - TwThnA7i7ZcE9nZMkAJ1X6lKQW/ntPfqscdUjuJTBZC3bsGgNwSroHH27w1ef4qjotULFbOzsoyWc43O - OsjoQq6IzttmvL2IeGoZtkmWeO38lxSQLfgNbLxqrAeg7ClB9fV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 - pljcmc6IGnrCIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd32ZDR7M8ofknGGRLXWXErL2QhTp - 85B/fN1KWEB3Y4EUDPFBIUwKbvIPkc2LQAwao3fNO9Bee4koX+B6GiZet58vEAK52tTh/i1mJDQwzxFJ - /AAbS+NzJIUAmwS12+BBrmQN9+1iRsIx8/xYbac/Wds5h+rzPuw/s3ov/whF/QERKCy2AnEPXgAAAABJ + SKESs3bThpqMigpL15TLXClrzcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6JYwl9Y1Fd7+jSYu/DCMyuMLofhEEl07+Qq3p6iBMzEhh39Huu + lzrtbYHBo4N+VIsTrkbys870DGJGQo/7K5n3z18B478M8+xFUMhBMBy6NLdmgWkkTObZUBZPCNkSDAcv + +CQFVRaFqoLZhbIuOdTdComfsk4Exa4M4XgamrPTKwVVllKVki7hmkea0DbWjPJzO0hQYGA8mCmwT4Vg + nwzCORPE2y8J7O2YJAXqvlKVgt7Oae/WY4+pHMWnCiBv3YJBbwhWQRPs3xu8/hRHRasXKmZnZRkt5xqd + dZDRhVwRnbfNOLSIeGoZtimWeO38lxSQLfgNbLxqrAeg7ClB9fV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 + plncnsmIGn7CIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd3yZDe7P8ofkfMwiW+ouJWTthSjS + 5yH/+LqVsIDuxgIpGOaDQpgU3OQfIpsXgRg0Ru+ad6C99hJRvsD1NEy8bj9fIARytanD/VvMSGhgniOS + +AE2lsbnSAoBNglqt8GDXMka7tnFjIRj5vnx2k5/srZzDtXnfdh/ZvVe/hGK+gMNsSy13JsP9wAAAABJ RU5ErkJggg== @@ -247,17 +247,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ - Eg8mGi9gosGEgwfmYkDUBAWmJpNgFOQtKEPCZsiCgW2AMGQVx9hmN8akE+ho18e6rl//G1XUxMTHN/2m - j/w/39+j1H9raaRsITp8Wo394pXR4+HQi0N7w31lRT/5TVmRy1Wxx8ApytthUnQ9B0AnV947z1k5ibir - KrPqOad8c2Luihz11EQDr46cNXCKoofKU7omQ4k3QYw0Q2SeQIoOQM9yJCsNXROIt3fes1tgWTYTGDTR - Bk5Rwa7DfE7dJrAV6VAr+A8WbM5UITl7GZy/HtziDXAL17HlqyWuIZ2xCA4eFQycBPSXq1lpHRxtxdZ8 - I9iJa5DYaVKVN6rn76nvHeTH8/WXygae7+CYWpg/pxBLgCYWQE0KQEk8AE33wu72on2cQffkGpy+GPJ7 - M3ASYDVldE2CxnuR5RxQNwaQWW+DvHoX/sUOjMyxWPks4tOGgukwj7GFLxi212sGTv6CzaTkVB7qph0Z - trNQVY7VQ4rUos+dwFJcwAwjwR0RMUXsTyjoecvAwCnKd69U1lWOwE+hrDVDjloIXAMxeLHQdiipwB1O - YzKUxnhAwFxMQedEfDdg+XZJQkrRqUVXdy690g4h+BBCoAnCxwb0kJmX1kRMBHfgvN+tKrCNLu8GBBqK - rwYaD3bRtw4kfY0l8o9+PdSgTYd4zBPIw8iYJdXt7wWYLfd1R92J80bE79XiYPbZnIy5n+yidyqBx05X - zmyx6v6xNnhbK/nn1cWVxtE/18u6U5c8jy5wEUcLRm9WiMbnv9Oz6v2VY+aTkvPOmd1d/Jso6ivwBCPY - EqsnjAAAAABJRU5ErkJggg== + Eg8mGi9gosGEgwcGURA1gfBQEyQYBXkL6pCwGbJgYBsgDFjFMrbZjTHpBDra9bGu69f/RhU1MfHxTb/p + I//P9/co9d9aHilaCL8+q0V+8eroyWDgxZH9wf6ivJ/8tijP6SzZZ+IU5em0qIaRAWCQK+vd57QSR9RZ + llpzX1C/OTZ3TQm7K8LMq2PnTZyi6OHihKErUKMNkEJNkNgnkMODMNI8yUrC0EXind339DY4jksxQxba + xCnK331UyGg7BG5FMtAC4UMNtmbKEJ+9Ct5XC36pGvzCTWx7K4krSGcc/EPHRRMnAQPFWlreAE+3Ynu+ + HtzEDcjcNKkqmNWz98T3DrLjeQcKFRPPdnBCy82fUYllQJdyoC4zUGMPQNN9sLk86Bhn0TO5Doc3guze + TJwEtFpShi5DFzxI83Zom4NIbbRDWbsP31InRuY4rH6W8GlTxXRQwNjCF7y23dZNnPyFNoua0QRoWzak + uK5cVSVSCzlUiX5XDMtRETOsDFdIwhSxL6ai9x0LE6cob2OhYmg8gZ9CXW+CEq4hcAUk/+Vc24G4Clcw + iclAEuOMiLmIiq6J6F7Ayt2CmJygE4vOnkxytQOi/yFEpgHixzr0kpmX1yVM+HfhrN+vqWgbXdkLYOry + rzP1h7vpO4fi3voC5Ue/Ga7VpwMC5gnkZhXMkuq2RRHW6kbDXnXqohnxezXb2QNtDtY6QHbRNxXDY4cz + Y61uMXxj7fC0lArPy/NLzaN/rpdVZ664H13iQ/ZmjN4qkczPf6dn5QdLx6ynZce9c3u7+DdR1FfnjyPR + uWrmOAAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 2a5f961..9980051 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -30219,28 +30219,19 @@ WHERE (idx = @idx)"; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT a.gcode, a.pdate, a.status, a.name, a.userManager, a.orderno, a.path, b.idx, b.no, b.Project, b.ItemGroup, b.ItemModel, b.ItemUnit, b.ItemName, b.ItemSid, b.ItemSupply, b.ItemSupplyidx, - b.ItemManu, b.Item, b.option1, b.option2, b.option3, b.qty, b.qtyn, b.price, b.amt, b.amtn, b.jago, b.remark, b.memo, b.wuid, b.wdate, b.import, b.qtyjago, b.qtybuy, b.qtyin, b.bbuy, b.bconfirm, - 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 (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].CommandText = @"SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, + option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue +FROM vProjectPartPurchase +WHERE (gcode = @gcode) +ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(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, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT a.gcode, a.pdate, a.status, a.name, a.userManager, a.orderno, a.path, b.idx, b.no, b.Project, b.ItemGroup, b.ItemModel, b.ItemUnit, b.ItemName, b.ItemSid, b.ItemSupply, b.ItemSupplyidx, - b.ItemManu, b.Item, b.option1, b.option2, b.option3, b.qty, b.qtyn, b.price, b.amt, b.amtn, b.jago, b.remark, b.memo, b.wuid, b.wdate, b.import, b.qtyjago, b.qtybuy, b.qtyin, b.bbuy, b.bconfirm, - 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 (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].CommandText = @"SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, + option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue +FROM vProjectPartPurchase +WHERE (gcode = @gcode) AND (idx = @idx)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FPJ0000/dsPRJ.cs b/SubProject/FPJ0000/dsPRJ.cs index 864faa1..2eb5dea 100644 --- a/SubProject/FPJ0000/dsPRJ.cs +++ b/SubProject/FPJ0000/dsPRJ.cs @@ -4,15 +4,22 @@ partial class dsPRJ { + partial class EETGW_ProjectToDoDataTable + { + } + partial class EETGW_JobReport_EBoardDataTable { } } } -namespace FPJ0000.dsPRJTableAdapters { - - +namespace FPJ0000.dsPRJTableAdapters +{ + partial class ProjectPartStatusTableAdapter + { + } + public partial class JobReportTableAdapter { } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 1644e1c..6a8f5dc 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1681,7 +1681,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma - + DELETE FROM ProjectsPart @@ -1693,18 +1693,13 @@ WHERE (idx = @idx) - SELECT a.gcode, a.pdate, a.status, a.name, a.userManager, a.orderno, a.path, b.idx, b.no, b.Project, b.ItemGroup, b.ItemModel, b.ItemUnit, b.ItemName, b.ItemSid, b.ItemSupply, b.ItemSupplyidx, - b.ItemManu, b.Item, b.option1, b.option2, b.option3, b.qty, b.qtyn, b.price, b.amt, b.amtn, b.jago, b.remark, b.memo, b.wuid, b.wdate, b.import, b.qtyjago, b.qtybuy, b.qtyin, b.bbuy, b.bconfirm, - 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 (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) + SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, + option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue +FROM vProjectPartPurchase +WHERE (gcode = @gcode) +ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0) - + @@ -1781,20 +1776,16 @@ WHERE (idx = @idx) - + - SELECT a.gcode, a.pdate, a.status, a.name, a.userManager, a.orderno, a.path, b.idx, b.no, b.Project, b.ItemGroup, b.ItemModel, b.ItemUnit, b.ItemName, b.ItemSid, b.ItemSupply, b.ItemSupplyidx, - b.ItemManu, b.Item, b.option1, b.option2, b.option3, b.qty, b.qtyn, b.price, b.amt, b.amtn, b.jago, b.remark, b.memo, b.wuid, b.wdate, b.import, b.qtyjago, b.qtybuy, b.qtyin, b.bbuy, b.bconfirm, - 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 (a.status IN ('진행', '완료', '완료(보고)')) AND (ISNULL(b.bbuy, 0) = 0 OR - ISNULL(b.bconfirm, 0) = 0 OR - ISNULL(b.qtybuy, 0) > ISNULL(b.qtyin, 0)) + SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, + option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue +FROM vProjectPartPurchase +WHERE (gcode = @gcode) AND (idx = @idx) - - + + @@ -2824,7 +2815,7 @@ WHERE (idx = @idx) - + @@ -3091,7 +3082,7 @@ WHERE (idx = @idx) - + @@ -3135,7 +3126,7 @@ WHERE (idx = @idx) - + @@ -3180,7 +3171,7 @@ WHERE (idx = @idx) - + @@ -3296,7 +3287,7 @@ WHERE (idx = @idx) - + @@ -3431,7 +3422,7 @@ WHERE (idx = @idx) - + @@ -3469,7 +3460,7 @@ WHERE (idx = @idx) - + @@ -3585,7 +3576,7 @@ WHERE (idx = @idx) - + @@ -3636,7 +3627,7 @@ WHERE (idx = @idx) - + @@ -3649,7 +3640,7 @@ WHERE (idx = @idx) - + @@ -3821,7 +3812,7 @@ WHERE (idx = @idx) - + @@ -3998,7 +3989,7 @@ WHERE (idx = @idx) - + @@ -4043,7 +4034,7 @@ WHERE (idx = @idx) - + @@ -4120,7 +4111,7 @@ WHERE (idx = @idx) - + @@ -4311,7 +4302,7 @@ WHERE (idx = @idx) - + @@ -4450,7 +4441,7 @@ WHERE (idx = @idx) - + @@ -4502,7 +4493,7 @@ WHERE (idx = @idx) - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 58ac4d9..3261d36 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,25 +4,25 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + +