From 2bb7472cb07701beeb0e9ff58a51eb71b394ab40 Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 26 May 2020 13:21:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=AA=A8=EC=9E=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 56 +- Project/fMain.cs | 26 +- SubProject/FPJ0000/FPJ0000.csproj | 26 +- SubProject/FPJ0000/Import.cs | 612 ++++---- .../FPJ0000/JobReport/fJobReport_Add.cs | 2 +- SubProject/FPJ0000/Note/fNote.Designer.cs | 739 ++++++++++ SubProject/FPJ0000/Note/fNote.cs | 452 ++++++ SubProject/FPJ0000/Note/fNote.resx | 294 ++++ SubProject/FPJ0000/Note/fNote_Add.Designer.cs | 262 ++++ SubProject/FPJ0000/Note/fNote_Add.cs | 172 +++ SubProject/FPJ0000/Note/fNote_Add.resx | 144 ++ .../FPJ0000/Project/fProjectData.Designer.cs | 29 +- SubProject/FPJ0000/Project/fProjectList.cs | 4 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 1276 +++++++++++++++++ SubProject/FPJ0000/dsPRJ.xsd | 147 ++ SubProject/FPJ0000/dsPRJ.xss | 21 +- 17 files changed, 3896 insertions(+), 370 deletions(-) create mode 100644 SubProject/FPJ0000/Note/fNote.Designer.cs create mode 100644 SubProject/FPJ0000/Note/fNote.cs create mode 100644 SubProject/FPJ0000/Note/fNote.resx create mode 100644 SubProject/FPJ0000/Note/fNote_Add.Designer.cs create mode 100644 SubProject/FPJ0000/Note/fNote_Add.cs create mode 100644 SubProject/FPJ0000/Note/fNote_Add.resx diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d273439..a7fe7bd 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("20.05.12.1120")] -[assembly: AssemblyFileVersion("20.05.12.1120")] +[assembly: AssemblyVersion("20.05.26.1300")] +[assembly: AssemblyFileVersion("20.05.26.1300")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 5da90d3..1e90b20 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -70,6 +70,8 @@ this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.mn_docu = new System.Windows.Forms.ToolStripMenuItem(); + this.메모장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.메일내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -97,8 +99,8 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tabControl1 = new System.Windows.Forms.TabControl(); this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tabControl1 = new System.Windows.Forms.TabControl(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -419,6 +421,8 @@ // mn_docu // this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.메모장ToolStripMenuItem, + this.toolStripMenuItem4, this.패치내역ToolStripMenuItem1, this.메일내역ToolStripMenuItem, this.holidayToolStripMenuItem, @@ -435,17 +439,29 @@ this.mn_docu.Size = new System.Drawing.Size(65, 23); this.mn_docu.Text = "문서"; // + // 메모장ToolStripMenuItem + // + this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 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(146, 6); + // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 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(149, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // @@ -453,20 +469,20 @@ // this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem"; - this.holidayToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24); this.holidayToolStripMenuItem.Text = "휴가 내역"; this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 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(149, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -475,7 +491,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(149, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -484,7 +500,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(149, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -492,7 +508,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(149, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -500,7 +516,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(149, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -509,7 +525,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(149, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -517,7 +533,7 @@ // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24); + this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 24); this.toolStripMenuItem5.Text = "123"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -651,6 +667,13 @@ this.pMP데이터베이스업데이트ToolStripMenuItem.Text = "PMP 데이터베이스 업데이트"; this.pMP데이터베이스업데이트ToolStripMenuItem.Click += new System.EventHandler(this.pMP데이터베이스업데이트ToolStripMenuItem_Click); // + // mailBackupToolStripMenuItem + // + this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem"; + this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24); + this.mailBackupToolStripMenuItem.Text = "Mail Backup"; + this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click); + // // tabControl1 // this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; @@ -666,13 +689,6 @@ this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); // - // mailBackupToolStripMenuItem - // - this.mailBackupToolStripMenuItem.Name = "mailBackupToolStripMenuItem"; - this.mailBackupToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.mailBackupToolStripMenuItem.Text = "Mail Backup"; - this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click); - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -771,6 +787,8 @@ private System.Windows.Forms.ToolStripMenuItem pMP데이터베이스업데이트ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pMP현황ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mailBackupToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 메모장ToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 7f25f2d..cc76729 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -87,6 +87,8 @@ namespace Project Update_Site(); bw.RunWorkerAsync(); //background worker + + //사용기록추적 Pub.CheckNRegister2(Application.ProductName, "chi", Application.ProductVersion); } @@ -150,6 +152,9 @@ namespace Project var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday); var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata); + + Menu_Note(); + //시작폼 확인 if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true) { @@ -171,7 +176,10 @@ namespace Project { Menu_InventoryList(); } - + + + + } @@ -741,6 +749,12 @@ namespace Project if (!ShowForm(formkey)) AddForm(formkey, new FCM0000.fInventoryJagoList()); } + void Menu_Note() + { + string formkey = "NOTELIST"; + if (!ShowForm(formkey)) + AddForm(formkey, new FPJ0000.Note.fNote()); + } private void 재고현황ToolStripMenuItem_Click(object sender, EventArgs e) { Menu_InventoryList(); @@ -910,5 +924,15 @@ namespace Project f.TopMost = true; f.Show(); } + + private void 메모장ToolStripMenuItem_Click(object sender, EventArgs e) + { + Menu_Note(); + } + + private void toolStripButton1_Click_1(object sender, EventArgs e) + { + Menu_Note(); + } } } diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 1c6ee12..2a568bd 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -155,6 +155,18 @@ rJobChart.cs + + Form + + + fNote.cs + + + Form + + + fNote_Add.cs + Form @@ -283,6 +295,12 @@ rJobChart.cs + + fNote.cs + + + fNote_Add.cs + fPartList.cs @@ -451,14 +469,6 @@ - - - PreserveNewest - - - PreserveNewest - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 225, 17 + + + 88, 17 + + + 17, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEvSURBVDhPpZI/S0JRGIed+i6Nbk0t0iCuSkuDi1MfIKfm + +gAOQktTQkMggYtRkwgidKmgyQwMCgqz0CivvvK8cK7neG4KdeHhHs45v+c9/xLyz08Ft713OQ+6SqXV + kfLlnXJw1lSK5VrERqGkMB4JCCLpvQ7lZfDlQJ+B4EnwI9nTkbYdAZMbjxOPq4eJPH1MvXC2sD8XsOzP + 0bcX/C3MXEfAfmzBsnCnP10uWBWu3IS+gJOm0w5fHCZiw0aQzu3GC0xYgm2R+poTRnh8HeqNOALu920w + 9MK0F8NGkMrs+ALewqrwUXss3ed+vKB6H+rh2OT3SjpO0IBgcyvnCjgDBGCq8mcMiQ3FHAGdLB/J4vMF + KhoI83LXk6m5gCpmufbyOWlgv0BVIMx4JPj7JzIDGHRUPz2nxiQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + 17, 17 + + + 291, 17 + + + + R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ + 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg + wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO + GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE + pRQTK6YYEAA7 + + + + + R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R + PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg + oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX + dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7 + + + + + R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh + e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw + QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK + HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC + un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= + + + + + R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 + 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ + IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj + SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG + vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== + + + + 152, 17 + + + 465, 17 + + + 527, 17 + + + 359, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei + QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG + A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF + GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG + cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E + dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR + DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il + zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij + KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY + UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/Note/fNote_Add.Designer.cs b/SubProject/FPJ0000/Note/fNote_Add.Designer.cs new file mode 100644 index 0000000..73d8955 --- /dev/null +++ b/SubProject/FPJ0000/Note/fNote_Add.Designer.cs @@ -0,0 +1,262 @@ +namespace FPJ0000.Note +{ + partial class fNote_Add + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel(); + this.btSave = new System.Windows.Forms.Button(); + this.dtPdate = new System.Windows.Forms.DateTimePicker(); + this.cmbUser = new System.Windows.Forms.ComboBox(); + this.tbWW = new System.Windows.Forms.TextBox(); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); + this.panel1 = new System.Windows.Forms.Panel(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(326, 14); + label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(41, 12); + label4.TabIndex = 5; + label4.Text = "담당자"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(17, 14); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(41, 12); + label5.TabIndex = 0; + label5.Text = "등록일"; + // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabel1, + this.lbIndex}); + this.statusStrip1.Location = new System.Drawing.Point(0, 659); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(969, 22); + this.statusStrip1.TabIndex = 28; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabel1.Text = "Index"; + // + // lbIndex + // + this.lbIndex.Name = "lbIndex"; + this.lbIndex.Size = new System.Drawing.Size(17, 17); + this.lbIndex.Text = "--"; + // + // btSave + // + this.btSave.BackColor = System.Drawing.Color.SkyBlue; + this.btSave.Dock = System.Windows.Forms.DockStyle.Right; + this.btSave.Location = new System.Drawing.Point(831, 5); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(133, 30); + this.btSave.TabIndex = 20; + this.btSave.Text = "저장(&S)"; + this.btSave.UseVisualStyleBackColor = false; + this.btSave.Click += new System.EventHandler(this.button1_Click); + // + // dtPdate + // + this.dtPdate.Location = new System.Drawing.Point(66, 10); + this.dtPdate.Margin = new System.Windows.Forms.Padding(4); + this.dtPdate.Name = "dtPdate"; + this.dtPdate.Size = new System.Drawing.Size(178, 21); + this.dtPdate.TabIndex = 1; + this.dtPdate.ValueChanged += new System.EventHandler(this.dtPdate_ValueChanged); + // + // cmbUser + // + this.cmbUser.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbUser.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUser.FormattingEnabled = true; + this.cmbUser.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.cmbUser.Location = new System.Drawing.Point(378, 10); + this.cmbUser.Margin = new System.Windows.Forms.Padding(4); + this.cmbUser.Name = "cmbUser"; + this.cmbUser.Size = new System.Drawing.Size(234, 20); + this.cmbUser.TabIndex = 6; + this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); + // + // tbWW + // + this.tbWW.Location = new System.Drawing.Point(246, 10); + this.tbWW.Margin = new System.Windows.Forms.Padding(4); + this.tbWW.Name = "tbWW"; + this.tbWW.ReadOnly = true; + this.tbWW.Size = new System.Drawing.Size(63, 21); + this.tbWW.TabIndex = 2; + this.tbWW.TabStop = false; + this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_NoteTableAdapter = null; + this.tam.JobReportTableAdapter = this.ta; + this.tam.ProjectsHistoryTableAdapter = null; + this.tam.ProjectsIOMapTableAdapter = null; + this.tam.ProjectsMailListTableAdapter = null; + this.tam.ProjectsPartTableAdapter = null; + this.tam.ProjectsScheduleTableAdapter = null; + this.tam.ProjectsTableAdapter = null; + this.tam.SPMasterTableAdapter = null; + this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // richTextBoxEx1 + // + this.richTextBoxEx1.AllowBullets = true; + this.richTextBoxEx1.AllowDefaultInsertText = true; + this.richTextBoxEx1.AllowDefaultSmartText = true; + this.richTextBoxEx1.AllowHyphenation = true; + this.richTextBoxEx1.AllowPictures = true; + this.richTextBoxEx1.AllowSpellCheck = true; + this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; + this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBoxEx1.FilePath = ""; + this.richTextBoxEx1.Location = new System.Drawing.Point(0, 40); + this.richTextBoxEx1.Name = "richTextBoxEx1"; + this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n\\viewkind4\\uc" + + "1\\pard\\lang1042\\fs20 richTextBoxEx1\\par\r\n}\r\n"; + this.richTextBoxEx1.SetColorWithFont = true; + this.richTextBoxEx1.ShowToolStrip = true; + this.richTextBoxEx1.Size = new System.Drawing.Size(969, 619); + this.richTextBoxEx1.TabIndex = 58; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.checkBox1); + this.panel1.Controls.Add(this.dtPdate); + this.panel1.Controls.Add(label5); + this.panel1.Controls.Add(this.btSave); + this.panel1.Controls.Add(this.cmbUser); + this.panel1.Controls.Add(this.tbWW); + this.panel1.Controls.Add(label4); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + 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(969, 40); + this.panel1.TabIndex = 59; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(619, 12); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(76, 16); + this.checkBox1.TabIndex = 21; + this.checkBox1.Text = "공유 메모"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // fNote_Add + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(969, 681); + this.Controls.Add(this.richTextBoxEx1); + this.Controls.Add(this.panel1); + this.Controls.Add(this.statusStrip1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fNote_Add"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "메모장 등록/변경"; + this.Load += new System.EventHandler(this.fJobReport_Add_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private dsPRJ dsPRJ; + private System.Windows.Forms.BindingSource bs; + private dsPRJTableAdapters.JobReportTableAdapter ta; + private dsPRJTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; + private System.Windows.Forms.ToolStripStatusLabel lbIndex; + private System.Windows.Forms.Button btSave; + private System.Windows.Forms.DateTimePicker dtPdate; + private System.Windows.Forms.ComboBox cmbUser; + private System.Windows.Forms.TextBox tbWW; + private RichTextBoxEx.RichTextBoxEx richTextBoxEx1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.CheckBox checkBox1; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/Note/fNote_Add.cs b/SubProject/FPJ0000/Note/fNote_Add.cs new file mode 100644 index 0000000..15f5dda --- /dev/null +++ b/SubProject/FPJ0000/Note/fNote_Add.cs @@ -0,0 +1,172 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace FPJ0000.Note +{ + public partial class fNote_Add : Form + { + dsPRJ.EETGW_NoteRow dr; + Boolean copyMOde = false; + Boolean bInit = false; + public fNote_Add(dsPRJ.EETGW_NoteRow dr_, Boolean copy = false) + { + InitializeComponent(); + dr = dr_; + this.KeyPreview = true; + this.StartPosition = FormStartPosition.CenterScreen; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + + foreach (Control ctl in this.panel1.Controls) + { + if (ctl.GetType() == typeof(TextBox) || ctl.GetType() == typeof(ComboBox)) + { + ctl.KeyDown += ctl_KeyDown; + } + } + copyMOde = copy; + } + + + private void fJobReport_Add_Load(object sender, EventArgs e) + { + //사용자목록 + this.bs.DataSource = dr; + + //해당 사용자에 걸린 프로젝트 목록 가져오기 + var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK); + + + //담당자목록 + + var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); + this.cmbUser.DisplayMember = "dispName"; + this.cmbUser.ValueMember = "id"; + this.cmbUser.DataSource = dt_users; + if (FCOMMON.info.Login.level < 5) cmbUser.Enabled = false; + + // tbWW.Text = dr.ww; + dtPdate.Value = DateTime.Parse(dr.pdate); //일자선택 + cmbUser.SelectedValue = dr.uid; + checkBox1.Checked = dr.share; + + //편집모드인데. 내가 작성자가 아니면 공유를 설정하지 못하게한다 + if(dr.RowState == DataRowState.Unchanged || dr.RowState == DataRowState.Modified) + { + if (dr.uid != FCOMMON.info.Login.no) checkBox1.Enabled = false; + } + + + if (string.IsNullOrEmpty(dr.description2)) + { + this.richTextBoxEx1.Text = dr.description; + } + else + { + try + { + this.richTextBoxEx1.Rtf = dr.description2; + } + catch (Exception ex) + { + this.richTextBoxEx1.Text = dr.description; + } + } + + this.Show(); + Application.DoEvents(); + + this.richTextBoxEx1.Focus(); + + bInit = true; + } + // editform.editor ed; + void ctl_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + Control ctl = sender as Control; + string nm = ctl.Name.ToLower(); + string search = ctl.Text.Trim(); + + Console.WriteLine("inner keydown " + nm + ":" + search); + + switch (nm) + { + //case "cmbrequest": + + // //요청자가 마지막으로 입력한 자료의 process 를 찾아서 기입해준다. + // var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbUser.Text + "%'", "pdate desc"); + // if (lastprocess != "") cbProcess.Text = lastprocess; + // tbSID.Focus(); + // break; + case "tbdescription": + if (e.Control) + { + btSave.Focus(); + } + break; + + default: + SendKeys.Send("{TAB}"); + break; + } + } + } + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToShortDateString()); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + dtPdate.Value = f.dtSelect; + } + + private void button1_Click(object sender, EventArgs e) + { + this.Invalidate(); + + if (cmbUser.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다."); + cmbUser.Focus(); + return; + } + + + this.dr.uid = this.cmbUser.SelectedValue.ToString(); + this.dr.pdate = dtPdate.Value.ToShortDateString(); + this.dr.description = richTextBoxEx1.Text; + this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf; + this.dr.share = checkBox1.Checked; + this.dr.wuid = FCOMMON.info.Login.no; + this.dr.wdate = DateTime.Now; + this.bs.EndEdit(); + DialogResult = System.Windows.Forms.DialogResult.OK; + } + + + private void dtPdate_ValueChanged(object sender, EventArgs e) + { + var myCI = new System.Globalization.CultureInfo("ko-KR"); + var myCal = myCI.Calendar; + var myCWR = myCI.DateTimeFormat.CalendarWeekRule; + DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek; + var dat = myCal.GetWeekOfYear(dtPdate.Value, myCWR, myFirstDOW); + tbWW.Text = "ww" + dat.ToString(); + + } + + private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + } +} diff --git a/SubProject/FPJ0000/Note/fNote_Add.resx b/SubProject/FPJ0000/Note/fNote_Add.resx new file mode 100644 index 0000000..8deaa32 --- /dev/null +++ b/SubProject/FPJ0000/Note/fNote_Add.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + False + + + 100, 17 + + + 17, 17 + + + 17, 17 + + + 299, 17 + + + 164, 17 + + + 226, 17 + + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 015a59b..991eced 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -797,8 +797,6 @@ this.arLabel1.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel1.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel1.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel1.Enabled = false; - this.arLabel1.Enabled2 = true; this.arLabel1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel1.GradientEnable = true; @@ -810,6 +808,7 @@ this.arLabel1.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel1.msg = null; this.arLabel1.Name = "arLabel1"; + this.arLabel1.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel1.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel1.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel1.ProgressEnable = false; @@ -818,7 +817,6 @@ this.arLabel1.ProgressMax = 100F; this.arLabel1.ProgressMin = 0F; this.arLabel1.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel1.ProgressText = null; this.arLabel1.ProgressValue = 0F; this.arLabel1.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel1.Sign = ""; @@ -918,8 +916,6 @@ this.arLabel2.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel2.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel2.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel2.Enabled = false; - this.arLabel2.Enabled2 = true; this.arLabel2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel2.GradientEnable = true; @@ -931,6 +927,7 @@ this.arLabel2.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel2.msg = null; this.arLabel2.Name = "arLabel2"; + this.arLabel2.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel2.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel2.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel2.ProgressEnable = false; @@ -939,7 +936,6 @@ this.arLabel2.ProgressMax = 100F; this.arLabel2.ProgressMin = 0F; this.arLabel2.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel2.ProgressText = null; this.arLabel2.ProgressValue = 0F; this.arLabel2.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel2.Sign = ""; @@ -1001,8 +997,6 @@ this.arLabel3.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel3.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel3.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel3.Enabled = false; - this.arLabel3.Enabled2 = true; this.arLabel3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel3.GradientEnable = true; @@ -1014,6 +1008,7 @@ this.arLabel3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel3.msg = null; this.arLabel3.Name = "arLabel3"; + this.arLabel3.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel3.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel3.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel3.ProgressEnable = false; @@ -1022,7 +1017,6 @@ this.arLabel3.ProgressMax = 100F; this.arLabel3.ProgressMin = 0F; this.arLabel3.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel3.ProgressText = null; this.arLabel3.ProgressValue = 0F; this.arLabel3.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel3.Sign = ""; @@ -1108,8 +1102,6 @@ this.arLabel4.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel4.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel4.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel4.Enabled = false; - this.arLabel4.Enabled2 = true; this.arLabel4.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel4.GradientEnable = true; @@ -1121,6 +1113,7 @@ this.arLabel4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel4.msg = null; this.arLabel4.Name = "arLabel4"; + this.arLabel4.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel4.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel4.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel4.ProgressEnable = false; @@ -1129,7 +1122,6 @@ this.arLabel4.ProgressMax = 100F; this.arLabel4.ProgressMin = 0F; this.arLabel4.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel4.ProgressText = null; this.arLabel4.ProgressValue = 0F; this.arLabel4.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel4.Sign = ""; @@ -1171,8 +1163,6 @@ this.arLabel5.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel5.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel5.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel5.Enabled = false; - this.arLabel5.Enabled2 = true; this.arLabel5.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel5.GradientEnable = true; @@ -1184,6 +1174,7 @@ this.arLabel5.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel5.msg = null; this.arLabel5.Name = "arLabel5"; + this.arLabel5.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel5.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel5.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel5.ProgressEnable = false; @@ -1192,7 +1183,6 @@ this.arLabel5.ProgressMax = 100F; this.arLabel5.ProgressMin = 0F; this.arLabel5.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel5.ProgressText = null; this.arLabel5.ProgressValue = 0F; this.arLabel5.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel5.Sign = ""; @@ -1217,8 +1207,6 @@ this.arLabel6.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel6.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel6.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel6.Enabled = false; - this.arLabel6.Enabled2 = true; this.arLabel6.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel6.GradientEnable = true; @@ -1230,6 +1218,7 @@ this.arLabel6.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel6.msg = null; this.arLabel6.Name = "arLabel6"; + this.arLabel6.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel6.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel6.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel6.ProgressEnable = false; @@ -1238,7 +1227,6 @@ this.arLabel6.ProgressMax = 100F; this.arLabel6.ProgressMin = 0F; this.arLabel6.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel6.ProgressText = null; this.arLabel6.ProgressValue = 0F; this.arLabel6.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel6.Sign = ""; @@ -1449,8 +1437,6 @@ this.arLabel7.ColorTheme = arCtl.arLabel.eColorTheme.Custom; this.arLabel7.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel7.Dock = System.Windows.Forms.DockStyle.Top; - this.arLabel7.Enabled = false; - this.arLabel7.Enabled2 = true; this.arLabel7.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.arLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); this.arLabel7.GradientEnable = true; @@ -1462,6 +1448,7 @@ this.arLabel7.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.arLabel7.msg = null; this.arLabel7.Name = "arLabel7"; + this.arLabel7.ProgressBorderColor = System.Drawing.Color.Black; this.arLabel7.ProgressColor1 = System.Drawing.Color.LightSkyBlue; this.arLabel7.ProgressColor2 = System.Drawing.Color.DeepSkyBlue; this.arLabel7.ProgressEnable = false; @@ -1470,7 +1457,6 @@ this.arLabel7.ProgressMax = 100F; this.arLabel7.ProgressMin = 0F; this.arLabel7.ProgressPadding = new System.Windows.Forms.Padding(0); - this.arLabel7.ProgressText = null; this.arLabel7.ProgressValue = 0F; this.arLabel7.ShadowColor = System.Drawing.Color.WhiteSmoke; this.arLabel7.Sign = ""; @@ -1498,6 +1484,7 @@ this.tam.ProjectsPartTableAdapter = null; this.tam.ProjectsScheduleTableAdapter = null; this.tam.ProjectsTableAdapter = this.ta; + this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // bsSchedule diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 734151f..2d17046 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -151,7 +151,7 @@ namespace FPJ0000 if (state != "") State_where += " AND " + state; if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'"; if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(userprocess,'') = '" + cmbProcess.Text.Trim() + "'"; - string State_order = "ORDER BY (CASE " + + string State_order = " ORDER BY (CASE " + " WHEN ([status] = '진행') THEN '0' " + " WHEN ([status] = '검토') THEN '1' " + " WHEN ([status] = '대기') THEN '2' " + @@ -348,7 +348,7 @@ namespace FPJ0000 var drv = this.bs.Current as DataRowView; if (drv == null) return; var dr = drv.Row as dsPRJ.ProjectsRow; - var dlg = FCOMMON.Util.MsgQ("하위 데이터를 복사하시겠습니까?\n\n생성된 자료는 [대기] 상태로 전환 됩니다."); + var dlg = FCOMMON.Util.MsgQ("선택된 프로젝트를 복사하시겠습니까?\n\n생성된 자료는 [검토] 상태로 전환 됩니다."); if (dlg == System.Windows.Forms.DialogResult.Yes) { var ta = new dsPRJTableAdapters.QueriesTableAdapter(); diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 250d6ba..1a0281c 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -40,6 +40,8 @@ namespace FPJ0000 { private SPMasterDataTable tableSPMaster; + private EETGW_NoteDataTable tableEETGW_Note; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -96,6 +98,9 @@ namespace FPJ0000 { if ((ds.Tables["SPMaster"] != null)) { base.Tables.Add(new SPMasterDataTable(ds.Tables["SPMaster"])); } + if ((ds.Tables["EETGW_Note"] != null)) { + base.Tables.Add(new EETGW_NoteDataTable(ds.Tables["EETGW_Note"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -195,6 +200,16 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public EETGW_NoteDataTable EETGW_Note { + get { + return this.tableEETGW_Note; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -287,6 +302,9 @@ namespace FPJ0000 { if ((ds.Tables["SPMaster"] != null)) { base.Tables.Add(new SPMasterDataTable(ds.Tables["SPMaster"])); } + if ((ds.Tables["EETGW_Note"] != null)) { + base.Tables.Add(new EETGW_NoteDataTable(ds.Tables["EETGW_Note"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -368,6 +386,12 @@ namespace FPJ0000 { this.tableSPMaster.InitVars(); } } + this.tableEETGW_Note = ((EETGW_NoteDataTable)(base.Tables["EETGW_Note"])); + if ((initTable == true)) { + if ((this.tableEETGW_Note != null)) { + this.tableEETGW_Note.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -394,6 +418,8 @@ namespace FPJ0000 { base.Tables.Add(this.tableProjectsHistory); this.tableSPMaster = new SPMasterDataTable(); base.Tables.Add(this.tableSPMaster); + this.tableEETGW_Note = new EETGW_NoteDataTable(); + base.Tables.Add(this.tableEETGW_Note); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -444,6 +470,12 @@ namespace FPJ0000 { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + private bool ShouldSerializeEETGW_Note() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -529,6 +561,9 @@ namespace FPJ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public delegate void SPMasterRowChangeEventHandler(object sender, SPMasterRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public delegate void EETGW_NoteRowChangeEventHandler(object sender, EETGW_NoteRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -4807,6 +4842,389 @@ namespace FPJ0000 { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class EETGW_NoteDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnidx; + + private global::System.Data.DataColumn columngcode; + + private global::System.Data.DataColumn columnpdate; + + private global::System.Data.DataColumn columnuid; + + private global::System.Data.DataColumn columndescription; + + private global::System.Data.DataColumn columndescription2; + + private global::System.Data.DataColumn columnshare; + + private global::System.Data.DataColumn columnwuid; + + private global::System.Data.DataColumn columnwdate; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteDataTable() { + this.TableName = "EETGW_Note"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + internal EETGW_NoteDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected EETGW_NoteDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn idxColumn { + get { + return this.columnidx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn pdateColumn { + get { + return this.columnpdate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn uidColumn { + get { + return this.columnuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn descriptionColumn { + get { + return this.columndescription; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn description2Column { + get { + return this.columndescription2; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn shareColumn { + get { + return this.columnshare; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn wuidColumn { + get { + return this.columnwuid; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn wdateColumn { + get { + return this.columnwdate; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteRow this[int index] { + get { + return ((EETGW_NoteRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public event EETGW_NoteRowChangeEventHandler EETGW_NoteRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public event EETGW_NoteRowChangeEventHandler EETGW_NoteRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public event EETGW_NoteRowChangeEventHandler EETGW_NoteRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public event EETGW_NoteRowChangeEventHandler EETGW_NoteRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void AddEETGW_NoteRow(EETGW_NoteRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteRow AddEETGW_NoteRow(string gcode, string pdate, string uid, string description, string description2, bool share, string wuid, System.DateTime wdate) { + EETGW_NoteRow rowEETGW_NoteRow = ((EETGW_NoteRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + gcode, + pdate, + uid, + description, + description2, + share, + wuid, + wdate}; + rowEETGW_NoteRow.ItemArray = columnValuesArray; + this.Rows.Add(rowEETGW_NoteRow); + return rowEETGW_NoteRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteRow FindByidx(int idx) { + return ((EETGW_NoteRow)(this.Rows.Find(new object[] { + idx}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public override global::System.Data.DataTable Clone() { + EETGW_NoteDataTable cln = ((EETGW_NoteDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new EETGW_NoteDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + internal void InitVars() { + this.columnidx = base.Columns["idx"]; + this.columngcode = base.Columns["gcode"]; + this.columnpdate = base.Columns["pdate"]; + this.columnuid = base.Columns["uid"]; + this.columndescription = base.Columns["description"]; + this.columndescription2 = base.Columns["description2"]; + this.columnshare = base.Columns["share"]; + this.columnwuid = base.Columns["wuid"]; + this.columnwdate = base.Columns["wdate"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + private void InitClass() { + this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidx); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); + this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpdate); + this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuid); + this.columndescription = new global::System.Data.DataColumn("description", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndescription); + this.columndescription2 = new global::System.Data.DataColumn("description2", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndescription2); + this.columnshare = new global::System.Data.DataColumn("share", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnshare); + this.columnwuid = new global::System.Data.DataColumn("wuid", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwuid); + this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwdate); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnidx}, true)); + this.columnidx.AutoIncrement = true; + this.columnidx.AutoIncrementSeed = -1; + this.columnidx.AutoIncrementStep = -1; + this.columnidx.AllowDBNull = false; + this.columnidx.ReadOnly = true; + this.columnidx.Unique = true; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; + this.columnpdate.MaxLength = 10; + this.columnuid.MaxLength = 20; + this.columndescription.MaxLength = 2147483647; + this.columndescription2.MaxLength = 2147483647; + this.columnwuid.AllowDBNull = false; + this.columnwuid.MaxLength = 20; + this.columnwdate.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteRow NewEETGW_NoteRow() { + return ((EETGW_NoteRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new EETGW_NoteRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(EETGW_NoteRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.EETGW_NoteRowChanged != null)) { + this.EETGW_NoteRowChanged(this, new EETGW_NoteRowChangeEvent(((EETGW_NoteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.EETGW_NoteRowChanging != null)) { + this.EETGW_NoteRowChanging(this, new EETGW_NoteRowChangeEvent(((EETGW_NoteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.EETGW_NoteRowDeleted != null)) { + this.EETGW_NoteRowDeleted(this, new EETGW_NoteRowChangeEvent(((EETGW_NoteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.EETGW_NoteRowDeleting != null)) { + this.EETGW_NoteRowDeleting(this, new EETGW_NoteRowChangeEvent(((EETGW_NoteRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void RemoveEETGW_NoteRow(EETGW_NoteRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsPRJ ds = new dsPRJ(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "EETGW_NoteDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -8478,6 +8896,205 @@ namespace FPJ0000 { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class EETGW_NoteRow : global::System.Data.DataRow { + + private EETGW_NoteDataTable tableEETGW_Note; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + internal EETGW_NoteRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableEETGW_Note = ((EETGW_NoteDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int idx { + get { + return ((int)(this[this.tableEETGW_Note.idxColumn])); + } + set { + this[this.tableEETGW_Note.idxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tableEETGW_Note.gcodeColumn])); + } + set { + this[this.tableEETGW_Note.gcodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string pdate { + get { + if (this.IspdateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_Note.pdateColumn])); + } + } + set { + this[this.tableEETGW_Note.pdateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string uid { + get { + if (this.IsuidNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_Note.uidColumn])); + } + } + set { + this[this.tableEETGW_Note.uidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string description { + get { + if (this.IsdescriptionNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_Note.descriptionColumn])); + } + } + set { + this[this.tableEETGW_Note.descriptionColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string description2 { + get { + if (this.Isdescription2Null()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_Note.description2Column])); + } + } + set { + this[this.tableEETGW_Note.description2Column] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool share { + get { + if (this.IsshareNull()) { + return false; + } + else { + return ((bool)(this[this.tableEETGW_Note.shareColumn])); + } + } + set { + this[this.tableEETGW_Note.shareColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string wuid { + get { + return ((string)(this[this.tableEETGW_Note.wuidColumn])); + } + set { + this[this.tableEETGW_Note.wuidColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public System.DateTime wdate { + get { + return ((global::System.DateTime)(this[this.tableEETGW_Note.wdateColumn])); + } + set { + this[this.tableEETGW_Note.wdateColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IspdateNull() { + return this.IsNull(this.tableEETGW_Note.pdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetpdateNull() { + this[this.tableEETGW_Note.pdateColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsuidNull() { + return this.IsNull(this.tableEETGW_Note.uidColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetuidNull() { + this[this.tableEETGW_Note.uidColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsdescriptionNull() { + return this.IsNull(this.tableEETGW_Note.descriptionColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetdescriptionNull() { + this[this.tableEETGW_Note.descriptionColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool Isdescription2Null() { + return this.IsNull(this.tableEETGW_Note.description2Column); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void Setdescription2Null() { + this[this.tableEETGW_Note.description2Column] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsshareNull() { + return this.IsNull(this.tableEETGW_Note.shareColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetshareNull() { + this[this.tableEETGW_Note.shareColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -8749,6 +9366,40 @@ namespace FPJ0000 { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public class EETGW_NoteRowChangeEvent : global::System.EventArgs { + + private EETGW_NoteRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteRowChangeEvent(EETGW_NoteRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace FPJ0000.dsPRJTableAdapters { @@ -14950,6 +15601,566 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class EETGW_NoteTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public EETGW_NoteTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "EETGW_Note"; + tableMapping.ColumnMappings.Add("idx", "idx"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("pdate", "pdate"); + tableMapping.ColumnMappings.Add("uid", "uid"); + tableMapping.ColumnMappings.Add("description", "description"); + tableMapping.ColumnMappings.Add("description2", "description2"); + tableMapping.ColumnMappings.Add("share", "share"); + tableMapping.ColumnMappings.Add("wuid", "wuid"); + tableMapping.ColumnMappings.Add("wdate", "wdate"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_Note] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_share = 1 AND [share] IS NULL) OR ([share] = @Original_share)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_share", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "share", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_share", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "share", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.InsertCommand.Connection = this.Connection; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_Note] ([gcode], [pdate], [uid], [description], [description2], [share], [wuid], [wdate]) VALUES (@gcode, @pdate, @uid, @description, @description2, @share, @wuid, @wdate); +SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FROM EETGW_Note WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@share", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "share", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_Note] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [description] = @description, [description2] = @description2, [share] = @share, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_share = 1 AND [share] IS NULL) OR ([share] = @Original_share)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); +SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FROM EETGW_Note WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@share", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "share", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_share", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "share", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_share", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "share", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::FPJ0000.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate +FROM EETGW_Note +WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @ed) OR + (gcode = @gcode) AND (uid = @uid) AND (pdate BETWEEN @sd AND @ed)"; + 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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(dsPRJ.EETGW_NoteDataTable dataTable, string gcode, string sd, string ed, string uid) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); + } + if ((uid == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual dsPRJ.EETGW_NoteDataTable GetData(string gcode, string sd, string ed, string uid) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((sd == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd)); + } + if ((ed == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed)); + } + if ((uid == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid)); + } + dsPRJ.EETGW_NoteDataTable dataTable = new dsPRJ.EETGW_NoteDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsPRJ.EETGW_NoteDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsPRJ dataSet) { + return this.Adapter.Update(dataSet, "EETGW_Note"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] + public virtual int Delete(int Original_idx, string Original_gcode, string Original_pdate, string Original_uid, global::System.Nullable Original_share, string Original_wuid, System.DateTime Original_wdate) { + this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_gcode)); + } + if ((Original_pdate == null)) { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_pdate)); + } + if ((Original_uid == null)) { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[5].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[4].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[5].Value = ((string)(Original_uid)); + } + if ((Original_share.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[7].Value = ((bool)(Original_share.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[6].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[7].Value = global::System.DBNull.Value; + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_wuid)); + } + this.Adapter.DeleteCommand.Parameters[9].Value = ((System.DateTime)(Original_wdate)); + global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; + if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + this.Adapter.DeleteCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.DeleteCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] + public virtual int Insert(string gcode, string pdate, string uid, string description, string description2, global::System.Nullable share, string wuid, System.DateTime wdate) { + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.InsertCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((pdate == null)) { + this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[1].Value = ((string)(pdate)); + } + if ((uid == null)) { + this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(uid)); + } + if ((description == null)) { + this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(description)); + } + if ((description2 == null)) { + this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(description2)); + } + if ((share.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(share.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + this.Adapter.InsertCommand.Parameters[6].Value = ((string)(wuid)); + } + this.Adapter.InsertCommand.Parameters[7].Value = ((System.DateTime)(wdate)); + global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; + if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + this.Adapter.InsertCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.InsertCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] + public virtual int Update( + string gcode, + string pdate, + string uid, + string description, + string description2, + global::System.Nullable share, + string wuid, + System.DateTime wdate, + int Original_idx, + string Original_gcode, + string Original_pdate, + string Original_uid, + global::System.Nullable Original_share, + string Original_wuid, + System.DateTime Original_wdate, + int idx) { + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(gcode)); + } + if ((pdate == null)) { + this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(pdate)); + } + if ((uid == null)) { + this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(uid)); + } + if ((description == null)) { + this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(description)); + } + if ((description2 == null)) { + this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(description2)); + } + if ((share.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(share.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((wuid == null)) { + throw new global::System.ArgumentNullException("wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(wuid)); + } + this.Adapter.UpdateCommand.Parameters[7].Value = ((System.DateTime)(wdate)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx)); + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_gcode)); + } + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_pdate)); + } + if ((Original_uid == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_uid)); + } + if ((Original_share.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((bool)(Original_share.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + } + if ((Original_wuid == null)) { + throw new global::System.ArgumentNullException("Original_wuid"); + } + else { + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_wuid)); + } + this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(idx)); + global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; + if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + this.Adapter.UpdateCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.UpdateCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] + public virtual int Update(string gcode, string pdate, string uid, string description, string description2, global::System.Nullable share, string wuid, System.DateTime wdate, int Original_idx, string Original_gcode, string Original_pdate, string Original_uid, global::System.Nullable Original_share, string Original_wuid, System.DateTime Original_wdate) { + return this.Update(gcode, pdate, uid, description, description2, share, wuid, wdate, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_share, Original_wuid, Original_wdate, Original_idx); + } + } + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -15064,6 +16275,8 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; private SPMasterTableAdapter _sPMasterTableAdapter; + private EETGW_NoteTableAdapter _eETGW_NoteTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -15191,6 +16404,20 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public EETGW_NoteTableAdapter EETGW_NoteTableAdapter { + get { + return this._eETGW_NoteTableAdapter; + } + set { + this._eETGW_NoteTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -15242,6 +16469,10 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; && (this._sPMasterTableAdapter.Connection != null))) { return this._sPMasterTableAdapter.Connection; } + if (((this._eETGW_NoteTableAdapter != null) + && (this._eETGW_NoteTableAdapter.Connection != null))) { + return this._eETGW_NoteTableAdapter.Connection; + } return null; } set { @@ -15279,6 +16510,9 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; if ((this._sPMasterTableAdapter != null)) { count = (count + 1); } + if ((this._eETGW_NoteTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -15362,6 +16596,15 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; allChangedRows.AddRange(updatedRows); } } + if ((this._eETGW_NoteTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.EETGW_Note.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._eETGW_NoteTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -15436,6 +16679,14 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; allAddedRows.AddRange(addedRows); } } + if ((this._eETGW_NoteTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.EETGW_Note.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._eETGW_NoteTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -15446,6 +16697,14 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private int UpdateDeletedRows(dsPRJ dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; + if ((this._eETGW_NoteTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.EETGW_Note.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._eETGW_NoteTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._sPMasterTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.SPMaster.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -15581,6 +16840,10 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; && (this.MatchTableAdapterConnection(this._sPMasterTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); } + if (((this._eETGW_NoteTableAdapter != null) + && (this.MatchTableAdapterConnection(this._eETGW_NoteTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager에 연결 정보가 없습니다. 각 TableAdapterManager TableAdapter 속성을 올바른 Tabl" + @@ -15684,6 +16947,15 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; adaptersWithAcceptChangesDuringUpdate.Add(this._sPMasterTableAdapter.Adapter); } } + if ((this._eETGW_NoteTableAdapter != null)) { + revertConnections.Add(this._eETGW_NoteTableAdapter, this._eETGW_NoteTableAdapter.Connection); + this._eETGW_NoteTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._eETGW_NoteTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._eETGW_NoteTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._eETGW_NoteTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._eETGW_NoteTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -15774,6 +17046,10 @@ ORDER BY EnrDate DESC, SIDNo DESC, PartName, PartNo"; this._sPMasterTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._sPMasterTableAdapter])); this._sPMasterTableAdapter.Transaction = null; } + if ((this._eETGW_NoteTableAdapter != null)) { + this._eETGW_NoteTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._eETGW_NoteTableAdapter])); + this._eETGW_NoteTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 6144bf2..fd16b1d 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1172,6 +1172,98 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, + + + + + + DELETE FROM [EETGW_Note] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_share = 1 AND [share] IS NULL) OR ([share] = @Original_share)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + + + + + + + + + + + + + + + + + INSERT INTO [EETGW_Note] ([gcode], [pdate], [uid], [description], [description2], [share], [wuid], [wdate]) VALUES (@gcode, @pdate, @uid, @description, @description2, @share, @wuid, @wdate); +SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FROM EETGW_Note WHERE (idx = SCOPE_IDENTITY()) + + + + + + + + + + + + + + + SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate +FROM EETGW_Note +WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @ed) OR + (gcode = @gcode) AND (uid = @uid) AND (pdate BETWEEN @sd AND @ed) + + + + + + + + + + + UPDATE [EETGW_Note] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [description] = @description, [description2] = @description2, [share] = @share, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_share = 1 AND [share] IS NULL) OR ([share] = @Original_share)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); +SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FROM EETGW_Note WHERE (idx = @idx) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1894,6 +1986,57 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1928,5 +2071,9 @@ SELECT ID, CtrlNo, SIDNo, Storage, Location, UseEqmt, PartName, PartNo, Process, + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 60452d4..48cccdc 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,17 +4,18 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - + + + + + + + + + + \ No newline at end of file