diff --git a/DLL/YARTE.dll b/DLL/YARTE.dll new file mode 100644 index 0000000..5c514cc Binary files /dev/null and b/DLL/YARTE.dll differ diff --git a/EETGW.sln b/EETGW.sln index b75f55d..9c8db93 100644 --- a/EETGW.sln +++ b/EETGW.sln @@ -21,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{6C7E EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FBS0000", "SubProject\FBS0000\FBS0000.csproj", "{F6F515C6-6628-47C4-8A94-683BDF9FBB9C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "Sub\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FTPClass", "Sub\arftp\FTPClass.csproj", "{150859D3-1C5D-4E20-B324-F9EBE188D893}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FPM0000", "SubProject\FPM0000\FPM0000.csproj", "{D01A7891-AD0B-489B-8C45-F598C875FE26}" @@ -48,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "솔루션 항목", "솔루 MemoryMap.cs = MemoryMap.cs EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "Sub\YARTE\YARTE\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -100,12 +100,6 @@ Global {F6F515C6-6628-47C4-8A94-683BDF9FBB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F6F515C6-6628-47C4-8A94-683BDF9FBB9C}.Release|Any CPU.Build.0 = Release|Any CPU {F6F515C6-6628-47C4-8A94-683BDF9FBB9C}.Release|x86.ActiveCfg = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.Build.0 = Release|Any CPU - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|x86.ActiveCfg = Release|Any CPU {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|Any CPU.Build.0 = Debug|Any CPU {150859D3-1C5D-4E20-B324-F9EBE188D893}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -184,6 +178,14 @@ Global {3869B8C1-1290-4864-B72D-D771475F914D}.Release|Any CPU.Build.0 = Release|Any CPU {3869B8C1-1290-4864-B72D-D771475F914D}.Release|x86.ActiveCfg = Release|Any CPU {3869B8C1-1290-4864-B72D-D771475F914D}.Release|x86.Build.0 = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|x86.ActiveCfg = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|x86.Build.0 = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.Build.0 = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|x86.ActiveCfg = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -195,7 +197,6 @@ Global {74836A5F-CB5B-449F-9210-99C9D1A23B97} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {26982882-C1FF-45F8-861C-D67558725FF1} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {F6F515C6-6628-47C4-8A94-683BDF9FBB9C} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} - {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE} = {28105E67-9D33-4627-8E26-FCE67700622F} {150859D3-1C5D-4E20-B324-F9EBE188D893} = {28105E67-9D33-4627-8E26-FCE67700622F} {D01A7891-AD0B-489B-8C45-F598C875FE26} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {F31C242C-1B15-4518-9733-48558499FE4B} = {28105E67-9D33-4627-8E26-FCE67700622F} @@ -205,6 +206,7 @@ Global {55EF08A8-6E94-4569-8371-7AAC9DE916AB} = {28105E67-9D33-4627-8E26-FCE67700622F} {CAFE5CD0-C055-4C77-9253-8D5EE9558D43} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} {3869B8C1-1290-4864-B72D-D771475F914D} = {6C7EC99E-7367-4255-A039-EF5E8D75A2F6} + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE} = {28105E67-9D33-4627-8E26-FCE67700622F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d79cfad..348e542 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("24.01.01.2230")] -[assembly: AssemblyFileVersion("24.01.01.2230")] +[assembly: AssemblyVersion("24.01.09.1400")] +[assembly: AssemblyFileVersion("24.01.09.1400")] diff --git a/Sub/YARTE/LICENSE b/Sub/YARTE/LICENSE new file mode 100644 index 0000000..8dada3e --- /dev/null +++ b/Sub/YARTE/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Sub/YARTE/README.md b/Sub/YARTE/README.md new file mode 100644 index 0000000..515cdf5 --- /dev/null +++ b/Sub/YARTE/README.md @@ -0,0 +1,2 @@ +# YARTE +YARTE (Yet Another Rich Text Editor) is an HTML-based rich text editor for WinForms. The original project is located at http://yarte.codeplex.com/. diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.Designer.cs new file mode 100644 index 0000000..05668ec --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.Designer.cs @@ -0,0 +1,87 @@ +namespace YARTE.Example +{ + partial class AddTaskDialog + { + /// + /// 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.btnCancel = new System.Windows.Forms.Button(); + this.btnAdd = new System.Windows.Forms.Button(); + this.txtInput = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(244, 75); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.TabIndex = 2; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnAdd + // + this.btnAdd.Location = new System.Drawing.Point(325, 75); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Size = new System.Drawing.Size(75, 23); + this.btnAdd.TabIndex = 1; + this.btnAdd.Text = "Add"; + this.btnAdd.UseVisualStyleBackColor = true; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // txtInput + // + this.txtInput.Location = new System.Drawing.Point(12, 30); + this.txtInput.Name = "txtInput"; + this.txtInput.Size = new System.Drawing.Size(388, 22); + this.txtInput.TabIndex = 0; + // + // AddTaskDialog + // + this.AcceptButton = this.btnAdd; + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnCancel; + this.ClientSize = new System.Drawing.Size(412, 110); + this.Controls.Add(this.txtInput); + this.Controls.Add(this.btnAdd); + this.Controls.Add(this.btnCancel); + this.Name = "AddTaskDialog"; + this.Text = "AddTaskDialog"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnAdd; + private System.Windows.Forms.TextBox txtInput; + } +} \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.cs new file mode 100644 index 0000000..18b9ad7 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.cs @@ -0,0 +1,33 @@ +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 YARTE.Example +{ + public partial class AddTaskDialog : Form + { + private Form1 frmParent; + + public AddTaskDialog(Form1 parent) + { + InitializeComponent(); + frmParent = parent; + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnAdd_Click(object sender, EventArgs e) + { + frmParent.AddTask(txtInput.Text); + txtInput.Clear(); + } + } +} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.resx b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/AddTaskDialog.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.Designer.cs new file mode 100644 index 0000000..32fece3 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.Designer.cs @@ -0,0 +1,128 @@ +namespace YARTE.Example +{ + partial class Form1 + { + /// + /// 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.btnDispHTML = new System.Windows.Forms.Button(); + this.btnAddTodo = new System.Windows.Forms.Button(); + this.btnDispTasks = new System.Windows.Forms.Button(); + this.btnChangeChecked = new System.Windows.Forms.Button(); + this.htmlEditor1 = new YARTE.UI.HtmlEditor(); + this.btnGetTasks = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnDispHTML + // + this.btnDispHTML.Location = new System.Drawing.Point(599, 398); + this.btnDispHTML.Name = "btnDispHTML"; + this.btnDispHTML.Size = new System.Drawing.Size(94, 23); + this.btnDispHTML.TabIndex = 1; + this.btnDispHTML.Text = "Disp HTML"; + this.btnDispHTML.UseVisualStyleBackColor = true; + this.btnDispHTML.Click += new System.EventHandler(this.btnDispHTML_Click); + // + // btnAddTodo + // + this.btnAddTodo.Location = new System.Drawing.Point(503, 398); + this.btnAddTodo.Name = "btnAddTodo"; + this.btnAddTodo.Size = new System.Drawing.Size(90, 23); + this.btnAddTodo.TabIndex = 2; + this.btnAddTodo.Text = "Add Todo"; + this.btnAddTodo.UseVisualStyleBackColor = true; + this.btnAddTodo.Click += new System.EventHandler(this.btnAddTodo_Click); + // + // btnDispTasks + // + this.btnDispTasks.Location = new System.Drawing.Point(407, 398); + this.btnDispTasks.Name = "btnDispTasks"; + this.btnDispTasks.Size = new System.Drawing.Size(90, 23); + this.btnDispTasks.TabIndex = 3; + this.btnDispTasks.Text = "Disp Tasks"; + this.btnDispTasks.UseVisualStyleBackColor = true; + this.btnDispTasks.Click += new System.EventHandler(this.btnDispTasks_Click); + // + // btnChangeChecked + // + this.btnChangeChecked.Location = new System.Drawing.Point(311, 398); + this.btnChangeChecked.Name = "btnChangeChecked"; + this.btnChangeChecked.Size = new System.Drawing.Size(90, 23); + this.btnChangeChecked.TabIndex = 4; + this.btnChangeChecked.Text = "Checked"; + this.btnChangeChecked.UseVisualStyleBackColor = true; + this.btnChangeChecked.Click += new System.EventHandler(this.btnChangeChecked_Click); + // + // htmlEditor1 + // + this.htmlEditor1.Dock = System.Windows.Forms.DockStyle.Top; + this.htmlEditor1.Html = null; + this.htmlEditor1.Location = new System.Drawing.Point(0, 0); + this.htmlEditor1.Margin = new System.Windows.Forms.Padding(4); + this.htmlEditor1.Name = "htmlEditor1"; + this.htmlEditor1.ReadOnly = false; + this.htmlEditor1.ShowToolbar = true; + this.htmlEditor1.Size = new System.Drawing.Size(723, 395); + this.htmlEditor1.TabIndex = 0; + // + // btnGetTasks + // + this.btnGetTasks.Location = new System.Drawing.Point(215, 398); + this.btnGetTasks.Name = "btnGetTasks"; + this.btnGetTasks.Size = new System.Drawing.Size(90, 23); + this.btnGetTasks.TabIndex = 5; + this.btnGetTasks.Text = "Get Tasks"; + this.btnGetTasks.UseVisualStyleBackColor = true; + this.btnGetTasks.Click += new System.EventHandler(this.btnGetTasks_Click); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(723, 433); + this.Controls.Add(this.btnGetTasks); + this.Controls.Add(this.btnChangeChecked); + this.Controls.Add(this.btnDispTasks); + this.Controls.Add(this.btnAddTodo); + this.Controls.Add(this.btnDispHTML); + this.Controls.Add(this.htmlEditor1); + this.Name = "Form1"; + this.Text = "Form1"; + this.ResumeLayout(false); + + } + + #endregion + + private UI.HtmlEditor htmlEditor1; + private System.Windows.Forms.Button btnDispHTML; + private System.Windows.Forms.Button btnAddTodo; + private System.Windows.Forms.Button btnDispTasks; + private System.Windows.Forms.Button btnChangeChecked; + private System.Windows.Forms.Button btnGetTasks; + } +} + diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.cs new file mode 100644 index 0000000..5b01cfe --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.cs @@ -0,0 +1,95 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using YARTE.UI.Buttons; +using System; + +namespace YARTE.Example +{ + public partial class Form1 : Form + { + //private List tasks = new List(); + private Dictionary tasks = new Dictionary(); + + public Form1() + { + InitializeComponent(); + + PredefinedButtonSets.SetupDefaultButtons(this.htmlEditor1); + } + + private void btnDispHTML_Click(object sender, System.EventArgs e) + { + MessageBox.Show(this.htmlEditor1.Html, "The output HTML"); + } + + private void btnAddTodo_Click(object sender, System.EventArgs e) + { + AddTaskDialog atd = new AddTaskDialog(this); + atd.ShowDialog(); + } + + public void AddTask(string label) + { + string id = htmlEditor1.insertCheckbox(label); + tasks.Add(id, new CheckboxItem(label, id)); + //htmlEditor1.InsertTextAtCursor(task.Identifier); + } + + private void btnDispTasks_Click(object sender, EventArgs e) + { + // display all unchecked s + string output = ""; + foreach (var item in htmlEditor1.getCheckedStates()) + { + if (item.Value) + { + output += item.Key + "\n"; + } + } + MessageBox.Show(output, "Checked Tasks"); + + // update and display the s in tasks + output = ""; + foreach (var item in htmlEditor1.getCheckedStates()) + { + CheckboxItem temp; + tasks.TryGetValue(item.Key, out temp); + temp.Checked = item.Value; + tasks.TryGetValue(item.Key, out temp); // redefine temp to ensure Dictionary contains up-to-date refs + output += temp.Label + " " + temp.Checked + "\n"; + } + MessageBox.Show(output, "Checked Tasks"); + } + + private void btnChangeChecked_Click(object sender, EventArgs e) + { + // changes an arbitrary task's checked state + Random rand = new Random(); + int temp = rand.Next(0, tasks.Count); + CheckboxItem[] items = new CheckboxItem[10]; + CheckboxItem selected; + tasks.Values.CopyTo(items,0); + Console.WriteLine(temp); + + // get a checkbox item from a known identifier + tasks.TryGetValue(items[temp].Identifier, out selected); + selected.Checked = !selected.Checked; // local dictionary is up-to-date + htmlEditor1.updateCheckedState(selected.Identifier, selected.Checked); // update editor + } + + private void btnGetTasks_Click(object sender, EventArgs e) + { + // update the tasks dictionary using the method that returns a + // dictionary of all ID'd checkboxes. Display labels and + // checked states. + tasks = htmlEditor1.getCheckboxes(); + string output = ""; + foreach (var item in tasks) + { + output += item.Value.Label + " " + item.Value.Checked + "\n"; + } + + MessageBox.Show(output, "The current task states"); + } + } +} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.resx b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Program.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Program.cs new file mode 100644 index 0000000..6e6846b --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Program.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; + +namespace YARTE.Example +{ + static class Program + { + /// + /// The main entry point for the application. + /// + [STAThread] + static void Main() + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/AssemblyInfo.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..af6df89 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("YARTE.Example")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("YARTE.Example")] +[assembly: AssemblyCopyright("Copyright © 2010")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("07c96ba0-29d1-41fd-9643-40fc4078dd5c")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.Designer.cs new file mode 100644 index 0000000..62855c2 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.1 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace YARTE.Example.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("YARTE.Example.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.resx b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.Designer.cs b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.Designer.cs new file mode 100644 index 0000000..73e6184 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.1 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace YARTE.Example.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.settings b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.settings new file mode 100644 index 0000000..3964565 --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Sub/YARTE/YARTE.Example/YARTE.Example/YARTE.Example.csproj b/Sub/YARTE/YARTE.Example/YARTE.Example/YARTE.Example.csproj new file mode 100644 index 0000000..46a6cdf --- /dev/null +++ b/Sub/YARTE/YARTE.Example/YARTE.Example/YARTE.Example.csproj @@ -0,0 +1,100 @@ + + + + Debug + x86 + 8.0.30703 + 2.0 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81} + WinExe + Properties + YARTE.Example + YARTE.Example + v4.0 + Client + 512 + + + x86 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + False + ..\..\YARTE\YARTE\bin\Debug\YARTE.dll + + + + + Form + + + AddTaskDialog.cs + + + Form + + + Form1.cs + + + + + AddTaskDialog.cs + + + Form1.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + \ No newline at end of file diff --git a/Sub/YARTE/YARTE.sln b/Sub/YARTE/YARTE.sln new file mode 100644 index 0000000..ea9053c --- /dev/null +++ b/Sub/YARTE/YARTE.sln @@ -0,0 +1,42 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE", "YARTE\YARTE\YARTE.csproj", "{DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YARTE.Example", "YARTE.Example\YARTE.Example\YARTE.Example.csproj", "{EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Debug|x86.ActiveCfg = Debug|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Any CPU.Build.0 = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DB5EE9C8-EACF-4231-877E-B9DFD7A714DE}.Release|x86.ActiveCfg = Release|Any CPU + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|Any CPU.ActiveCfg = Debug|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|x86.ActiveCfg = Debug|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Debug|x86.Build.0 = Debug|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|Any CPU.ActiveCfg = Release|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|Mixed Platforms.Build.0 = Release|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|x86.ActiveCfg = Release|x86 + {EA03531C-F6BA-4EFC-AD06-ECA7E249AE81}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Sub/YARTE/Buttons/BoldButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/BoldButton.cs similarity index 86% rename from Sub/YARTE/Buttons/BoldButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/BoldButton.cs index 5cf7dfa..a9406fa 100644 --- a/Sub/YARTE/Buttons/BoldButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/BoldButton.cs @@ -1,36 +1,36 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class BoldButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("Bold", false, null); - } - - public Image IconImage - { - get - { - return Resources.bold; - } - } - - public string IconName - { - get { return "Bold"; } - } - - public string IconTooltip - { - get { return "Bold"; } - } - - public string CommandIdentifier - { - get { return "Bold"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class BoldButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("Bold", false, null); + } + + public Image IconImage + { + get + { + return Resources.bold; + } + } + + public string IconName + { + get { return "Bold"; } + } + + public string IconTooltip + { + get { return "Bold"; } + } + + public string CommandIdentifier + { + get { return "Bold"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/CheckboxButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/CheckboxButton.cs new file mode 100644 index 0000000..60c05a7 --- /dev/null +++ b/Sub/YARTE/YARTE/YARTE/Buttons/CheckboxButton.cs @@ -0,0 +1,37 @@ +using System.Drawing; +using YARTE.Properties; +using System; + +namespace YARTE.UI.Buttons +{ + public class CheckboxButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Editor.insertCheckbox(); + } + + public Image IconImage + { + get + { + return Resources.insertcheckbox; + } + } + + public string IconName + { + get { return "Insert Checkbox"; } + } + + public string IconTooltip + { + get { return "Insert Checkbox"; } + } + + public string CommandIdentifier + { + get { return ""; } + } + } +} diff --git a/Sub/YARTE/Buttons/ForecolorButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/ForecolorButton.cs similarity index 90% rename from Sub/YARTE/Buttons/ForecolorButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/ForecolorButton.cs index 3de26e5..2304806 100644 --- a/Sub/YARTE/Buttons/ForecolorButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/ForecolorButton.cs @@ -1,41 +1,41 @@ -using System.Drawing; -using System.Windows.Forms; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class ForecolorButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - var colorPicker = new ColorDialog(); - var result = colorPicker.ShowDialog(); - if(result == DialogResult.OK) - { - var color = colorPicker.Color; - var hexcolor = ColorTranslator.ToHtml(color); - args.Document.ExecCommand("ForeColor", false, hexcolor); - } - } - - public Image IconImage - { - get { return Resources.fontforecolorpicker; } - } - - public string IconName - { - get { return "Color"; } - } - - public string IconTooltip - { - get { return "Color"; } - } - - public string CommandIdentifier - { - get { return "ForeColor"; } - } - } +using System.Drawing; +using System.Windows.Forms; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class ForecolorButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + var colorPicker = new ColorDialog(); + var result = colorPicker.ShowDialog(); + if(result == DialogResult.OK) + { + var color = colorPicker.Color; + var hexcolor = ColorTranslator.ToHtml(color); + args.Document.ExecCommand("ForeColor", false, hexcolor); + } + } + + public Image IconImage + { + get { return Resources.fontforecolorpicker; } + } + + public string IconName + { + get { return "Color"; } + } + + public string IconTooltip + { + get { return "Color"; } + } + + public string CommandIdentifier + { + get { return "ForeColor"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/IButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/IButton.cs new file mode 100644 index 0000000..ceb3ad3 --- /dev/null +++ b/Sub/YARTE/YARTE/YARTE/Buttons/IButton.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; +using System.Windows.Forms; + +namespace YARTE.UI.Buttons +{ + public struct ButtonArgs + { + public HtmlDocument Document; + public HtmlEditor Editor; + } + + public interface IButton + { + string IconName { get; } + string IconTooltip { get; } + } +} diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/IFunctionButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/IFunctionButton.cs new file mode 100644 index 0000000..1fbbfbe --- /dev/null +++ b/Sub/YARTE/YARTE/YARTE/Buttons/IFunctionButton.cs @@ -0,0 +1,12 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace YARTE.UI.Buttons +{ + + public interface IFunctionButton : IButton + { + void IconClicked(ButtonArgs doc, ToolStripButton btn); + string Label { get; set; } + } +} diff --git a/Sub/YARTE/Buttons/IHTMLEditorButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/IHTMLEditorButton.cs similarity index 61% rename from Sub/YARTE/Buttons/IHTMLEditorButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/IHTMLEditorButton.cs index f6906b5..342b2e2 100644 --- a/Sub/YARTE/Buttons/IHTMLEditorButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/IHTMLEditorButton.cs @@ -1,26 +1,18 @@ -using System.Drawing; -using System.Windows.Forms; - -namespace YARTE.UI.Buttons -{ - public struct HTMLEditorButtonArgs - { - public HtmlDocument Document; - public HtmlEditor Editor; - } - - public interface IHTMLEditorButton - { - void IconClicked(HTMLEditorButtonArgs doc); - Image IconImage { get; } - string IconName { get; } - string IconTooltip { get; } - - /// - /// This is the string that will be used to poll the text area to determine if the cursor - /// is in a given area (say, 'Bold') and show the corresponding button as selected - /// Leave blank if there is no command or you have no idea what to put here - /// - string CommandIdentifier { get; } - } +using System.Drawing; +using System.Windows.Forms; + +namespace YARTE.UI.Buttons +{ + public interface IHTMLEditorButton : IButton + { + void IconClicked(ButtonArgs doc); + Image IconImage { get; } + + /// + /// This is the string that will be used to poll the text area to determine if the cursor + /// is in a given area (say, 'Bold') and show the corresponding button as selected + /// Leave blank if there is no command or you have no idea what to put here + /// + string CommandIdentifier { get; } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/InsertLinkedImageButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/InsertLinkedImageButton.cs similarity index 90% rename from Sub/YARTE/Buttons/InsertLinkedImageButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/InsertLinkedImageButton.cs index 07371da..ba965d2 100644 --- a/Sub/YARTE/Buttons/InsertLinkedImageButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/InsertLinkedImageButton.cs @@ -1,41 +1,41 @@ -using System.Drawing; -using Microsoft.VisualBasic; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class InsertLinkedImageButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - var x = args.Editor.Location.X + 10; - var y = args.Editor.Location.Y + 10; - - var url = Interaction.InputBox("Please enter an image url", "URL", null, x, y); - if (!string.IsNullOrEmpty(url)) - { - args.Document.ExecCommand("InsertImage", false, url); - } - } - - public Image IconImage - { - get { return Resources.insertimage; } - } - - public string IconName - { - get { return "Linked image"; } - } - - public string IconTooltip - { - get { return "Linked image"; } - } - - public string CommandIdentifier - { - get { return "InsertImage"; } - } - } +using System.Drawing; +using Microsoft.VisualBasic; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class InsertLinkedImageButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + var x = args.Editor.Location.X + 10; + var y = args.Editor.Location.Y + 10; + + var url = Interaction.InputBox("Please enter an image url", "URL", null, x, y); + if (!string.IsNullOrEmpty(url)) + { + args.Document.ExecCommand("InsertImage", false, url); + } + } + + public Image IconImage + { + get { return Resources.insertimage; } + } + + public string IconName + { + get { return "Linked image"; } + } + + public string IconTooltip + { + get { return "Linked image"; } + } + + public string CommandIdentifier + { + get { return "InsertImage"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/ItalicButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/ItalicButton.cs similarity index 87% rename from Sub/YARTE/Buttons/ItalicButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/ItalicButton.cs index ae0b180..dceb705 100644 --- a/Sub/YARTE/Buttons/ItalicButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/ItalicButton.cs @@ -1,35 +1,35 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class ItalicButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("Italic", false, null); - } - - public Image IconImage - { - get { return Resources.italic; } - } - - public string IconName - { - get { return "Italic"; } - } - - public string IconTooltip - { - get { return "Italic"; } - } - - public string CommandIdentifier - { - get { return "Italic"; } - } - } +using System; +using System.Drawing; +using System.Windows.Forms; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class ItalicButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("Italic", false, null); + } + + public Image IconImage + { + get { return Resources.italic; } + } + + public string IconName + { + get { return "Italic"; } + } + + public string IconTooltip + { + get { return "Italic"; } + } + + public string CommandIdentifier + { + get { return "Italic"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/JustifyCenterButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/JustifyCenterButton.cs similarity index 87% rename from Sub/YARTE/Buttons/JustifyCenterButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/JustifyCenterButton.cs index e3c4c5c..215aca3 100644 --- a/Sub/YARTE/Buttons/JustifyCenterButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/JustifyCenterButton.cs @@ -1,33 +1,33 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class JustifyCenterButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand(CommandIdentifier, false, null); - } - - public Image IconImage - { - get { return Resources.justifycenter; } - } - - public string IconName - { - get { return "Justify center"; } - } - - public string IconTooltip - { - get { return "Justify center"; } - } - - public string CommandIdentifier - { - get { return "JustifyCenter"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class JustifyCenterButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand(CommandIdentifier, false, null); + } + + public Image IconImage + { + get { return Resources.justifycenter; } + } + + public string IconName + { + get { return "Justify center"; } + } + + public string IconTooltip + { + get { return "Justify center"; } + } + + public string CommandIdentifier + { + get { return "JustifyCenter"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/JustifyLeftButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/JustifyLeftButton.cs similarity index 87% rename from Sub/YARTE/Buttons/JustifyLeftButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/JustifyLeftButton.cs index 7accc0c..4330295 100644 --- a/Sub/YARTE/Buttons/JustifyLeftButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/JustifyLeftButton.cs @@ -1,33 +1,33 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class JustifyLeftButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand(CommandIdentifier, false, null); - } - - public Image IconImage - { - get { return Resources.justifyleft; } - } - - public string IconName - { - get { return "Justify left"; } - } - - public string IconTooltip - { - get { return "Justify left"; } - } - - public string CommandIdentifier - { - get { return "JustifyLeft"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class JustifyLeftButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand(CommandIdentifier, false, null); + } + + public Image IconImage + { + get { return Resources.justifyleft; } + } + + public string IconName + { + get { return "Justify left"; } + } + + public string IconTooltip + { + get { return "Justify left"; } + } + + public string CommandIdentifier + { + get { return "JustifyLeft"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/JustifyRightButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/JustifyRightButton.cs similarity index 87% rename from Sub/YARTE/Buttons/JustifyRightButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/JustifyRightButton.cs index 48d409e..90de980 100644 --- a/Sub/YARTE/Buttons/JustifyRightButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/JustifyRightButton.cs @@ -1,33 +1,33 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class JustifyRightButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand(CommandIdentifier, false, null); - } - - public Image IconImage - { - get { return Resources.justifyright; } - } - - public string IconName - { - get { return "Justify right"; } - } - - public string IconTooltip - { - get { return "Justify right"; } - } - - public string CommandIdentifier - { - get { return "JustifyRight"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class JustifyRightButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand(CommandIdentifier, false, null); + } + + public Image IconImage + { + get { return Resources.justifyright; } + } + + public string IconName + { + get { return "Justify right"; } + } + + public string IconTooltip + { + get { return "Justify right"; } + } + + public string CommandIdentifier + { + get { return "JustifyRight"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/LinkButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/LinkButton.cs similarity index 87% rename from Sub/YARTE/Buttons/LinkButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/LinkButton.cs index cd1db4b..7e53e4c 100644 --- a/Sub/YARTE/Buttons/LinkButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/LinkButton.cs @@ -1,33 +1,33 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class LinkButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("CreateLink", true, null); - } - - public Image IconImage - { - get { return Resources.createlink; } - } - - public string IconName - { - get { return "Create link"; } - } - - public string IconTooltip - { - get { return "Create link"; } - } - - public string CommandIdentifier - { - get { return "CreateLink"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class LinkButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("CreateLink", true, null); + } + + public Image IconImage + { + get { return Resources.createlink; } + } + + public string IconName + { + get { return "Create link"; } + } + + public string IconTooltip + { + get { return "Create link"; } + } + + public string CommandIdentifier + { + get { return "CreateLink"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/OrderedListButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/OrderedListButton.cs similarity index 87% rename from Sub/YARTE/Buttons/OrderedListButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/OrderedListButton.cs index 0a0c130..d335d5a 100644 --- a/Sub/YARTE/Buttons/OrderedListButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/OrderedListButton.cs @@ -1,34 +1,34 @@ -using System; -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class OrderedListButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("InsertOrderedList", false, null); - } - - public Image IconImage - { - get { return Resources.numberedlist; } - } - - public string IconName - { - get { return "Ordered list"; } - } - - public string IconTooltip - { - get { return "Ordered list"; } - } - - public string CommandIdentifier - { - get { return "InsertOrderedList"; } - } - } +using System; +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class OrderedListButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("InsertOrderedList", false, null); + } + + public Image IconImage + { + get { return Resources.numberedlist; } + } + + public string IconName + { + get { return "Ordered list"; } + } + + public string IconTooltip + { + get { return "Ordered list"; } + } + + public string CommandIdentifier + { + get { return "InsertOrderedList"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/PredefinedButtonSets.cs b/Sub/YARTE/YARTE/YARTE/Buttons/PredefinedButtonSets.cs similarity index 77% rename from Sub/YARTE/Buttons/PredefinedButtonSets.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/PredefinedButtonSets.cs index e4d273a..8d1a3d4 100644 --- a/Sub/YARTE/Buttons/PredefinedButtonSets.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/PredefinedButtonSets.cs @@ -1,31 +1,34 @@ -using System.Linq; - -namespace YARTE.UI.Buttons -{ - public static class PredefinedButtonSets - { - private static readonly string[] _webSafeFonts = new [] { "Courier New", "Times New Roman", "Georgia", "Arial", "Verdana"}; - - public static void SetupDefaultButtons(HtmlEditor editor) - { - editor.AddToolbarItem(new BoldButton()); - editor.AddToolbarItem(new ItalicButton()); - editor.AddFontSelector(_webSafeFonts); - editor.AddFontSizeSelector(Enumerable.Range(1,7)); - editor.AddToolbarDivider(); - editor.AddToolbarItem(new LinkButton()); - editor.AddToolbarItem(new UnlinkButton()); - editor.AddToolbarDivider(); - editor.AddToolbarItem(new InsertLinkedImageButton()); - editor.AddToolbarDivider(); - editor.AddToolbarItem(new OrderedListButton()); - editor.AddToolbarItem(new UnorderedListButton()); - editor.AddToolbarDivider(); - editor.AddToolbarItem(new ForecolorButton()); - editor.AddToolbarDivider(); - editor.AddToolbarItem(new JustifyLeftButton()); - editor.AddToolbarItem(new JustifyCenterButton()); - editor.AddToolbarItem(new JustifyRightButton()); - } - } +using System.Linq; + +namespace YARTE.UI.Buttons +{ + public static class PredefinedButtonSets + { + private static readonly string[] _webSafeFonts = new [] { "맑은 고딕", "Courier New", "Times New Roman", "Georgia", "Arial", "Verdana"}; + + public static void SetupDefaultButtons(HtmlEditor editor) + { + editor.AddToolbarItem(new BoldButton()); + editor.AddToolbarItem(new ItalicButton()); + editor.AddFontSelector(_webSafeFonts); + editor.AddFontSizeSelector(Enumerable.Range(1,10)); + editor.AddToolbarDivider(); + editor.AddToolbarItem(new LinkButton()); + editor.AddToolbarItem(new UnlinkButton()); + editor.AddToolbarDivider(); + editor.AddToolbarItem(new InsertLinkedImageButton()); + editor.AddToolbarDivider(); + editor.AddToolbarItem(new OrderedListButton()); + editor.AddToolbarItem(new UnorderedListButton()); + editor.AddToolbarDivider(); + editor.AddToolbarItem(new ForecolorButton()); + editor.AddToolbarDivider(); + editor.AddToolbarItem(new JustifyLeftButton()); + editor.AddToolbarItem(new JustifyCenterButton()); + editor.AddToolbarItem(new JustifyRightButton()); + editor.AddToolbarDivider(); + editor.AddToolbarItem(new ReadOnlyButton()); + editor.AddToolbarItem(new CheckboxButton()); + } + } } \ No newline at end of file diff --git a/Sub/YARTE/YARTE/YARTE/Buttons/ReadOnlyButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/ReadOnlyButton.cs new file mode 100644 index 0000000..b763f45 --- /dev/null +++ b/Sub/YARTE/YARTE/YARTE/Buttons/ReadOnlyButton.cs @@ -0,0 +1,47 @@ +using System; +using System.Drawing; +using System.Windows.Forms; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class ReadOnlyButton : IFunctionButton + { + private string _label = "Enter View Mode"; + + public void IconClicked(ButtonArgs args) + { + args.Editor.ReadOnly = !args.Editor.ReadOnly; + } + + public void IconClicked(ButtonArgs args, ToolStripButton button) + { + if (_label.Equals("Enter Edit Mode")) + { + _label = "Enter View Mode"; + } + else + { + _label = "Enter Edit Mode"; + } + button.Text = _label; + args.Editor.ReadOnly = !args.Editor.ReadOnly; + } + + public string Label + { + get { return _label; } + set { _label = value; } + } + + public string IconName + { + get { return "Read Only"; } + } + + public string IconTooltip + { + get { return _label; } + } + } +} \ No newline at end of file diff --git a/Sub/YARTE/Buttons/UnderlineButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/UnderlineButton.cs similarity index 87% rename from Sub/YARTE/Buttons/UnderlineButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/UnderlineButton.cs index 84e87be..01f1666 100644 --- a/Sub/YARTE/Buttons/UnderlineButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/UnderlineButton.cs @@ -1,34 +1,34 @@ -using System; -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class UnderlineButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("Underline", false, null); - } - - public Image IconImage - { - get { return Resources.underline; } - } - - public string IconName - { - get { return "Underline"; } - } - - public string IconTooltip - { - get { return "Underline"; } - } - - public string CommandIdentifier - { - get { return "Underline"; } - } - } +using System; +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class UnderlineButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("Underline", false, null); + } + + public Image IconImage + { + get { return Resources.underline; } + } + + public string IconName + { + get { return "Underline"; } + } + + public string IconTooltip + { + get { return "Underline"; } + } + + public string CommandIdentifier + { + get { return "Underline"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/UnlinkButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/UnlinkButton.cs similarity index 86% rename from Sub/YARTE/Buttons/UnlinkButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/UnlinkButton.cs index ac13cad..1358ca9 100644 --- a/Sub/YARTE/Buttons/UnlinkButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/UnlinkButton.cs @@ -1,33 +1,33 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class UnlinkButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("Unlink", false, null); - } - - public Image IconImage - { - get { return Resources.unlink; } - } - - public string IconName - { - get { return "Unlink"; } - } - - public string IconTooltip - { - get { return "Unlink"; } - } - - public string CommandIdentifier - { - get { return "Unlink"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class UnlinkButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("Unlink", false, null); + } + + public Image IconImage + { + get { return Resources.unlink; } + } + + public string IconName + { + get { return "Unlink"; } + } + + public string IconTooltip + { + get { return "Unlink"; } + } + + public string CommandIdentifier + { + get { return "Unlink"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/Buttons/UnorderedListButton.cs b/Sub/YARTE/YARTE/YARTE/Buttons/UnorderedListButton.cs similarity index 87% rename from Sub/YARTE/Buttons/UnorderedListButton.cs rename to Sub/YARTE/YARTE/YARTE/Buttons/UnorderedListButton.cs index ed8edb2..bd699b3 100644 --- a/Sub/YARTE/Buttons/UnorderedListButton.cs +++ b/Sub/YARTE/YARTE/YARTE/Buttons/UnorderedListButton.cs @@ -1,33 +1,33 @@ -using System.Drawing; -using YARTE.Properties; - -namespace YARTE.UI.Buttons -{ - public class UnorderedListButton : IHTMLEditorButton - { - public void IconClicked(HTMLEditorButtonArgs args) - { - args.Document.ExecCommand("InsertUnorderedList", false, null); - } - - public Image IconImage - { - get { return Resources.bulletedlist; } - } - - public string IconName - { - get { return "Unordered list"; } - } - - public string IconTooltip - { - get { return "Unordered list"; } - } - - public string CommandIdentifier - { - get { return "InsertUnorderedList"; } - } - } +using System.Drawing; +using YARTE.Properties; + +namespace YARTE.UI.Buttons +{ + public class UnorderedListButton : IHTMLEditorButton + { + public void IconClicked(ButtonArgs args) + { + args.Document.ExecCommand("InsertUnorderedList", false, null); + } + + public Image IconImage + { + get { return Resources.bulletedlist; } + } + + public string IconName + { + get { return "Unordered list"; } + } + + public string IconTooltip + { + get { return "Unordered list"; } + } + + public string CommandIdentifier + { + get { return "InsertUnorderedList"; } + } + } } \ No newline at end of file diff --git a/Sub/YARTE/YARTE/YARTE/CheckboxItem.cs b/Sub/YARTE/YARTE/YARTE/CheckboxItem.cs new file mode 100644 index 0000000..197a504 --- /dev/null +++ b/Sub/YARTE/YARTE/YARTE/CheckboxItem.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace YARTE +{ + public class CheckboxItem + { + private string strLabel; + private string strIdentifier; + private bool blnCheckd = false; + + public CheckboxItem(string label, string identifier) + { + strLabel = label; + strIdentifier = identifier; + } + + public CheckboxItem(string label, string identifier, bool checkd) : this(label, identifier) + { + blnCheckd = checkd; + } + + public string Label + { + get { return strLabel; } + set { strLabel = value; } + } + + public string Identifier + { + get { return strIdentifier; } + set { strIdentifier = value; } + } + + public bool Checked + { + get { return blnCheckd; } + set { blnCheckd = value; } + } + } +} diff --git a/Sub/YARTE/HTMLEditor.Designer.cs b/Sub/YARTE/YARTE/YARTE/HTMLEditor.Designer.cs similarity index 80% rename from Sub/YARTE/HTMLEditor.Designer.cs rename to Sub/YARTE/YARTE/YARTE/HTMLEditor.Designer.cs index 57b9d44..c1edb1c 100644 --- a/Sub/YARTE/HTMLEditor.Designer.cs +++ b/Sub/YARTE/YARTE/YARTE/HTMLEditor.Designer.cs @@ -1,76 +1,80 @@ -namespace YARTE.UI -{ - partial class HtmlEditor - { - /// - /// 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 Component 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(); - this.textWebBrowser = new System.Windows.Forms.WebBrowser(); - this.editcontrolsToolStrip = new System.Windows.Forms.ToolStrip(); - this.updateToolBarTimer = new System.Windows.Forms.Timer(this.components); - this.SuspendLayout(); - // - // textWebBrowser - // - this.textWebBrowser.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textWebBrowser.Location = new System.Drawing.Point(0, 28); - this.textWebBrowser.MinimumSize = new System.Drawing.Size(20, 20); - this.textWebBrowser.Name = "textWebBrowser"; - this.textWebBrowser.Size = new System.Drawing.Size(557, 443); - this.textWebBrowser.TabIndex = 0; - // - // editcontrolsToolStrip - // - this.editcontrolsToolStrip.Location = new System.Drawing.Point(0, 0); - this.editcontrolsToolStrip.Name = "editcontrolsToolStrip"; - this.editcontrolsToolStrip.Size = new System.Drawing.Size(557, 25); - this.editcontrolsToolStrip.TabIndex = 1; - this.editcontrolsToolStrip.Text = "editcontrolsToolStrip"; - // - // HtmlEditor - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.editcontrolsToolStrip); - this.Controls.Add(this.textWebBrowser); - this.Name = "HtmlEditor"; - this.Size = new System.Drawing.Size(557, 474); - this.ContextMenuStripChanged += new System.EventHandler(this.HtmlEditor_ContextMenuStripChanged); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.WebBrowser textWebBrowser; - private System.Windows.Forms.ToolStrip editcontrolsToolStrip; - private System.Windows.Forms.Timer updateToolBarTimer; - } -} +namespace YARTE.UI +{ + partial class HtmlEditor + { + /// + /// 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 Component 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(); + this.textWebBrowser = new System.Windows.Forms.WebBrowser(); + this.editcontrolsToolStrip = new System.Windows.Forms.ToolStrip(); + this.updateToolBarTimer = new System.Windows.Forms.Timer(this.components); + this.SuspendLayout(); + // + // textWebBrowser + // + this.textWebBrowser.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textWebBrowser.Location = new System.Drawing.Point(0, 34); + this.textWebBrowser.Margin = new System.Windows.Forms.Padding(4); + this.textWebBrowser.MinimumSize = new System.Drawing.Size(27, 25); + this.textWebBrowser.Name = "textWebBrowser"; + this.textWebBrowser.Size = new System.Drawing.Size(743, 545); + this.textWebBrowser.TabIndex = 0; + this.textWebBrowser.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.textWebBrowser_Navigating); + // + // editcontrolsToolStrip + // + this.editcontrolsToolStrip.ImageScalingSize = new System.Drawing.Size(20, 20); + this.editcontrolsToolStrip.Location = new System.Drawing.Point(0, 0); + this.editcontrolsToolStrip.Name = "editcontrolsToolStrip"; + this.editcontrolsToolStrip.Size = new System.Drawing.Size(743, 25); + this.editcontrolsToolStrip.TabIndex = 1; + this.editcontrolsToolStrip.Text = "editcontrolsToolStrip"; + // + // HtmlEditor + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.editcontrolsToolStrip); + this.Controls.Add(this.textWebBrowser); + this.Margin = new System.Windows.Forms.Padding(4); + this.Name = "HtmlEditor"; + this.Size = new System.Drawing.Size(743, 583); + this.ContextMenuStripChanged += new System.EventHandler(this.HtmlEditor_ContextMenuStripChanged); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.WebBrowser textWebBrowser; + private System.Windows.Forms.ToolStrip editcontrolsToolStrip; + private System.Windows.Forms.Timer updateToolBarTimer; + } +} diff --git a/Sub/YARTE/HTMLEditor.resx b/Sub/YARTE/YARTE/YARTE/HTMLEditor.resx similarity index 97% rename from Sub/YARTE/HTMLEditor.resx rename to Sub/YARTE/YARTE/YARTE/HTMLEditor.resx index a7505a5..6895ab4 100644 --- a/Sub/YARTE/HTMLEditor.resx +++ b/Sub/YARTE/YARTE/YARTE/HTMLEditor.resx @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 183, 17 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 183, 17 + \ No newline at end of file diff --git a/Sub/YARTE/HtmlEditor.cs b/Sub/YARTE/YARTE/YARTE/HtmlEditor.cs similarity index 55% rename from Sub/YARTE/HtmlEditor.cs rename to Sub/YARTE/YARTE/YARTE/HtmlEditor.cs index 5bb4d0b..d3b0e5c 100644 --- a/Sub/YARTE/HtmlEditor.cs +++ b/Sub/YARTE/YARTE/YARTE/HtmlEditor.cs @@ -1,259 +1,406 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; -using MSHTML; -using YARTE.UI.Buttons; - -namespace YARTE.UI -{ - public partial class HtmlEditor : UserControl - { - private readonly HtmlDocument _doc; - private readonly IList _customButtons; - - public HtmlEditor() - { - InitializeComponent(); - - InitializeWebBrowserAsEditor(); - - _doc = textWebBrowser.Document; - _customButtons = new List(); - - updateToolBarTimer.Start(); - updateToolBarTimer.Tick += updateToolBarTimer_Tick; - } - - public void AddFontSizeSelector(IEnumerable fontSizes) - { - if (fontSizes.Min() < 1 || fontSizes.Max() > 7) - { - throw new ArgumentException("Allowable font sizes are 1 through 7"); - } - - var fontSizeBox = new ToolStripComboBox(); - fontSizeBox.Items.AddRange(fontSizes.Select(f => f.ToString()).ToArray()); - fontSizeBox.Name = "fontSizeSelector"; - fontSizeBox.Size = new System.Drawing.Size(25, 25); - fontSizeBox.SelectedIndexChanged += (sender, o) => - { - var size = ((ToolStripComboBox)sender).SelectedItem; - _doc.ExecCommand("FontSize", false, size); - }; - fontSizeBox.DropDownStyle = ComboBoxStyle.DropDownList; - - this.AddToolbarItem(fontSizeBox); - } - - public void AddFontSelector(IEnumerable fontNames) - { - var dropDown = new ToolStripDropDownButton(); - foreach(var fontName in fontNames) - { - dropDown.DropDownItems.Add(GetFontDropDownItem(fontName)); - } - dropDown.ImageTransparentColor = System.Drawing.Color.Magenta; - dropDown.Name = "Font"; - dropDown.Size = new System.Drawing.Size(29, 22); - dropDown.Text = "Font"; - - this.AddToolbarItem(dropDown); - } - - private ToolStripItem GetFontDropDownItem(string fontName) - { - var dropDownItem = new ToolStripMenuItem(); - dropDownItem.Font = new System.Drawing.Font(fontName, 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); - dropDownItem.Name = "fontMenuItem" + Guid.NewGuid(); - dropDownItem.Size = new System.Drawing.Size(173, 22); - dropDownItem.Text = fontName; - dropDownItem.Click += (sender, e) => _doc.ExecCommand("FontName", false, fontName); - return dropDownItem; - } - - public void AddToolbarItem(ToolStripItem toolStripItem) - { - editcontrolsToolStrip.Items.Add(toolStripItem); - } - - public void AddToolbarItems(IEnumerable toolStripItems) - { - foreach (var stripItem in toolStripItems) - { - editcontrolsToolStrip.Items.Add(stripItem); - } - } - - public void AddToolbarItem(IHTMLEditorButton toolbarItem) - { - _customButtons.Add(toolbarItem); - editcontrolsToolStrip.Items.Add(CreateButton(toolbarItem)); - } - - public void AddToolbarItems(IEnumerable toolbarItems) - { - foreach (var toolbarItem in toolbarItems) - { - AddToolbarItem(toolbarItem); - } - } - - public void AddToolbarDivider() - { - var divider = new ToolStripSeparator(); - divider.Size = new System.Drawing.Size(6, 25); - editcontrolsToolStrip.Items.Add(divider); - } - - private ToolStripItem CreateButton(IHTMLEditorButton toolbarItem) - { - var toolStripButton = new ToolStripButton(); - toolStripButton.DisplayStyle = ToolStripItemDisplayStyle.Image; - toolStripButton.Image = toolbarItem.IconImage; - toolStripButton.ImageScaling = ToolStripItemImageScaling.None; - toolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - toolStripButton.Name = toolbarItem.IconName; - toolStripButton.Size = new System.Drawing.Size(25, 24); - toolStripButton.Text = toolbarItem.IconTooltip; - - var args = new HTMLEditorButtonArgs(); - args.Document = _doc; - args.Editor = this; - - IHTMLEditorButton button = toolbarItem; - toolStripButton.Click += (sender, o) => button.IconClicked(args); - - return toolStripButton; - } - - public bool ReadOnly - { - get - { - if (textWebBrowser.Document != null) - { - var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; - if (doc != null) - { - return doc.designMode != "On"; - } - } - return false; - } - set - { - if (textWebBrowser.Document != null) - { - var designMode = value ? "Off" : "On"; - var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; - if (doc != null) doc.designMode = designMode; - } - } - } - - public bool ShowToolbar - { - get - { - if (editcontrolsToolStrip != null) - { - return editcontrolsToolStrip.Visible; - } - return true; - } - set { editcontrolsToolStrip.Visible = value; } - } - - private void updateToolBarTimer_Tick(object sender, System.EventArgs e) - { - CheckCommandStateChanges(); - } - - private void InitializeWebBrowserAsEditor() - { - // It is necessary to add a body to the control before you can apply changes to the DOM document - textWebBrowser.DocumentText = ""; - if (textWebBrowser.Document != null) - { - var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; - if (doc != null) doc.designMode = "On"; - - // replace the context menu for the web browser control so the default IE browser context menu doesn't show up - textWebBrowser.IsWebBrowserContextMenuEnabled = false; - if (this.ContextMenuStrip == null) - { - textWebBrowser.Document.ContextMenuShowing += (sender, e) => { ; }; - } - } - } - - void Document_ContextMenuShowing(object sender, HtmlElementEventArgs e) - { - this.ContextMenuStrip.Show(this, this.PointToClient(Cursor.Position)); - } - - public string Html - { - get - { - return textWebBrowser.DocumentText; - } - set - { - if (textWebBrowser.Document != null) - { - // updating this way avoids an alert box - var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; - if (doc != null) - { - doc.write(value); - doc.close(); - } - } - } - } - - public string InsertTextAtCursor - { - set { _doc.ExecCommand("Paste", false, value); } - } - - private void CheckCommandStateChanges() - { - var doc = (IHTMLDocument2)_doc.DomDocument; - - var commands = _customButtons.Select(c => c.CommandIdentifier).Where(c => !string.IsNullOrEmpty(c)); - - foreach (var command in commands) - { - var button = (ToolStripButton)editcontrolsToolStrip.Items[command]; - - if (button == null) continue; - - if (doc.queryCommandState(command)) - { - if (button.CheckState != CheckState.Checked) - { - button.Checked = true; - } - } - else - { - if (button.CheckState == CheckState.Checked) - { - button.Checked = false; - } - } - } - } - - private void HtmlEditor_ContextMenuStripChanged(object sender, System.EventArgs e) - { - if (textWebBrowser.Document != null) - { - textWebBrowser.Document.ContextMenuShowing += Document_ContextMenuShowing; - } - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using mshtml; +using YARTE.UI.Buttons; +using System.Diagnostics; + +namespace YARTE.UI +{ + public partial class HtmlEditor : UserControl + { + private readonly HtmlDocument _doc; + private readonly IList _customButtons; + + public HtmlEditor() + { + InitializeComponent(); + + InitializeWebBrowserAsEditor(); + + _doc = textWebBrowser.Document; + _customButtons = new List(); + + updateToolBarTimer.Start(); + updateToolBarTimer.Tick += updateToolBarTimer_Tick; + } + + public void AddFontSizeSelector(IEnumerable fontSizes) + { + if (fontSizes.Min() < 1 || fontSizes.Max() > 10) + { + throw new ArgumentException("Allowable font sizes are 1 through 10"); + } + + var fontSizeBox = new ToolStripComboBox(); + fontSizeBox.Items.AddRange(fontSizes.Select(f => f.ToString()).ToArray()); + fontSizeBox.Name = "fontSizeSelector"; + fontSizeBox.Size = new System.Drawing.Size(25, 25); + fontSizeBox.SelectedIndexChanged += (sender, o) => + { + var size = ((ToolStripComboBox)sender).SelectedItem; + _doc.ExecCommand("FontSize", false, size); + }; + fontSizeBox.DropDownStyle = ComboBoxStyle.DropDownList; + + this.AddToolbarItem(fontSizeBox); + } + + public void AddFontSelector(IEnumerable fontNames) + { + var dropDown = new ToolStripDropDownButton(); + foreach(var fontName in fontNames) + { + dropDown.DropDownItems.Add(GetFontDropDownItem(fontName)); + } + dropDown.ImageTransparentColor = System.Drawing.Color.Magenta; + dropDown.Name = "Font"; + dropDown.Size = new System.Drawing.Size(29, 22); + dropDown.Text = "Font"; + + this.AddToolbarItem(dropDown); + } + + private ToolStripItem GetFontDropDownItem(string fontName) + { + var dropDownItem = new ToolStripMenuItem(); + dropDownItem.Font = new System.Drawing.Font(fontName, 10, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + dropDownItem.Name = "fontMenuItem" + Guid.NewGuid(); + dropDownItem.Size = new System.Drawing.Size(173, 22); + dropDownItem.Text = fontName; + dropDownItem.Click += (sender, e) => _doc.ExecCommand("FontName", false, fontName); + return dropDownItem; + } + + public void AddToolbarItem(ToolStripItem toolStripItem) + { + editcontrolsToolStrip.Items.Add(toolStripItem); + } + + public void AddToolbarItems(IEnumerable toolStripItems) + { + foreach (var stripItem in toolStripItems) + { + editcontrolsToolStrip.Items.Add(stripItem); + } + } + + public void AddToolbarItem(IHTMLEditorButton toolbarItem) + { + _customButtons.Add(toolbarItem); + editcontrolsToolStrip.Items.Add(CreateButton(toolbarItem)); + } + + public void AddToolbarItem(IFunctionButton toolbarItem) + { + _customButtons.Add(toolbarItem); + editcontrolsToolStrip.Items.Add(CreateButton(toolbarItem)); + } + + public void AddToolbarItems(IEnumerable toolbarItems) + { + foreach (var toolbarItem in toolbarItems) + { + AddToolbarItem(toolbarItem); + } + } + + public void AddToolbarDivider() + { + var divider = new ToolStripSeparator(); + divider.Size = new System.Drawing.Size(6, 25); + editcontrolsToolStrip.Items.Add(divider); + } + + private ToolStripItem CreateButton(IHTMLEditorButton toolbarItem) + { + var toolStripButton = new ToolStripButton(); + toolStripButton.DisplayStyle = ToolStripItemDisplayStyle.Image; + toolStripButton.Image = toolbarItem.IconImage; + toolStripButton.ImageScaling = ToolStripItemImageScaling.None; + toolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + toolStripButton.Name = toolbarItem.IconName; + toolStripButton.Size = new System.Drawing.Size(25, 24); + toolStripButton.Text = toolbarItem.IconTooltip; + + var args = new ButtonArgs(); + args.Document = _doc; + args.Editor = this; + + IHTMLEditorButton button = toolbarItem; + toolStripButton.Click += (sender, o) => button.IconClicked(args); + + return toolStripButton; + } + + private ToolStripItem CreateButton(IFunctionButton toolbarItem) + { + var toolStripButton = new ToolStripButton(); + toolStripButton.DisplayStyle = ToolStripItemDisplayStyle.Text; + toolStripButton.Name = toolbarItem.IconName; + toolStripButton.Text = toolbarItem.Label; + + var args = new ButtonArgs(); + args.Document = _doc; + args.Editor = this; + + IFunctionButton button = toolbarItem; + toolStripButton.Click += (sender, o) => button.IconClicked(args,toolStripButton); + + return toolStripButton; + } + + public bool ReadOnly + { + get + { + if (textWebBrowser.Document != null) + { + var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; + if (doc != null) + { + return doc.designMode != "On"; + } + } + return false; + } + set + { + string html = this.Html; + if (textWebBrowser.Document != null) + { + var designMode = value ? "Off" : "On"; + var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; + if (doc != null) doc.designMode = designMode; + } + this.Html = ""; + if (html != null) + { + this.Html = html; + } + } + } + + public bool ShowToolbar + { + get + { + if (editcontrolsToolStrip != null) + { + return editcontrolsToolStrip.Visible; + } + return true; + } + set { editcontrolsToolStrip.Visible = value; } + } + + private void updateToolBarTimer_Tick(object sender, System.EventArgs e) + { + CheckCommandStateChanges(); + } + + private void InitializeWebBrowserAsEditor() + { + // It is necessary to add a body to the control before you can apply changes to the DOM document + textWebBrowser.DocumentText = ""; + if (textWebBrowser.Document != null) + { + var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; + if (doc != null) doc.designMode = "On"; + + // replace the context menu for the web browser control so the default IE browser context menu doesn't show up + textWebBrowser.IsWebBrowserContextMenuEnabled = false; + if (this.ContextMenuStrip == null) + { + textWebBrowser.Document.ContextMenuShowing += (sender, e) => { ; }; + } + } + } + + void Document_ContextMenuShowing(object sender, HtmlElementEventArgs e) + { + this.ContextMenuStrip.Show(this, this.PointToClient(Cursor.Position)); + } + + public string Html + { + get + { + + var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; + + // sample for getting CHECKED states + if (textWebBrowser.Document.GetElementsByTagName("input").Count > 0) + { + Console.WriteLine(textWebBrowser.Document.GetElementsByTagName("input")[0].GetAttribute("checked")); + } + + /* this previously returned textWebBrowser.DocumentText, so the following HTML is now omitted: + < !DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > + < HTML >< HEAD > + < META content = "text/html; charset=unicode" http - equiv = Content - Type > + < META name = GENERATOR content = "MSHTML 11.00.10570.1001" > + < BODY > + */ + try + { + return doc.body.innerHTML + ""; // this is used during runtime + // make sure it returns empty string instead of null + } + catch (Exception) + { + // the Form [Design] view evaluates this + return textWebBrowser.DocumentText; + } + } + set + { + if (value == null) + { + value = ""; + } + + if (textWebBrowser.Document != null) + { + // updating this way avoids an alert box + var doc = textWebBrowser.Document.DomDocument as IHTMLDocument2; + if (doc != null) + { + doc.write(value); + doc.close(); + } + } + } + } + + public void InsertTextAtCursor(string val) + { + _doc.ExecCommand("Paste", false, val); + } + + private void CheckCommandStateChanges() + { + var doc = (IHTMLDocument2)_doc.DomDocument; + + var commands = new List(); + foreach (var button in _customButtons) + { + if (button is IHTMLEditorButton) + { + var temp = (IHTMLEditorButton)button; + commands.Add(temp.CommandIdentifier); + } + } + //var commands = _customButtons.Select(c => c.CommandIdentifier).Where(c => !string.IsNullOrEmpty(c)); + + foreach (var command in commands) + { + var button = (ToolStripButton)editcontrolsToolStrip.Items[command]; + + if (button == null) continue; + + if (doc.queryCommandState(command)) + { + if (button.CheckState != CheckState.Checked) + { + button.Checked = true; + } + } + else + { + if (button.CheckState == CheckState.Checked) + { + button.Checked = false; + } + } + } + } + + private void HtmlEditor_ContextMenuStripChanged(object sender, System.EventArgs e) + { + if (textWebBrowser.Document != null) + { + textWebBrowser.Document.ContextMenuShowing += Document_ContextMenuShowing; + } + } + + private void textWebBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e) + { + // http://stackoverflow.com/questions/18035579/how-to-open-a-link-in-webbrowser-control-in-external-browser + // terminate current Navigating event; launch a new Process with the target URL to open user's default browser + if (ReadOnly) + { + e.Cancel = true; + + Process.Start(e.Url.ToString()); + } + } + + public string insertCheckbox(string label = null) + { + Random rand = new Random(); + string letters = "qwertyuiopasdfghjklzxcvbnm"; + string identifier = rand.Next(1000000000, int.MaxValue).ToString() + + letters[rand.Next(letters.Length)]; + InsertTextAtCursor(identifier); // place random int in checkbox's position + // pasting HTML doesn't work + + string html = this.Html; + if (label == null) + { + // place plain checkbox + html = html.Replace(identifier, + "
"); + } + else + { + // place checkbox and label\ + html = html.Replace(identifier, + "
" + + label + "
"); + } + + this.Html = html; // reload + + return identifier; + } + + public Dictionary getCheckedStates() + { + Dictionary output = new Dictionary(); + foreach (HtmlElement item in textWebBrowser.Document.GetElementsByTagName("input")) + { + output.Add(item.GetAttribute("id"), item.GetAttribute("checked").Equals("True")); + } + return output; + } + + public Dictionary getCheckboxes() + { + Dictionary output = new Dictionary(); + foreach (HtmlElement item in textWebBrowser.Document.GetElementsByTagName("input")) + { + output.Add(item.GetAttribute("id"), + new CheckboxItem(textWebBrowser.Document.GetElementById(item.GetAttribute("id") + "-label").InnerHtml, + item.GetAttribute("id"), + item.GetAttribute("checked").Equals("True"))); + } + return output; + } + + public void updateCheckedState(string identifier, bool checkedState) + { + string state; + if (checkedState) + { + state = "True"; + } + else + { + state = ""; // "False" doesn't work + } + textWebBrowser.Document.GetElementById(identifier).SetAttribute("CHECKED", state); + } + } +} diff --git a/Sub/YARTE/Properties/AssemblyInfo.cs b/Sub/YARTE/YARTE/YARTE/Properties/AssemblyInfo.cs similarity index 97% rename from Sub/YARTE/Properties/AssemblyInfo.cs rename to Sub/YARTE/YARTE/YARTE/Properties/AssemblyInfo.cs index 23d9c94..ed6ddac 100644 --- a/Sub/YARTE/Properties/AssemblyInfo.cs +++ b/Sub/YARTE/YARTE/YARTE/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("YARTE")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("YARTE")] -[assembly: AssemblyCopyright("Copyright © 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9c0b69ac-03c8-4195-94e9-3aac5aeddd8b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("YARTE")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("YARTE")] +[assembly: AssemblyCopyright("Copyright © 2010")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("9c0b69ac-03c8-4195-94e9-3aac5aeddd8b")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Sub/YARTE/Properties/Resources.Designer.cs b/Sub/YARTE/YARTE/YARTE/Properties/Resources.Designer.cs similarity index 97% rename from Sub/YARTE/Properties/Resources.Designer.cs rename to Sub/YARTE/YARTE/YARTE/Properties/Resources.Designer.cs index d54f0b6..bf62db9 100644 --- a/Sub/YARTE/Properties/Resources.Designer.cs +++ b/Sub/YARTE/YARTE/YARTE/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace YARTE.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Sub/YARTE/Properties/Resources.resx b/Sub/YARTE/YARTE/YARTE/Properties/Resources.resx similarity index 98% rename from Sub/YARTE/Properties/Resources.resx rename to Sub/YARTE/YARTE/YARTE/Properties/Resources.resx index c74bbde..43714d6 100644 --- a/Sub/YARTE/Properties/Resources.resx +++ b/Sub/YARTE/YARTE/YARTE/Properties/Resources.resx @@ -1,283 +1,283 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - ..\Resources\bold.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bulletedlist.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\createlink.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\cut.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\delete.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\deletetablecolumn.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\deletetablerow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\editstyle.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\edittable.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\fontbackcolorpicker.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\fontforecolorpicker.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\iespellcheck.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\indent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertbutton.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertcheckbox.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertdate.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertdiv.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertdropdownlist.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertform.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertimage.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertimagefromgallery.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertradiobutton.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\insertrule.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttable.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttablecolumnafter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttablecolumnbefore.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttablerowafter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttablerowbefore.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttextarea.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttextbox.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\inserttime.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\italic.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\justifycenter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\justifyfull.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\justifyleft.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\justifyright.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\netspell.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\numberedlist.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\outdent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\paste.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\preview.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\redo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\removeformat.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\save.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\selectall.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\strikethrough.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\subscript.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\superscript.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\underline.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\undo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\unlink.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\wordclean.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\Resources\bold.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bulletedlist.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\createlink.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cut.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\delete.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\deletetablecolumn.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\deletetablerow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\editstyle.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\edittable.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fontbackcolorpicker.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fontforecolorpicker.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\iespellcheck.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\indent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertbutton.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertcheckbox.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertdate.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertdiv.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertdropdownlist.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertform.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertimage.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertimagefromgallery.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertradiobutton.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertrule.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttable.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttablecolumnafter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttablecolumnbefore.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttablerowafter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttablerowbefore.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttextarea.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttextbox.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\inserttime.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\italic.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\justifycenter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\justifyfull.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\justifyleft.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\justifyright.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\netspell.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\numberedlist.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\outdent.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\paste.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\preview.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\redo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\removeformat.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\save.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\selectall.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\strikethrough.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\subscript.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\superscript.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\underline.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\undo.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\unlink.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wordclean.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Sub/YARTE/Resources/bold.gif b/Sub/YARTE/YARTE/YARTE/Resources/bold.gif similarity index 100% rename from Sub/YARTE/Resources/bold.gif rename to Sub/YARTE/YARTE/YARTE/Resources/bold.gif diff --git a/Sub/YARTE/Resources/bulletedlist.gif b/Sub/YARTE/YARTE/YARTE/Resources/bulletedlist.gif similarity index 100% rename from Sub/YARTE/Resources/bulletedlist.gif rename to Sub/YARTE/YARTE/YARTE/Resources/bulletedlist.gif diff --git a/Sub/YARTE/Resources/copy.gif b/Sub/YARTE/YARTE/YARTE/Resources/copy.gif similarity index 100% rename from Sub/YARTE/Resources/copy.gif rename to Sub/YARTE/YARTE/YARTE/Resources/copy.gif diff --git a/Sub/YARTE/Resources/createlink.gif b/Sub/YARTE/YARTE/YARTE/Resources/createlink.gif similarity index 100% rename from Sub/YARTE/Resources/createlink.gif rename to Sub/YARTE/YARTE/YARTE/Resources/createlink.gif diff --git a/Sub/YARTE/Resources/cut.gif b/Sub/YARTE/YARTE/YARTE/Resources/cut.gif similarity index 100% rename from Sub/YARTE/Resources/cut.gif rename to Sub/YARTE/YARTE/YARTE/Resources/cut.gif diff --git a/Sub/YARTE/Resources/delete.gif b/Sub/YARTE/YARTE/YARTE/Resources/delete.gif similarity index 100% rename from Sub/YARTE/Resources/delete.gif rename to Sub/YARTE/YARTE/YARTE/Resources/delete.gif diff --git a/Sub/YARTE/Resources/deletetablecolumn.gif b/Sub/YARTE/YARTE/YARTE/Resources/deletetablecolumn.gif similarity index 100% rename from Sub/YARTE/Resources/deletetablecolumn.gif rename to Sub/YARTE/YARTE/YARTE/Resources/deletetablecolumn.gif diff --git a/Sub/YARTE/Resources/deletetablerow.gif b/Sub/YARTE/YARTE/YARTE/Resources/deletetablerow.gif similarity index 100% rename from Sub/YARTE/Resources/deletetablerow.gif rename to Sub/YARTE/YARTE/YARTE/Resources/deletetablerow.gif diff --git a/Sub/YARTE/Resources/editstyle.gif b/Sub/YARTE/YARTE/YARTE/Resources/editstyle.gif similarity index 100% rename from Sub/YARTE/Resources/editstyle.gif rename to Sub/YARTE/YARTE/YARTE/Resources/editstyle.gif diff --git a/Sub/YARTE/Resources/edittable.gif b/Sub/YARTE/YARTE/YARTE/Resources/edittable.gif similarity index 100% rename from Sub/YARTE/Resources/edittable.gif rename to Sub/YARTE/YARTE/YARTE/Resources/edittable.gif diff --git a/Sub/YARTE/Resources/fontbackcolorpicker.gif b/Sub/YARTE/YARTE/YARTE/Resources/fontbackcolorpicker.gif similarity index 100% rename from Sub/YARTE/Resources/fontbackcolorpicker.gif rename to Sub/YARTE/YARTE/YARTE/Resources/fontbackcolorpicker.gif diff --git a/Sub/YARTE/Resources/fontforecolorpicker.gif b/Sub/YARTE/YARTE/YARTE/Resources/fontforecolorpicker.gif similarity index 100% rename from Sub/YARTE/Resources/fontforecolorpicker.gif rename to Sub/YARTE/YARTE/YARTE/Resources/fontforecolorpicker.gif diff --git a/Sub/YARTE/Resources/iespellcheck.gif b/Sub/YARTE/YARTE/YARTE/Resources/iespellcheck.gif similarity index 100% rename from Sub/YARTE/Resources/iespellcheck.gif rename to Sub/YARTE/YARTE/YARTE/Resources/iespellcheck.gif diff --git a/Sub/YARTE/Resources/indent.gif b/Sub/YARTE/YARTE/YARTE/Resources/indent.gif similarity index 100% rename from Sub/YARTE/Resources/indent.gif rename to Sub/YARTE/YARTE/YARTE/Resources/indent.gif diff --git a/Sub/YARTE/Resources/insertbutton.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertbutton.gif similarity index 100% rename from Sub/YARTE/Resources/insertbutton.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertbutton.gif diff --git a/Sub/YARTE/Resources/insertcheckbox.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertcheckbox.gif similarity index 100% rename from Sub/YARTE/Resources/insertcheckbox.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertcheckbox.gif diff --git a/Sub/YARTE/Resources/insertdate.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertdate.gif similarity index 100% rename from Sub/YARTE/Resources/insertdate.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertdate.gif diff --git a/Sub/YARTE/Resources/insertdiv.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertdiv.gif similarity index 100% rename from Sub/YARTE/Resources/insertdiv.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertdiv.gif diff --git a/Sub/YARTE/Resources/insertdropdownlist.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertdropdownlist.gif similarity index 100% rename from Sub/YARTE/Resources/insertdropdownlist.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertdropdownlist.gif diff --git a/Sub/YARTE/Resources/insertform.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertform.gif similarity index 100% rename from Sub/YARTE/Resources/insertform.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertform.gif diff --git a/Sub/YARTE/Resources/insertimage.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertimage.gif similarity index 100% rename from Sub/YARTE/Resources/insertimage.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertimage.gif diff --git a/Sub/YARTE/Resources/insertimagefromgallery.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertimagefromgallery.gif similarity index 100% rename from Sub/YARTE/Resources/insertimagefromgallery.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertimagefromgallery.gif diff --git a/Sub/YARTE/Resources/insertradiobutton.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertradiobutton.gif similarity index 100% rename from Sub/YARTE/Resources/insertradiobutton.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertradiobutton.gif diff --git a/Sub/YARTE/Resources/insertrule.gif b/Sub/YARTE/YARTE/YARTE/Resources/insertrule.gif similarity index 100% rename from Sub/YARTE/Resources/insertrule.gif rename to Sub/YARTE/YARTE/YARTE/Resources/insertrule.gif diff --git a/Sub/YARTE/Resources/inserttable.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttable.gif similarity index 100% rename from Sub/YARTE/Resources/inserttable.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttable.gif diff --git a/Sub/YARTE/Resources/inserttablecolumnafter.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnafter.gif similarity index 100% rename from Sub/YARTE/Resources/inserttablecolumnafter.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnafter.gif diff --git a/Sub/YARTE/Resources/inserttablecolumnbefore.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnbefore.gif similarity index 100% rename from Sub/YARTE/Resources/inserttablecolumnbefore.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttablecolumnbefore.gif diff --git a/Sub/YARTE/Resources/inserttablerowafter.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttablerowafter.gif similarity index 100% rename from Sub/YARTE/Resources/inserttablerowafter.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttablerowafter.gif diff --git a/Sub/YARTE/Resources/inserttablerowbefore.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttablerowbefore.gif similarity index 100% rename from Sub/YARTE/Resources/inserttablerowbefore.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttablerowbefore.gif diff --git a/Sub/YARTE/Resources/inserttextarea.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttextarea.gif similarity index 100% rename from Sub/YARTE/Resources/inserttextarea.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttextarea.gif diff --git a/Sub/YARTE/Resources/inserttextbox.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttextbox.gif similarity index 100% rename from Sub/YARTE/Resources/inserttextbox.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttextbox.gif diff --git a/Sub/YARTE/Resources/inserttime.gif b/Sub/YARTE/YARTE/YARTE/Resources/inserttime.gif similarity index 100% rename from Sub/YARTE/Resources/inserttime.gif rename to Sub/YARTE/YARTE/YARTE/Resources/inserttime.gif diff --git a/Sub/YARTE/Resources/italic.gif b/Sub/YARTE/YARTE/YARTE/Resources/italic.gif similarity index 100% rename from Sub/YARTE/Resources/italic.gif rename to Sub/YARTE/YARTE/YARTE/Resources/italic.gif diff --git a/Sub/YARTE/Resources/justifycenter.gif b/Sub/YARTE/YARTE/YARTE/Resources/justifycenter.gif similarity index 100% rename from Sub/YARTE/Resources/justifycenter.gif rename to Sub/YARTE/YARTE/YARTE/Resources/justifycenter.gif diff --git a/Sub/YARTE/Resources/justifyfull.gif b/Sub/YARTE/YARTE/YARTE/Resources/justifyfull.gif similarity index 100% rename from Sub/YARTE/Resources/justifyfull.gif rename to Sub/YARTE/YARTE/YARTE/Resources/justifyfull.gif diff --git a/Sub/YARTE/Resources/justifyleft.gif b/Sub/YARTE/YARTE/YARTE/Resources/justifyleft.gif similarity index 100% rename from Sub/YARTE/Resources/justifyleft.gif rename to Sub/YARTE/YARTE/YARTE/Resources/justifyleft.gif diff --git a/Sub/YARTE/Resources/justifyright.gif b/Sub/YARTE/YARTE/YARTE/Resources/justifyright.gif similarity index 100% rename from Sub/YARTE/Resources/justifyright.gif rename to Sub/YARTE/YARTE/YARTE/Resources/justifyright.gif diff --git a/Sub/YARTE/Resources/netspell.gif b/Sub/YARTE/YARTE/YARTE/Resources/netspell.gif similarity index 100% rename from Sub/YARTE/Resources/netspell.gif rename to Sub/YARTE/YARTE/YARTE/Resources/netspell.gif diff --git a/Sub/YARTE/Resources/numberedlist.gif b/Sub/YARTE/YARTE/YARTE/Resources/numberedlist.gif similarity index 100% rename from Sub/YARTE/Resources/numberedlist.gif rename to Sub/YARTE/YARTE/YARTE/Resources/numberedlist.gif diff --git a/Sub/YARTE/Resources/outdent.gif b/Sub/YARTE/YARTE/YARTE/Resources/outdent.gif similarity index 100% rename from Sub/YARTE/Resources/outdent.gif rename to Sub/YARTE/YARTE/YARTE/Resources/outdent.gif diff --git a/Sub/YARTE/Resources/paste.gif b/Sub/YARTE/YARTE/YARTE/Resources/paste.gif similarity index 100% rename from Sub/YARTE/Resources/paste.gif rename to Sub/YARTE/YARTE/YARTE/Resources/paste.gif diff --git a/Sub/YARTE/Resources/preview.gif b/Sub/YARTE/YARTE/YARTE/Resources/preview.gif similarity index 100% rename from Sub/YARTE/Resources/preview.gif rename to Sub/YARTE/YARTE/YARTE/Resources/preview.gif diff --git a/Sub/YARTE/Resources/print.gif b/Sub/YARTE/YARTE/YARTE/Resources/print.gif similarity index 100% rename from Sub/YARTE/Resources/print.gif rename to Sub/YARTE/YARTE/YARTE/Resources/print.gif diff --git a/Sub/YARTE/Resources/redo.gif b/Sub/YARTE/YARTE/YARTE/Resources/redo.gif similarity index 100% rename from Sub/YARTE/Resources/redo.gif rename to Sub/YARTE/YARTE/YARTE/Resources/redo.gif diff --git a/Sub/YARTE/Resources/removeformat.gif b/Sub/YARTE/YARTE/YARTE/Resources/removeformat.gif similarity index 100% rename from Sub/YARTE/Resources/removeformat.gif rename to Sub/YARTE/YARTE/YARTE/Resources/removeformat.gif diff --git a/Sub/YARTE/Resources/save.gif b/Sub/YARTE/YARTE/YARTE/Resources/save.gif similarity index 100% rename from Sub/YARTE/Resources/save.gif rename to Sub/YARTE/YARTE/YARTE/Resources/save.gif diff --git a/Sub/YARTE/Resources/selectall.gif b/Sub/YARTE/YARTE/YARTE/Resources/selectall.gif similarity index 100% rename from Sub/YARTE/Resources/selectall.gif rename to Sub/YARTE/YARTE/YARTE/Resources/selectall.gif diff --git a/Sub/YARTE/Resources/strikethrough.gif b/Sub/YARTE/YARTE/YARTE/Resources/strikethrough.gif similarity index 100% rename from Sub/YARTE/Resources/strikethrough.gif rename to Sub/YARTE/YARTE/YARTE/Resources/strikethrough.gif diff --git a/Sub/YARTE/Resources/subscript.gif b/Sub/YARTE/YARTE/YARTE/Resources/subscript.gif similarity index 100% rename from Sub/YARTE/Resources/subscript.gif rename to Sub/YARTE/YARTE/YARTE/Resources/subscript.gif diff --git a/Sub/YARTE/Resources/superscript.gif b/Sub/YARTE/YARTE/YARTE/Resources/superscript.gif similarity index 100% rename from Sub/YARTE/Resources/superscript.gif rename to Sub/YARTE/YARTE/YARTE/Resources/superscript.gif diff --git a/Sub/YARTE/Resources/underline.gif b/Sub/YARTE/YARTE/YARTE/Resources/underline.gif similarity index 100% rename from Sub/YARTE/Resources/underline.gif rename to Sub/YARTE/YARTE/YARTE/Resources/underline.gif diff --git a/Sub/YARTE/Resources/undo.gif b/Sub/YARTE/YARTE/YARTE/Resources/undo.gif similarity index 100% rename from Sub/YARTE/Resources/undo.gif rename to Sub/YARTE/YARTE/YARTE/Resources/undo.gif diff --git a/Sub/YARTE/Resources/unlink.gif b/Sub/YARTE/YARTE/YARTE/Resources/unlink.gif similarity index 100% rename from Sub/YARTE/Resources/unlink.gif rename to Sub/YARTE/YARTE/YARTE/Resources/unlink.gif diff --git a/Sub/YARTE/Resources/wordclean.gif b/Sub/YARTE/YARTE/YARTE/Resources/wordclean.gif similarity index 100% rename from Sub/YARTE/Resources/wordclean.gif rename to Sub/YARTE/YARTE/YARTE/Resources/wordclean.gif diff --git a/Sub/YARTE/YARTE.csproj b/Sub/YARTE/YARTE/YARTE/YARTE.csproj similarity index 93% rename from Sub/YARTE/YARTE.csproj rename to Sub/YARTE/YARTE/YARTE/YARTE.csproj index 9b62583..9440090 100644 --- a/Sub/YARTE/YARTE.csproj +++ b/Sub/YARTE/YARTE/YARTE/YARTE.csproj @@ -23,7 +23,6 @@ DEBUG;TRACE prompt 4 - x86 pdbonly @@ -46,7 +45,10 @@ + + + @@ -56,9 +58,11 @@ + + UserControl @@ -83,6 +87,17 @@ Designer + + + {3050F1C5-98B5-11CF-BB82-00AA00BDCE0B} + 4 + 0 + 0 + primary + False + True + + @@ -245,23 +260,12 @@ - - - {3050F1C5-98B5-11CF-BB82-00AA00BDCE0B} - 4 - 0 - 0 - tlbimp - False - True - - - \ No newline at end of file diff --git a/Sub/YARTE/formSetting/fBase.xml b/Sub/YARTE/formSetting/fBase.xml deleted file mode 100644 index 1c127b4..0000000 --- a/Sub/YARTE/formSetting/fBase.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index cec68a3..b9d0f1e 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -154,6 +154,12 @@ True DSUser.xsd + + Form + + + Form2.cs + Form @@ -585,7 +591,7 @@ {f31c242c-1b15-4518-9733-48558499fe4b} arControl - + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE diff --git a/SubProject/FCM0000/FCM0000.csproj.user b/SubProject/FCM0000/FCM0000.csproj.user index fe7290b..5838a6d 100644 --- a/SubProject/FCM0000/FCM0000.csproj.user +++ b/SubProject/FCM0000/FCM0000.csproj.user @@ -9,5 +9,6 @@ ko-KR false + ProjectFiles \ No newline at end of file diff --git a/SubProject/FCM0000/Form1.Designer.cs b/SubProject/FCM0000/Form1.Designer.cs new file mode 100644 index 0000000..c7f4468 --- /dev/null +++ b/SubProject/FCM0000/Form1.Designer.cs @@ -0,0 +1,82 @@ +namespace FCM0000 +{ + partial class Form1 + { + /// + /// 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(); + this.htmlEditControl1 = new Zoople.HTMLEditControl(); + this.SuspendLayout(); + // + // htmlEditControl1 + // + this.htmlEditControl1.AcceptsReturn = true; + this.htmlEditControl1.BaseURL = null; + this.htmlEditControl1.CleanMSWordHTMLOnPaste = true; + this.htmlEditControl1.CodeEditor.Enabled = true; + this.htmlEditControl1.CodeEditor.Font = new System.Drawing.Font("Courier New", 10F); + this.htmlEditControl1.CodeEditor.Locked = false; + this.htmlEditControl1.CodeEditor.TabWidth = 720; + this.htmlEditControl1.CodeEditor.WordWrap = false; + this.htmlEditControl1.CSSText = null; + this.htmlEditControl1.DocumentHTML = null; + this.htmlEditControl1.EnableInlineSpelling = false; + this.htmlEditControl1.FontSizesList = null; + this.htmlEditControl1.FontsList = null; + this.htmlEditControl1.HiddenButtons = null; + this.htmlEditControl1.ImageStorageLocation = null; + this.htmlEditControl1.InCodeView = false; + this.htmlEditControl1.IndentAmount = 2; + this.htmlEditControl1.IndentsUseBlockuote = false; + this.htmlEditControl1.LanguageFile = null; + this.htmlEditControl1.LicenceActivationKey = null; + this.htmlEditControl1.LicenceKey = null; + this.htmlEditControl1.LicenceKeyInlineSpelling = null; + this.htmlEditControl1.Location = new System.Drawing.Point(41, 132); + this.htmlEditControl1.Name = "htmlEditControl1"; + this.htmlEditControl1.Size = new System.Drawing.Size(558, 249); + this.htmlEditControl1.TabIndex = 0; + this.htmlEditControl1.ToolstripImageScalingSize = new System.Drawing.Size(16, 16); + this.htmlEditControl1.UseParagraphAsDefault = true; + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.htmlEditControl1); + this.Name = "Form1"; + this.Text = "Form1"; + this.ResumeLayout(false); + + } + + #endregion + + private Zoople.HTMLEditControl htmlEditControl1; + } +} \ No newline at end of file diff --git a/SubProject/FCM0000/Form1.cs b/SubProject/FCM0000/Form1.cs new file mode 100644 index 0000000..319fda0 --- /dev/null +++ b/SubProject/FCM0000/Form1.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FCM0000 +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + } +} diff --git a/SubProject/FCM0000/Form1.resx b/SubProject/FCM0000/Form1.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FCM0000/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SubProject/FCM0000/Form2.Designer.cs b/SubProject/FCM0000/Form2.Designer.cs new file mode 100644 index 0000000..7d6bd99 --- /dev/null +++ b/SubProject/FCM0000/Form2.Designer.cs @@ -0,0 +1,39 @@ +namespace FCM0000 +{ + partial class Form2 + { + /// + /// 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(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "Form2"; + } + + #endregion + } +} \ No newline at end of file diff --git a/SubProject/FCM0000/Form2.cs b/SubProject/FCM0000/Form2.cs new file mode 100644 index 0000000..b6e1f3a --- /dev/null +++ b/SubProject/FCM0000/Form2.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FCM0000 +{ + public partial class Form2 : Form + { + public Form2() + { + InitializeComponent(); + } + } +} diff --git a/SubProject/FCM0000/Item/fLovItem.cs b/SubProject/FCM0000/Item/fLovItem.cs index beb9227..9799ab4 100644 --- a/SubProject/FCM0000/Item/fLovItem.cs +++ b/SubProject/FCM0000/Item/fLovItem.cs @@ -20,6 +20,7 @@ namespace FCM0000 public decimal itempriceD { get; set; } public string SID { get; set; } public string itemUnit { get; set; } + public string Storage { get; set; } public string itemSupply { get; set; } public int itemSupplyidx { get; set; } diff --git a/SubProject/FCM0000/Mail/fJRForm.cs b/SubProject/FCM0000/Mail/fJRForm.cs index ad14ec9..468b2d9 100644 --- a/SubProject/FCM0000/Mail/fJRForm.cs +++ b/SubProject/FCM0000/Mail/fJRForm.cs @@ -6,7 +6,6 @@ using System.Drawing; using System.Linq; using System.Text; using System.Windows.Forms; -using YARTE.UI.Buttons; namespace FCM0000 { diff --git a/SubProject/FCM0000/Mail/fMailform.Designer.cs b/SubProject/FCM0000/Mail/fMailform.Designer.cs index 2f98895..617fbe4 100644 --- a/SubProject/FCM0000/Mail/fMailform.Designer.cs +++ b/SubProject/FCM0000/Mail/fMailform.Designer.cs @@ -52,6 +52,7 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.mailFormBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.mailFormDataGridView = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,7 +69,8 @@ this.subjectTextBox = new System.Windows.Forms.TextBox(); this.ta = new FCM0000.DSMailTableAdapters.MailFormTableAdapter(); this.tam = new FCM0000.DSMailTableAdapters.TableAdapterManager(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); tolistLabel = new System.Windows.Forms.Label(); bccLabel = new System.Windows.Forms.Label(); ccLabel = new System.Windows.Forms.Label(); @@ -82,6 +84,7 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).BeginInit(); this.panel1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // tolistLabel @@ -133,7 +136,7 @@ // label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); label1.AutoSize = true; - label1.Location = new System.Drawing.Point(15, 457); + label1.Location = new System.Drawing.Point(15, 420); label1.Name = "label1"; label1.Size = new System.Drawing.Size(80, 12); label1.TabIndex = 24; @@ -143,7 +146,7 @@ // label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); label2.AutoSize = true; - label2.Location = new System.Drawing.Point(15, 523); + label2.Location = new System.Drawing.Point(15, 486); label2.Name = "label2"; label2.Size = new System.Drawing.Size(81, 12); label2.TabIndex = 26; @@ -235,6 +238,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -285,6 +289,16 @@ this.mailFormBindingNavigatorSaveItem.Text = "Save(&S)"; this.mailFormBindingNavigatorSaveItem.Click += new System.EventHandler(this.mailFormBindingNavigatorSaveItem_Click); // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(107, 22); + this.toolStripButton2.Text = "누락 항목 추가"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // mailFormDataGridView // this.mailFormDataGridView.AllowUserToAddRows = false; @@ -297,10 +311,10 @@ this.dataGridViewTextBoxColumn3}); this.mailFormDataGridView.DataSource = this.bs; this.mailFormDataGridView.Dock = System.Windows.Forms.DockStyle.Left; - this.mailFormDataGridView.Location = new System.Drawing.Point(0, 0); + this.mailFormDataGridView.Location = new System.Drawing.Point(0, 37); this.mailFormDataGridView.Name = "mailFormDataGridView"; this.mailFormDataGridView.RowTemplate.Height = 23; - this.mailFormDataGridView.Size = new System.Drawing.Size(317, 591); + this.mailFormDataGridView.Size = new System.Drawing.Size(317, 554); this.mailFormDataGridView.TabIndex = 2; this.mailFormDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.mailFormDataGridView_DataError); // @@ -338,9 +352,9 @@ this.panel1.Controls.Add(this.subjectTextBox); this.panel1.Controls.Add(bodyLabel); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(317, 0); + this.panel1.Location = new System.Drawing.Point(317, 37); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(516, 591); + this.panel1.Size = new System.Drawing.Size(516, 554); this.panel1.TabIndex = 3; // // textBox2 @@ -348,7 +362,7 @@ this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "exceptmailcc", true)); - this.textBox2.Location = new System.Drawing.Point(17, 538); + this.textBox2.Location = new System.Drawing.Point(17, 501); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(487, 46); @@ -359,7 +373,7 @@ this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "exceptmail", true)); - this.textBox1.Location = new System.Drawing.Point(17, 472); + this.textBox1.Location = new System.Drawing.Point(17, 435); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(487, 46); @@ -371,12 +385,13 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.htmlEditor1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.htmlEditor1.Html = resources.GetString("htmlEditor1.Html"); + this.htmlEditor1.Html = ""; this.htmlEditor1.Location = new System.Drawing.Point(74, 122); + this.htmlEditor1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.htmlEditor1.Name = "htmlEditor1"; this.htmlEditor1.ReadOnly = false; this.htmlEditor1.ShowToolbar = true; - this.htmlEditor1.Size = new System.Drawing.Size(430, 325); + this.htmlEditor1.Size = new System.Drawing.Size(430, 288); this.htmlEditor1.TabIndex = 23; this.htmlEditor1.Validated += new System.EventHandler(this.htmlEditor1_Validated); // @@ -468,15 +483,26 @@ this.tam.MailFormTableAdapter = this.ta; this.tam.UpdateOrder = FCM0000.DSMailTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // toolStripButton2 + // toolStrip1 // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(107, 22); - this.toolStripButton2.Text = "누락 항목 추가"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(833, 37); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(65, 34); + this.toolStripButton1.Text = "닫기"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); // // fMailform // @@ -486,6 +512,7 @@ this.Controls.Add(this.panel1); this.Controls.Add(this.mailFormDataGridView); this.Controls.Add(this.bn); + this.Controls.Add(this.toolStrip1); this.Name = "fMailform"; this.Text = "메일 양식"; this.Load += new System.EventHandler(this.fMailform_Load); @@ -497,6 +524,8 @@ ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -536,5 +565,7 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fMailform.cs b/SubProject/FCM0000/Mail/fMailform.cs index a3fd456..02a5365 100644 --- a/SubProject/FCM0000/Mail/fMailform.cs +++ b/SubProject/FCM0000/Mail/fMailform.cs @@ -110,5 +110,10 @@ namespace FCM0000 FCOMMON.Util.MsgI($"{cnt}건의 목록이 생성 되었습니다"); refreshData(); } + + private void toolStripButton1_Click_1(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/SubProject/FCM0000/Mail/fMailform.resx b/SubProject/FCM0000/Mail/fMailform.resx index ab6b8fc..d88a3f6 100644 --- a/SubProject/FCM0000/Mail/fMailform.resx +++ b/SubProject/FCM0000/Mail/fMailform.resx @@ -145,7 +145,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/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 @@ -163,7 +163,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/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 @@ -174,7 +174,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -183,7 +183,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -192,7 +192,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/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 @@ -203,7 +203,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -215,7 +215,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= @@ -237,18 +237,23 @@ 17, 17 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<HTML><HEAD> -<META content="text/html; charset=unicode" http-equiv=Content-Type> -<META name=GENERATOR content="MSHTML 11.00.10570.1001"></HEAD> -<BODY></BODY></HTML> - - 184, 17 246, 17 + + 440, 17 + + + + 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/FCM0000/Properties/Settings.Designer.cs b/SubProject/FCM0000/Properties/Settings.Designer.cs index e2bf4eb..7c7b452 100644 --- a/SubProject/FCM0000/Properties/Settings.Designer.cs +++ b/SubProject/FCM0000/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FCM0000.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/SubProject/FCM0000/Properties/Settings.settings b/SubProject/FCM0000/Properties/Settings.settings index c6a3672..d8c7092 100644 --- a/SubProject/FCM0000/Properties/Settings.settings +++ b/SubProject/FCM0000/Properties/Settings.settings @@ -4,7 +4,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> diff --git a/SubProject/FCM0000/app.config b/SubProject/FCM0000/app.config index 74bc421..eec51b1 100644 --- a/SubProject/FCM0000/app.config +++ b/SubProject/FCM0000/app.config @@ -3,7 +3,9 @@ - - + + diff --git a/SubProject/FEQ0000/DataBaseManager.cs b/SubProject/FEQ0000/DataBaseManager.cs index 638dbd0..aadf8f1 100644 --- a/SubProject/FEQ0000/DataBaseManager.cs +++ b/SubProject/FEQ0000/DataBaseManager.cs @@ -5,6 +5,215 @@ using System.Text; namespace FEQ0000 { + public static class UTIL_EQ0000 + { + public static string getmaxstr(string src, int len = 30) + { + if (src.Length > len) return src.Substring(0, len) + "..."; + else return src; + } + + public static string MakeDataTableToHTML(List rows, string savefilenamexls = "") + { + + libxl.Book book = null;// = new libxl.BinBook(); + libxl.Sheet sheet = null; + + + libxl.Format fTitle = null; + libxl.Format fDataStr = null; + libxl.Format fDataNum = null; + + if (savefilenamexls.isEmpty() == false) + { + book = new libxl.XmlBook(); + book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey); + sheet = book.addSheet("Data"); + + fTitle = book.addFormat(); + fDataStr = book.addFormat(); + fDataNum = book.addFormat(); + + fDataStr.alignH = libxl.AlignH.ALIGNH_CENTER; + fDataStr.alignV = libxl.AlignV.ALIGNV_CENTER; + fDataStr.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); + fDataStr.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; + fDataStr.patternForegroundColor = libxl.Color.COLOR_WHITE; + + fTitle.alignV = libxl.AlignV.ALIGNV_CENTER; + fTitle.alignH = libxl.AlignH.ALIGNH_CENTER; + fTitle.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); + fTitle.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; + fTitle.patternForegroundColor = libxl.Color.COLOR_GRAY25; + + fDataNum.alignH = libxl.AlignH.ALIGNH_GENERAL; + fDataNum.alignV = libxl.AlignV.ALIGNV_CENTER; + fDataNum.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); + fDataNum.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; + fDataNum.patternForegroundColor = libxl.Color.COLOR_WHITE; + + } + + //목록을 본문에 추가한다 + System.Text.StringBuilder sb = new StringBuilder(); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + + var row = 0; + var col = 0; + if (sheet != null) + { + var basewidth = 15; + sheet.setRow(row, 30); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "S/C", fTitle); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "자재번호", fTitle); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "청구자", fTitle); + sheet.setCol(col, (int)(basewidth * 2)); sheet.writeStr(row, col++, "품목", fTitle); + sheet.setCol(col, (int)(basewidth * 3)); sheet.writeStr(row, col++, "규격", fTitle); + sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "수량", fTitle); + sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "단가", fTitle); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "금액", fTitle); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "공급업체", fTitle); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "용도", fTitle); + sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "요청부서", fTitle); + + } + + + decimal totalamt = 0; + row = 1; + col = 0; + foreach (dsPurchase.EETGW_PurchaseEBRow dr in rows) + { + var s요청 = dr.IsrequestNameNull() ? "" : dr.requestName;// fpSpread1_Sheet1.Cells[i, col_요청].Value; + var sSID = dr.IssidNull() ? "" : dr.sid;// fpSpread1_Sheet1.Cells[i, col_SID].Value; + var s품명 = dr.IspumnameNull() ? "" : dr.pumname;// fpSpread1_Sheet1.Cells[i, col_품명].Value; + var s규격 = dr.IspumunitNull() ? "" : dr.pumunit;// fpSpread1_Sheet1.Cells[i, col_규격].Value; + var qty = dr.IspumqtyNull() ? 0 : dr.pumqty;// fpSpread1_Sheet1.Cells[i, col_수량].Value; + var price = dr.IspumpriceNull() ? 0 : dr.pumprice;// fpSpread1_Sheet1.Cells[i, col_단가].Value; + var amt = dr.IspumamtNull() ? 0 : dr.pumamt;// fpSpread1_Sheet1.Cells[i, col_금액].Value; + var s공급 = dr.IssupplyNull() ? "" : dr.supply;// fpSpread1_Sheet1.Cells[i, col_공급].Value; + var s비고 = dr.IsbigoNull() ? "" : dr.bigo;// fpSpread1_Sheet1.Cells[i, col_비고].Value; + var sSITE = dr.IssiteNull() ? "" : dr.site;// fpSpread1_Sheet1.Cells[i, col_site].Value; + var s분류 = dr.IsdeptNull() ? "" : dr.dept; + var sSC = dr.IsscNull() ? "" : dr.sc;// + + + totalamt += amt; + + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + + if (sheet != null) + { + col = 0; + sheet.setRow(row, 23); + sheet.writeStr(row, col++, sSC, fDataStr); + sheet.writeStr(row, col++, sSID, fDataStr); + sheet.writeStr(row, col++, s요청, fDataStr); + sheet.writeStr(row, col++, s품명, fDataStr); + sheet.writeStr(row, col++, s규격, fDataStr); + sheet.writeNum(row, col++, qty, fDataNum); + sheet.writeNum(row, col++, (int)price, fDataNum); + sheet.writeNum(row, col++, (int)amt, fDataNum); + sheet.writeStr(row, col++, s공급, fDataStr); + sheet.writeStr(row, col++, s비고, fDataStr); + sheet.writeStr(row, col++, "전자실", fDataStr); + row += 1; + } + + ////sb.AppendLine(""); + //''sb.AppendLine(""); + //sb.AppendLine(""); + //sb.AppendLine(""); + + + + sb.AppendLine(""); + } + + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + sb.AppendLine(""); + + sb.AppendLine(""); + sb.AppendLine("
      TOTAL{금액}  
SC자재번호청구자품목규격수량단가금액공급업체용도요청부서
" + getmaxstr(sSC) + "" + getmaxstr(sSID) + "" + getmaxstr(s요청) + "" + getmaxstr(s품명) + "" + getmaxstr(s규격) + "" + qty.ToString("N0") + "" + price.ToString("N0") + "" + amt.ToString("N0") + "" + getmaxstr(s공급) + "" + s비고 + "전자실" + getmaxstr(sSTIE) + "" + getmaxstr(s분류) + "" + getmaxstr(sCRCF) + "" + getmaxstr(s수령) + "
      TOTAL{금액} 
"); + + + if (sheet != null) + { + col = 0; + sheet.setRow(row, 30); + sheet.writeStr(row, col++, "합계", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeNum(row, col++, (int)totalamt, fTitle); + sheet.setMerge(row, row, col - 1, col); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + sheet.writeStr(row, col++, "", fTitle); + row += 1; + } + + + if (book != null) + { + try + { + book.save(savefilenamexls); + } + catch { } + } + return sb.ToString().Replace("{금액}", totalamt.ToString("N0")); + } + } public static class DatabaseManager { private static System.Data.SqlClient.SqlConnection getCn() diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 064f512..caad4d9 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -559,7 +559,7 @@ {58cfc90c-5068-46a2-a8de-0e92ee9e0990} AmkorRestfulService - + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs index 69c6d00..0a8539e 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs @@ -30,36 +30,37 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseEB)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType41 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType42 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType43 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType44 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType45 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType46 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType47 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType48 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType97 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType49 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType98 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType99 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType50 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType100 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager(); @@ -106,6 +107,7 @@ this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.exportDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.입고ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.추가ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -141,7 +143,6 @@ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -254,7 +255,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -381,7 +381,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -505,7 +504,7 @@ this.sC검색ToolStripMenuItem, this.cRCF검색ToolStripMenuItem}); this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(314, 464); + this.cm1.Size = new System.Drawing.Size(314, 442); // // columnSizeToolStripMenuItem // @@ -559,6 +558,13 @@ this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Size = new System.Drawing.Size(310, 6); // + // 상태일괄변경ToolStripMenuItem + // + this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem"; + this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); + this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경"; + this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click); + // // 입고ToolStripMenuItem // this.입고ToolStripMenuItem.Name = "입고ToolStripMenuItem"; @@ -655,7 +661,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(75, 37); this.dtSD.Text = "1982-11-23"; @@ -672,7 +677,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(75, 37); this.dtED.Text = "1982-11-23"; @@ -728,7 +732,6 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -839,287 +842,304 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 32; + this.fpSpread1_Sheet1.ColumnCount = 33; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "구매신청일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "보관소"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "SC#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "수령"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "SID#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "수량\r\n(요청)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "수량\r\n(구매)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "단가\r\n(해외)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "통화"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "합계금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "공급업체"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "SC#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "수령"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "SID#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "품명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "수량\r\n(요청)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "수량\r\n(구매)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "단가\r\n(해외)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "통화"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "합계금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "공급업체"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "비고(구매사유)\r\n(요청자)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "입고예정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "PO#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "비고\r\n(담당자)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "삭제됨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고(구매사유)\r\n(요청자)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "입고예정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "입고일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "PO#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "비고\r\n(담당자)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType81; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "구매신청일"; this.fpSpread1_Sheet1.Columns.Get(0).Tag = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType82; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 116F; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType83; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "site"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; + this.fpSpread1_Sheet1.Columns.Get(2).Tag = "site"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestName"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(3).Tag = "requestName"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 50F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#"; - this.fpSpread1_Sheet1.Columns.Get(4).Tag = "sc"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType84; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "dept"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "분류"; + this.fpSpread1_Sheet1.Columns.Get(3).Tag = "분류"; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 100F; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType85; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청"; + this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType86; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(5).Tag = "crcf"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#"; + this.fpSpread1_Sheet1.Columns.Get(5).Tag = "sc"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "수령"; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "SID#"; - this.fpSpread1_Sheet1.Columns.Get(7).Tag = "sid"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumname"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "pumname"; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumidx"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumscale"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "규격"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumscale"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumqtyReq"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "수량\r\n(요청)"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumqty"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - numberCellType3.DecimalPlaces = 0; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType87; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "SCR/CF"; + this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType88; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령"; + this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName"; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType89; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType90; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명"; + this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType41.DecimalPlaces = 0; + numberCellType41.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType41.MaximumValue = 2147483647D; + numberCellType41.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType41; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType91; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 119F; + numberCellType42.DecimalPlaces = 0; + numberCellType42.NegativeRed = true; + numberCellType42.NullDisplay = "--"; + numberCellType42.Separator = ","; + numberCellType42.ShowSeparator = true; + numberCellType42.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType42; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumqtyReq"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "수량\r\n(구매)"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 55F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "수량\r\n(요청)"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 119F; + numberCellType43.DecimalPlaces = 0; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType43; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - numberCellType4.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumpriceD"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "단가\r\n(해외)"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "currency"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "통화"; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "수량\r\n(구매)"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType92; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 119F; + numberCellType44.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType44; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumpriceD"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가\r\n(해외)"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 33F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(16).Tag = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - numberCellType6.DecimalPlaces = 0; - numberCellType6.MaximumValue = 9999999999999.99D; - numberCellType6.MinimumValue = -9999999999999.99D; - numberCellType6.NegativeRed = true; - numberCellType6.NullDisplay = "--"; - numberCellType6.Separator = ","; - numberCellType6.ShowSeparator = true; - numberCellType6.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType93; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "currency"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "통화"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 119F; + numberCellType45.DecimalPlaces = 0; + numberCellType45.MaximumValue = 9999999999999.99D; + numberCellType45.MinimumValue = -9999999999999.99D; + numberCellType45.NegativeRed = true; + numberCellType45.NullDisplay = "--"; + numberCellType45.Separator = ","; + numberCellType45.ShowSeparator = true; + numberCellType45.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType45; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "합계금액"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumamt"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(18).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "supply"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "공급업체"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "supply"; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supplyidx"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(19).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 119F; + numberCellType46.DecimalPlaces = 0; + numberCellType46.MaximumValue = 9999999999999.99D; + numberCellType46.MinimumValue = -9999999999999.99D; + numberCellType46.NegativeRed = true; + numberCellType46.NullDisplay = "--"; + numberCellType46.Separator = ","; + numberCellType46.ShowSeparator = true; + numberCellType46.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType46; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType94; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply"; + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체"; + this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.DecimalPlaces = 0; - numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType8.MaximumValue = 2147483647D; - numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "projectidx"; + numberCellType47.DecimalPlaces = 0; + numberCellType47.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType47.MaximumValue = 2147483647D; + numberCellType47.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType47; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(20).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; - textCellType14.WordWrap = true; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "비고(구매사유)\r\n(요청자)"; - this.fpSpread1_Sheet1.Columns.Get(21).Tag = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Width = 96F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "입고예정"; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType48.DecimalPlaces = 0; + numberCellType48.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType48.MaximumValue = 2147483647D; + numberCellType48.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType48; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(21).Tag = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 119F; + textCellType95.WordWrap = true; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType95; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "비고(구매사유)\r\n(요청자)"; + this.fpSpread1_Sheet1.Columns.Get(22).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "indate"; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType96; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(23).Tag = "indate"; - this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.NegativeRed = true; - numberCellType9.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "inqty"; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고예정"; + this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType97; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고수량"; - this.fpSpread1_Sheet1.Columns.Get(24).Tag = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일"; + this.fpSpread1_Sheet1.Columns.Get(24).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F; + numberCellType49.DecimalPlaces = 0; + numberCellType49.NegativeRed = true; + numberCellType49.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType49; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "PO#"; - this.fpSpread1_Sheet1.Columns.Get(25).Tag = "po"; - this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - textCellType18.WordWrap = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "chkremark"; - this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "비고\r\n(담당자)"; - this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "삭제됨"; - this.fpSpread1_Sheet1.Columns.Get(27).Tag = "isdel"; - this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(28).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(28).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(28).Tag = "idx"; - this.fpSpread1_Sheet1.Columns.Get(28).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고수량"; + this.fpSpread1_Sheet1.Columns.Get(25).Tag = "inqty"; + this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType98; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "po"; + this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "PO#"; + this.fpSpread1_Sheet1.Columns.Get(26).Tag = "po"; + this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F; + textCellType99.WordWrap = true; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType99; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "chkremark"; + this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "비고\r\n(담당자)"; + this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType5; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨"; + this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel"; + this.fpSpread1_Sheet1.Columns.Get(28).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(29).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "conf_status"; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType50; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(29).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(29).Tag = "conf_status"; + this.fpSpread1_Sheet1.Columns.Get(29).Tag = "idx"; this.fpSpread1_Sheet1.Columns.Get(29).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(29).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(30).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(30).DataField = "conf_request"; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType100; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "conf_status"; this.fpSpread1_Sheet1.Columns.Get(30).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(30).Tag = "conf_request"; + this.fpSpread1_Sheet1.Columns.Get(30).Tag = "conf_status"; this.fpSpread1_Sheet1.Columns.Get(30).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(30).Width = 119F; this.fpSpread1_Sheet1.Columns.Get(31).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType100; + this.fpSpread1_Sheet1.Columns.Get(31).DataField = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(31).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(31).Tag = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(31).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(31).Width = 119F; + this.fpSpread1_Sheet1.Columns.Get(32).BackColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType100; + this.fpSpread1_Sheet1.Columns.Get(32).DataField = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(32).ForeColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(32).Tag = "conf_reponse"; + this.fpSpread1_Sheet1.Columns.Get(32).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(32).Width = 119F; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; @@ -1151,13 +1171,6 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // 상태일괄변경ToolStripMenuItem - // - this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem"; - this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); - this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경"; - this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click); - // // fPurchaseEB // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1267,9 +1280,9 @@ private System.Windows.Forms.ToolStripMenuItem 엑셀에서열기ToolStripMenuItem; private dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter ta; private System.Windows.Forms.ToolStripButton toolStripButton8; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem 현재목록메일전송ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs index 8cb53c6..c2da729 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs @@ -14,6 +14,8 @@ using NetOffice.OutlookApi.Enums; using FEQ0000.Purchase; using FCOMMON; using NetOffice.OfficeApi; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using FarPoint.Win.Spread; namespace FEQ0000 { @@ -119,8 +121,8 @@ namespace FEQ0000 foreach (var item in stList) cmbState.Items.Add(item.Value); cmbState.Items.Add("<=Received"); - this.cmbState.SelectedIndex = 0; - + this.cmbState.SelectedIndex = 0; + //all기본 - 양진원 //this.cmbCr.SelectedIndex = 1; @@ -146,7 +148,7 @@ namespace FEQ0000 foreach (FarPoint.Win.Spread.Column col in fpSpread1.ActiveSheet.Columns) col.Locked = true; } - + refreshData(); //열표시여부를 설정 @@ -194,7 +196,7 @@ namespace FEQ0000 { cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)"; } - + if (cmbState.SelectedIndex != 0) { if (cmbState.Text.ToUpper() == "<=RECEIVED") @@ -255,7 +257,7 @@ namespace FEQ0000 var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index; var crcfindex = this.fpSpread1.ActiveSheet.Columns["crcf"].Index; var prjindex = this.fpSpread1.ActiveSheet.Columns["projectidx"].Index; - var cstsindex = this.fpSpread1.ActiveSheet.Columns["conf_status"].Index; + var cstsindex = this.fpSpread1.ActiveSheet.Columns["conf_status"].Index; for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { @@ -927,12 +929,7 @@ namespace FEQ0000 } - string getmaxstr(string src, int len = 30) - { - if (src.Length > len) return src.Substring(0, len) + "..."; - else return src; - } - + List ChangeMailAddress(List userid) { var db = new DataClasses1DataContext(); @@ -1019,7 +1016,7 @@ namespace FEQ0000 private void 입고품목메일전송ToolStripMenuItem_Click(object sender, EventArgs e) { var cate = "PF"; - + var db = new DataClasses1DataContext(); var dr = db.MailForm.Where(t => t.cate == cate).FirstOrDefault(); @@ -1079,117 +1076,31 @@ namespace FEQ0000 newMail.To = string.Join(";", tolist.ToArray()); newMail.CC = string.Join(";", cclist.ToArray()); newMail.BCC = string.Join(";", bcclist.ToArray()); + string fn = ""; if (f.chkAttach.Checked) { var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\PurchaseEB_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls"); if (fi.Directory.Exists == false) fi.Directory.Create(); + fn = fi.FullName; ///save file - fpSpread1.SaveExcel(fi.FullName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed - | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered - | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); + //fpSpread1.SaveExcel(fi.FullName, + // FarPoint.Excel.ExcelSaveFlags.SaveAsViewed + // | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered + // | FarPoint.Excel.ExcelSaveFlags.NoFormulas + // | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - newMail.Attachments.Add(fi.FullName); } + var rows = this.GetDatarows(); + var tabledata = UTIL_EQ0000.MakeDataTableToHTML(rows,fn); if (f.chkList.Checked) { - //목록을 본문에 추가한다 - System.Text.StringBuilder sb = new StringBuilder(); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - - var col_신청 = fpSpread1_Sheet1.Columns["pdate"].Index; - var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index; - var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index; - - var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index; - var col_SID = fpSpread1_Sheet1.Columns["sid"].Index; - var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index; - var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index; - var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index; - var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index; - var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index; - var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index; - var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index; - - - for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++) - { - var v신청 = fpSpread1_Sheet1.Cells[i, col_신청].Value; - var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value; - var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value; - - var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value; - var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value; - var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value; - var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value; - var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value; - var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value; - var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value; - var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value; - var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value; - - var s신청 = String.Empty; - var s요청 = String.Empty; - var sCRCF = String.Empty; - var s수령 = String.Empty; - var sSID = String.Empty; - var s품명 = String.Empty; - var s규격 = String.Empty; - var s수량 = "0"; - var s단가 = "0"; - var s금액 = "0"; - var s입고 = String.Empty; - var s공급 = String.Empty; - var s비고 = String.Empty; - - if (v신청 != null) s신청 = v신청.ToString(); - if (v요청 != null) s요청 = v요청.ToString(); - if (vCRCF != null) sCRCF = vCRCF.ToString(); - if (v수령 != null) s수령 = v수령.ToString(); - if (vSID != null) sSID = vSID.ToString(); - if (v품명 != null) s품명 = v품명.ToString(); - if (v규격 != null) s규격 = v규격.ToString(); - if (v수량 != null) s수량 = v수량.ToString(); - if (v단가 != null) s단가 = v단가.ToString(); - if (v금액 != null) s금액 = v금액.ToString(); - if (v공급 != null) s공급 = v공급.ToString(); - - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - sb.AppendLine(""); - - sb.AppendLine(""); - } - sb.AppendLine(""); - sb.AppendLine("
신청요청CR/CF수령SID품명규격수량단가금액공급
" + getmaxstr(s신청) + "" + getmaxstr(s요청) + "" + getmaxstr(sCRCF) + "" + getmaxstr(s수령) + "" + getmaxstr(sSID) + "" + getmaxstr(s품명) + "" + getmaxstr(s규격) + "" + int.Parse(s수량).ToString("N0") + "" + int.Parse(s단가).ToString("N0") + "" + int.Parse(s금액).ToString("N0") + "" + getmaxstr(s공급) + "
"); - form_body += sb.ToString(); + form_body += tabledata; } + if (fn.isEmpty() == false) + newMail.Attachments.Add(fn); + //newMail.BodyFormat = OlBodyFormat.olFormatHTML; form_body = form_body.Replace("{DATE}", datestr); newMail.HTMLBody = form_body + newMail.HTMLBody; // @@ -1201,6 +1112,276 @@ namespace FEQ0000 } } + //string MakeDataTableToHTML(string savefilenamexls = "") + //{ + + // libxl.Book book = null;// = new libxl.BinBook(); + // libxl.Sheet sheet = null; + + + // libxl.Format fTitle = null; + // libxl.Format fDataStr = null; + // libxl.Format fDataNum = null; + + // if (savefilenamexls.isEmpty() == false) + // { + // book = new libxl.XmlBook(); + // book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey); + // sheet = book.addSheet("Data"); + + // fTitle = book.addFormat(); + // fDataStr = book.addFormat(); + // fDataNum = book.addFormat(); + + // fDataStr.alignH = libxl.AlignH.ALIGNH_CENTER; + // fDataStr.alignV = libxl.AlignV.ALIGNV_CENTER; + // fDataStr.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); + // fDataStr.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; + // fDataStr.patternForegroundColor = libxl.Color.COLOR_WHITE; + + // fTitle.alignV = libxl.AlignV.ALIGNV_CENTER; + // fTitle.alignH = libxl.AlignH.ALIGNH_CENTER; + // fTitle.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); + // fTitle.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; + // fTitle.patternForegroundColor = libxl.Color.COLOR_GRAY25; + + // fDataNum.alignH = libxl.AlignH.ALIGNH_GENERAL; + // fDataNum.alignV = libxl.AlignV.ALIGNV_CENTER; + // fDataNum.setBorder(libxl.BorderStyle.BORDERSTYLE_THIN); + // fDataNum.fillPattern = libxl.FillPattern.FILLPATTERN_SOLID; + // fDataNum.patternForegroundColor = libxl.Color.COLOR_WHITE; + + // } + + // //목록을 본문에 추가한다 + // System.Text.StringBuilder sb = new StringBuilder(); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + + // var row = 0; + // var col = 0; + // if (sheet != null) + // { + // var basewidth = 15; + // sheet.setRow(row, 30); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "S/C", fTitle); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "자재번호", fTitle); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "청구자", fTitle); + // sheet.setCol(col, (int)(basewidth * 2)); sheet.writeStr(row, col++, "품목", fTitle); + // sheet.setCol(col, (int)(basewidth * 3)); sheet.writeStr(row, col++, "규격", fTitle); + // sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "수량", fTitle); + // sheet.setCol(col, (int)(basewidth * 0.5)); sheet.writeStr(row, col++, "단가", fTitle); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "금액", fTitle); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "공급업체", fTitle); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "용도", fTitle); + // sheet.setCol(col, basewidth); sheet.writeStr(row, col++, "요청부서", fTitle); + + // } + + + + // var col_신청일 = fpSpread1_Sheet1.Columns["pdate"].Index; + // var col_요청 = fpSpread1_Sheet1.Columns["requestName"].Index; + // var col_CRLF = fpSpread1_Sheet1.Columns["crcf"].Index; + + // var col_수령 = fpSpread1_Sheet1.Columns["receiveName"].Index; + // var col_SID = fpSpread1_Sheet1.Columns["sid"].Index; + // var col_품명 = fpSpread1_Sheet1.Columns["pumname"].Index; + // var col_규격 = fpSpread1_Sheet1.Columns["pumscale"].Index; + // var col_수량 = fpSpread1_Sheet1.Columns["pumqty"].Index; + // var col_단가 = fpSpread1_Sheet1.Columns["pumprice"].Index; + // var col_금액 = fpSpread1_Sheet1.Columns["pumamt"].Index; + // var col_공급 = fpSpread1_Sheet1.Columns["supply"].Index; + // var col_비고 = fpSpread1_Sheet1.Columns["bigo"].Index; + + // var col_site = fpSpread1_Sheet1.Columns["site"].Index; + // var col_분류 = fpSpread1_Sheet1.Columns["분류"].Index; + // var col_sc = fpSpread1_Sheet1.Columns["sc"].Index; + + // int totalamt = 0; + // row = 1; + // col = 0; + // for (int i = 0; i < this.fpSpread1_Sheet1.RowCount; i++) + // { + // var v신청일 = fpSpread1_Sheet1.Cells[i, col_신청일].Value; + // var v요청 = fpSpread1_Sheet1.Cells[i, col_요청].Value; + // var vCRCF = fpSpread1_Sheet1.Cells[i, col_CRLF].Value; + + // var v수령 = fpSpread1_Sheet1.Cells[i, col_수령].Value; + // var vSID = fpSpread1_Sheet1.Cells[i, col_SID].Value; + // var v품명 = fpSpread1_Sheet1.Cells[i, col_품명].Value; + // var v규격 = fpSpread1_Sheet1.Cells[i, col_규격].Value; + // var v수량 = fpSpread1_Sheet1.Cells[i, col_수량].Value; + // var v단가 = fpSpread1_Sheet1.Cells[i, col_단가].Value; + // var v금액 = fpSpread1_Sheet1.Cells[i, col_금액].Value; + // var v공급 = fpSpread1_Sheet1.Cells[i, col_공급].Value; + // var v비고 = fpSpread1_Sheet1.Cells[i, col_비고].Value; + + // var vSITE = fpSpread1_Sheet1.Cells[i, col_site].Value; + // var v분류 = fpSpread1_Sheet1.Cells[i, col_분류].Value; + // var vsc = fpSpread1_Sheet1.Cells[i, col_sc].Value; + + // var s신청일 = String.Empty; + // var s요청 = String.Empty; + // var sCRCF = String.Empty; + // var s수령 = String.Empty; + // var sSID = String.Empty; + // var s품명 = String.Empty; + // var s규격 = String.Empty; + // var s수량 = "0"; + // var s단가 = "0"; + // var s금액 = "0"; + // var s입고 = String.Empty; + // var s공급 = String.Empty; + // var s비고 = String.Empty; + // var sSTIE = string.Empty; + // var s분류 = string.Empty; + // var sSC = string.Empty; + + // if (v신청일 != null) s신청일 = v신청일.ToString(); + // if (v요청 != null) s요청 = v요청.ToString(); + // if (vCRCF != null) sCRCF = vCRCF.ToString(); + // if (v수령 != null) s수령 = v수령.ToString(); + // if (vSID != null) sSID = vSID.ToString(); + // if (v품명 != null) s품명 = v품명.ToString(); + // if (v규격 != null) s규격 = v규격.ToString(); + // if (v수량 != null) s수량 = v수량.ToString(); + // if (v단가 != null) s단가 = v단가.ToString(); + // if (v금액 != null) s금액 = v금액.ToString(); + // if (v공급 != null) s공급 = v공급.ToString(); + // if (vSITE != null) sSTIE = vSITE.ToString(); + // if (v분류 != null) s분류 = v분류.ToString(); + // if (vsc != null) sSC = vsc.ToString(); + + + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + + + // var qty = int.Parse(s수량); + // var price = int.Parse(s단가); + // var amt = int.Parse(s금액); + // totalamt += amt; + + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + + // if (sheet != null) + // { + // col = 0; + // sheet.setRow(row, 23); + // sheet.writeStr(row, col++, sSC, fDataStr); + // sheet.writeStr(row, col++, sSID, fDataStr); + // sheet.writeStr(row, col++, s요청, fDataStr); + // sheet.writeStr(row, col++, s품명, fDataStr); + // sheet.writeStr(row, col++, s규격, fDataStr); + // sheet.writeNum(row, col++, qty, fDataNum); + // sheet.writeNum(row, col++, price, fDataNum); + // sheet.writeNum(row, col++, amt, fDataNum); + // sheet.writeStr(row, col++, s공급, fDataStr); + // sheet.writeStr(row, col++, s비고, fDataStr); + // sheet.writeStr(row, col++, "전자실", fDataStr); + // row += 1; + // } + + // ////sb.AppendLine(""); + // //''sb.AppendLine(""); + // //sb.AppendLine(""); + // //sb.AppendLine(""); + + + + // sb.AppendLine(""); + // } + + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + // sb.AppendLine(""); + + // sb.AppendLine(""); + // sb.AppendLine("
      TOTAL{금액} 
SC자재번호청구자품목규격수량단가금액공급업체용도요청부서
SC자재번호청구자품목규격수량단가금액공급업체요청부서
" + getmaxstr(sSC) + "" + getmaxstr(sSID) + "" + getmaxstr(s요청) + "" + getmaxstr(s품명) + "" + getmaxstr(s규격) + "" + qty.ToString("N0") + "" + price.ToString("N0") + "" + amt.ToString("N0") + "" + getmaxstr(s공급) + "" + s비고 + "전자실" + getmaxstr(sSTIE) + "" + getmaxstr(s분류) + "" + getmaxstr(sCRCF) + "" + getmaxstr(s수령) + "
      TOTAL{금액} 
"); + + + // if (sheet != null) + // { + // col = 0; + // sheet.setRow(row, 30); + // sheet.writeStr(row, col++, "합계", fTitle); + // sheet.writeStr(row, col++, "", fTitle); + // sheet.writeStr(row, col++, "", fTitle); + // sheet.writeStr(row, col++, "", fTitle); + // sheet.writeStr(row, col++, "", fTitle); + // sheet.writeStr(row, col++, "", fTitle); + // sheet.writeStr(row, col++, "", fTitle); + // sheet.writeNum(row, col++, totalamt, fTitle); + // sheet.setMerge(row, row, col - 1, col + 2); + // row += 1; + // } + + + // if (book != null) + // { + // try + // { + // book.save(savefilenamexls); + // } + // catch { } + // } + // return sb.ToString().Replace("{금액}", totalamt.ToString("N0")); + //} + + + private void toolStripButton3_Click_1(object sender, EventArgs e) { var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "PurcManual.pdf"); @@ -1264,7 +1445,7 @@ namespace FEQ0000 func_ipgo(); } - + private void 엑셀에서열기ToolStripMenuItem_Click(object sender, EventArgs e) { var fn = DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls"; @@ -1292,10 +1473,9 @@ namespace FEQ0000 } - private void toolStripButton8_Click(object sender, EventArgs e) + List GetDatarows() { - - + List rows = new List(); //선택된 자료의 데이터를 추출한다. var selected = this.fpSpread1_Sheet1.GetSelections(); //선택된 개체확인 List rowidxs = new List(); @@ -1327,7 +1507,7 @@ namespace FEQ0000 } //수집된데이터를 보내야한다. - List rows = new List(); + var idx = 0; foreach (var i in rowidxs) { @@ -1335,6 +1515,14 @@ namespace FEQ0000 var row = this.dsPurchase.EETGW_PurchaseEB.Where(t => t.idx == rowidx).First(); rows.Add(row); } + return rows; + + } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + //수집된데이터를 보내야한다. + var rows = GetDatarows(); //이자료를 승인요청창에 보낸다. if (rows.Any() == false) @@ -1503,17 +1691,17 @@ namespace FEQ0000 if (v공급 != null) s공급 = v공급.ToString(); sb.AppendLine(""); - sb.AppendLine("" + getmaxstr(s신청) + ""); - sb.AppendLine("" + getmaxstr(s요청) + ""); - sb.AppendLine("" + getmaxstr(sCRCF) + ""); - sb.AppendLine("" + getmaxstr(s수령) + ""); - sb.AppendLine("" + getmaxstr(sSID) + ""); - sb.AppendLine("" + getmaxstr(s품명) + ""); - sb.AppendLine("" + getmaxstr(s규격) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(s신청) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(s요청) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(sCRCF) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(s수령) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(sSID) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(s품명) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(s규격) + ""); sb.AppendLine("" + int.Parse(s수량).ToString("N0") + ""); sb.AppendLine("" + int.Parse(s단가).ToString("N0") + ""); sb.AppendLine("" + int.Parse(s금액).ToString("N0") + ""); - sb.AppendLine("" + getmaxstr(s공급) + ""); + sb.AppendLine("" + UTIL_EQ0000.getmaxstr(s공급) + ""); sb.AppendLine(""); } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx index a0bb9b7..1b063da 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.resx @@ -294,6 +294,20 @@ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= @@ -333,20 +347,6 @@ oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA Ow== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX - EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl - 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR - BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT - Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz - tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV - iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i - DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA - AAAASUVORK5CYII= diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs index effd183..d94a13a 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs @@ -49,6 +49,7 @@ System.Windows.Forms.Label label15; System.Windows.Forms.Label label9; System.Windows.Forms.Label label18; + System.Windows.Forms.Label label2; this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -71,7 +72,8 @@ this.chkInDate = new System.Windows.Forms.CheckBox(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.tbStorage = new System.Windows.Forms.ComboBox(); + this.cmbDept = new System.Windows.Forms.ComboBox(); + this.cmbSite = new System.Windows.Forms.ComboBox(); this.cmbRemark = new System.Windows.Forms.ComboBox(); this.cmbCurrency = new System.Windows.Forms.ComboBox(); this.tbQtyReal = new System.Windows.Forms.TextBox(); @@ -80,6 +82,8 @@ this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.dtExpDate = new System.Windows.Forms.DateTimePicker(); + this.chkExp = new System.Windows.Forms.CheckBox(); this.button7 = new System.Windows.Forms.Button(); this.tbInQty = new System.Windows.Forms.TextBox(); this.button6 = new System.Windows.Forms.Button(); @@ -91,8 +95,6 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.dtExpDate = new System.Windows.Forms.DateTimePicker(); - this.chkExp = new System.Windows.Forms.CheckBox(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -112,6 +114,7 @@ label15 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); label18 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -254,12 +257,12 @@ // label10 // label10.AutoSize = true; - label10.Location = new System.Drawing.Point(287, 237); + label10.Location = new System.Drawing.Point(299, 237); label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label10.Name = "label10"; - label10.Size = new System.Drawing.Size(54, 20); + label10.Size = new System.Drawing.Size(37, 20); label10.TabIndex = 23; - label10.Text = "보관소"; + label10.Text = "SITE"; // // label11 // @@ -314,6 +317,16 @@ label18.TabIndex = 51; label18.Text = "\\"; // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(298, 272); + label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(39, 20); + label2.TabIndex = 53; + label2.Text = "분류"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(115, 151); @@ -543,7 +556,9 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.tbStorage); + this.groupBox1.Controls.Add(this.cmbDept); + this.groupBox1.Controls.Add(label2); + this.groupBox1.Controls.Add(this.cmbSite); this.groupBox1.Controls.Add(label18); this.groupBox1.Controls.Add(this.cmbRemark); this.groupBox1.Controls.Add(this.cmbCurrency); @@ -589,20 +604,34 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; // - // tbStorage + // cmbDept // - this.tbStorage.FormattingEnabled = true; - this.tbStorage.ImeMode = System.Windows.Forms.ImeMode.Alpha; - this.tbStorage.Items.AddRange(new object[] { + this.cmbDept.FormattingEnabled = true; + this.cmbDept.ImeMode = System.Windows.Forms.ImeMode.Alpha; + this.cmbDept.Items.AddRange(new object[] { "NR", "SPR", "전자실"}); - this.tbStorage.Location = new System.Drawing.Point(345, 233); - this.tbStorage.Margin = new System.Windows.Forms.Padding(4); - this.tbStorage.Name = "tbStorage"; - this.tbStorage.Size = new System.Drawing.Size(129, 28); - this.tbStorage.TabIndex = 52; - this.tbStorage.SelectedIndexChanged += new System.EventHandler(this.tbStorage_SelectedIndexChanged); + this.cmbDept.Location = new System.Drawing.Point(344, 268); + this.cmbDept.Margin = new System.Windows.Forms.Padding(4); + this.cmbDept.Name = "cmbDept"; + this.cmbDept.Size = new System.Drawing.Size(129, 28); + this.cmbDept.TabIndex = 54; + // + // cmbSite + // + this.cmbSite.FormattingEnabled = true; + this.cmbSite.ImeMode = System.Windows.Forms.ImeMode.Alpha; + this.cmbSite.Items.AddRange(new object[] { + "NR", + "SPR", + "전자실"}); + this.cmbSite.Location = new System.Drawing.Point(345, 233); + this.cmbSite.Margin = new System.Windows.Forms.Padding(4); + this.cmbSite.Name = "cmbSite"; + this.cmbSite.Size = new System.Drawing.Size(129, 28); + this.cmbSite.TabIndex = 52; + this.cmbSite.SelectedIndexChanged += new System.EventHandler(this.tbStorage_SelectedIndexChanged); // // cmbRemark // @@ -709,6 +738,28 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; // + // dtExpDate + // + this.dtExpDate.Location = new System.Drawing.Point(115, 20); + this.dtExpDate.Margin = new System.Windows.Forms.Padding(4); + this.dtExpDate.Name = "dtExpDate"; + this.dtExpDate.Size = new System.Drawing.Size(286, 27); + this.dtExpDate.TabIndex = 1; + this.dtExpDate.TabStop = false; + // + // chkExp + // + this.chkExp.AutoSize = true; + this.chkExp.Location = new System.Drawing.Point(35, 24); + this.chkExp.Margin = new System.Windows.Forms.Padding(4); + this.chkExp.Name = "chkExp"; + this.chkExp.Size = new System.Drawing.Size(73, 24); + this.chkExp.TabIndex = 0; + this.chkExp.TabStop = false; + this.chkExp.Text = "예상일"; + this.chkExp.UseVisualStyleBackColor = true; + this.chkExp.CheckedChanged += new System.EventHandler(this.chkExp_CheckedChanged); + // // button7 // this.button7.Location = new System.Drawing.Point(15, 313); @@ -787,28 +838,6 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // - // dtExpDate - // - this.dtExpDate.Location = new System.Drawing.Point(115, 20); - this.dtExpDate.Margin = new System.Windows.Forms.Padding(4); - this.dtExpDate.Name = "dtExpDate"; - this.dtExpDate.Size = new System.Drawing.Size(286, 27); - this.dtExpDate.TabIndex = 1; - this.dtExpDate.TabStop = false; - // - // chkExp - // - this.chkExp.AutoSize = true; - this.chkExp.Location = new System.Drawing.Point(35, 24); - this.chkExp.Margin = new System.Windows.Forms.Padding(4); - this.chkExp.Name = "chkExp"; - this.chkExp.Size = new System.Drawing.Size(73, 24); - this.chkExp.TabIndex = 0; - this.chkExp.TabStop = false; - this.chkExp.Text = "예상일"; - this.chkExp.UseVisualStyleBackColor = true; - this.chkExp.CheckedChanged += new System.EventHandler(this.chkExp_CheckedChanged); - // // fPurchaseEB_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -882,8 +911,9 @@ private System.Windows.Forms.TextBox tbQtyReal; private System.Windows.Forms.ComboBox cmbCurrency; private System.Windows.Forms.ComboBox cmbRemark; - private System.Windows.Forms.ComboBox tbStorage; + private System.Windows.Forms.ComboBox cmbSite; private System.Windows.Forms.DateTimePicker dtExpDate; private System.Windows.Forms.CheckBox chkExp; + private System.Windows.Forms.ComboBox cmbDept; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs index 5567c0a..84d5cba 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs @@ -98,29 +98,18 @@ namespace FEQ0000 this.cmbState.ValueMember = "Value"; this.cmbState.DataSource = stateList; - ////costcenter - //var LstCost = FCOMMON.DBM.getCodeTable("68"); - //this.tbCostCenter.DisplayMember = "Value"; - //this.tbCostCenter.ValueMember = "Value"; - //this.tbCostCenter.DataSource = LstCost; + //전자실분류 + var LstCost = FCOMMON.DBM.getCodeTable("71"); + this.cmbDept.DisplayMember = "Value"; + this.cmbDept.ValueMember = "Value"; + this.cmbDept.DataSource = LstCost; - ////line - //var LstLine = FCOMMON.DBM.getCodeTable("67"); - //this.tbLineCode.DisplayMember = "Value"; - //this.tbLineCode.ValueMember = "Value"; - //this.tbLineCode.DataSource = LstLine; + //SITE + var LstLine = FCOMMON.DBM.getCodeTable("23"); + this.cmbSite.DisplayMember = "Value"; + this.cmbSite.ValueMember = "Value"; + this.cmbSite.DataSource = LstLine; - ////구매-담당 - //var LstMan = FCOMMON.DBM.getCodeTable("65"); - //this.tbManager.DisplayMember = "Value"; - //this.tbManager.ValueMember = "Value"; - //this.tbManager.DataSource = LstMan; - - ////구매-승인 - //var LstAdm = FCOMMON.DBM.getCodeTable("66"); - //this.tbAdmin.DisplayMember = "Value"; - //this.tbAdmin.ValueMember = "Value"; - //this.tbAdmin.DataSource = LstAdm; //통화 var LstCur = FCOMMON.DBM.getCodeTable("69"); @@ -242,7 +231,7 @@ namespace FEQ0000 tbSupplyIndex.Text = dr.supplyidx.ToString(); cmbState.Text = dr.state; - tbStorage.Text = dr.place; + cmbSite.Text = dr.site; tbSC.Text = dr.sc; tbPO.Text = dr.po; @@ -401,7 +390,7 @@ namespace FEQ0000 this.tbSID.Text = f.SID; this.tbSID.Tag = f.SID; this.tbPumUnit.Text = f.itemUnit; //181214 - this.tbStorage.Text = f.Storage; + //''this.tbSite.Text = f.tbsi; this.tbPumModel.Enabled = this.tbPumModel.Text.isEmpty(); this.tbPumUnit.Enabled = false; @@ -508,11 +497,11 @@ namespace FEQ0000 } - if (tbStorage.Text.Equals("SPR")) - { - if (FCOMMON.Util.MsgQ("SPR 항목입니다. 저장할까요?") != DialogResult.Yes) - return false; - } + //if (tbSite.Text.Equals("SPR")) + //{ + // if (FCOMMON.Util.MsgQ("SPR 항목입니다. 저장할까요?") != DialogResult.Yes) + // return false; + //} if (chkInDate.Checked) { @@ -591,6 +580,7 @@ namespace FEQ0000 dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text); dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); dr.currency = cmbCurrency.Text.Trim(); + dr.place = "전자실"; if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) { @@ -628,7 +618,7 @@ namespace FEQ0000 dr.pumunit = tbPumUnit.Text; dr.supply = tbSupply.Text; - dr.place = tbStorage.Text; + dr.site = cmbSite.Text; if (tbSupplyIndex.Text == "") dr.SetsupplyidxNull(); diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx index c5539de..cad3f7a 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx @@ -191,6 +191,9 @@ False + + False + * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.Designer.cs index 33553b7..76309c7 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.Designer.cs @@ -59,25 +59,22 @@ this.btFind = new System.Windows.Forms.ToolStripButton(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.requestNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumnameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumscaleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumunitDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumqtyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumqtyReqDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumpriceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pumamtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.supplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bigo2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.bigoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.ta = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter(); + this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.requestNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pumnameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pumscaleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pumqtyReqDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pumpriceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pumamtDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bigoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.supplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bigo2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -100,8 +97,10 @@ // tam // this.tam.BackupDataSetBeforeUpdate = true; + this.tam.Connection = null; this.tam.EETGW_PurchaseCRTableAdapter = null; this.tam.EETGW_PurchaseEBTableAdapter = null; + this.tam.PurchaseTableAdapter = null; this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // bn @@ -299,19 +298,16 @@ this.dataGridView1.AutoGenerateColumns = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.pdateDataGridViewTextBoxColumn, - this.requestNameDataGridViewTextBoxColumn, this.sidDataGridViewTextBoxColumn, + this.requestNameDataGridViewTextBoxColumn, this.pumnameDataGridViewTextBoxColumn, this.pumscaleDataGridViewTextBoxColumn, - this.pumunitDataGridViewTextBoxColumn, - this.pumqtyDataGridViewTextBoxColumn, this.pumqtyReqDataGridViewTextBoxColumn, this.pumpriceDataGridViewTextBoxColumn, this.pumamtDataGridViewTextBoxColumn, + this.bigoDataGridViewTextBoxColumn, this.supplyDataGridViewTextBoxColumn, - this.bigo2DataGridViewTextBoxColumn, - this.bigoDataGridViewTextBoxColumn}); + this.bigo2DataGridViewTextBoxColumn}); this.dataGridView1.DataSource = this.bs; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; @@ -328,93 +324,6 @@ this.dataGridView1.Size = new System.Drawing.Size(1219, 426); this.dataGridView1.TabIndex = 8; // - // pdateDataGridViewTextBoxColumn - // - this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; - this.pdateDataGridViewTextBoxColumn.HeaderText = "요청일"; - this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; - // - // requestNameDataGridViewTextBoxColumn - // - this.requestNameDataGridViewTextBoxColumn.DataPropertyName = "requestName"; - this.requestNameDataGridViewTextBoxColumn.HeaderText = "구매신청"; - this.requestNameDataGridViewTextBoxColumn.Name = "requestNameDataGridViewTextBoxColumn"; - this.requestNameDataGridViewTextBoxColumn.ReadOnly = true; - // - // sidDataGridViewTextBoxColumn - // - this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid"; - this.sidDataGridViewTextBoxColumn.HeaderText = "SID"; - this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn"; - // - // pumnameDataGridViewTextBoxColumn - // - this.pumnameDataGridViewTextBoxColumn.DataPropertyName = "pumname"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.pumnameDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; - this.pumnameDataGridViewTextBoxColumn.HeaderText = "품명"; - this.pumnameDataGridViewTextBoxColumn.Name = "pumnameDataGridViewTextBoxColumn"; - // - // pumscaleDataGridViewTextBoxColumn - // - this.pumscaleDataGridViewTextBoxColumn.DataPropertyName = "pumscale"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.pumscaleDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; - this.pumscaleDataGridViewTextBoxColumn.HeaderText = "모델/규격"; - this.pumscaleDataGridViewTextBoxColumn.Name = "pumscaleDataGridViewTextBoxColumn"; - // - // pumunitDataGridViewTextBoxColumn - // - this.pumunitDataGridViewTextBoxColumn.DataPropertyName = "pumunit"; - this.pumunitDataGridViewTextBoxColumn.HeaderText = "단위"; - this.pumunitDataGridViewTextBoxColumn.Name = "pumunitDataGridViewTextBoxColumn"; - // - // pumqtyDataGridViewTextBoxColumn - // - this.pumqtyDataGridViewTextBoxColumn.DataPropertyName = "pumqty"; - this.pumqtyDataGridViewTextBoxColumn.HeaderText = "신청수량"; - this.pumqtyDataGridViewTextBoxColumn.Name = "pumqtyDataGridViewTextBoxColumn"; - // - // pumqtyReqDataGridViewTextBoxColumn - // - this.pumqtyReqDataGridViewTextBoxColumn.DataPropertyName = "pumqtyReq"; - this.pumqtyReqDataGridViewTextBoxColumn.HeaderText = "구매수량"; - this.pumqtyReqDataGridViewTextBoxColumn.Name = "pumqtyReqDataGridViewTextBoxColumn"; - // - // pumpriceDataGridViewTextBoxColumn - // - this.pumpriceDataGridViewTextBoxColumn.DataPropertyName = "pumprice"; - this.pumpriceDataGridViewTextBoxColumn.HeaderText = "단가"; - this.pumpriceDataGridViewTextBoxColumn.Name = "pumpriceDataGridViewTextBoxColumn"; - // - // pumamtDataGridViewTextBoxColumn - // - this.pumamtDataGridViewTextBoxColumn.DataPropertyName = "pumamt"; - this.pumamtDataGridViewTextBoxColumn.HeaderText = "금액"; - this.pumamtDataGridViewTextBoxColumn.Name = "pumamtDataGridViewTextBoxColumn"; - // - // supplyDataGridViewTextBoxColumn - // - this.supplyDataGridViewTextBoxColumn.DataPropertyName = "supply"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.supplyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; - this.supplyDataGridViewTextBoxColumn.HeaderText = "공급"; - this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn"; - // - // bigo2DataGridViewTextBoxColumn - // - this.bigo2DataGridViewTextBoxColumn.DataPropertyName = "chkremark"; - this.bigo2DataGridViewTextBoxColumn.HeaderText = "비고(구매담당)"; - this.bigo2DataGridViewTextBoxColumn.Name = "bigo2DataGridViewTextBoxColumn"; - // - // bigoDataGridViewTextBoxColumn - // - this.bigoDataGridViewTextBoxColumn.DataPropertyName = "bigo"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.bigoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; - this.bigoDataGridViewTextBoxColumn.HeaderText = "비고(구매요청)"; - this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn"; - // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 2; @@ -479,6 +388,75 @@ // this.ta.ClearBeforeFill = true; // + // sidDataGridViewTextBoxColumn + // + this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid"; + this.sidDataGridViewTextBoxColumn.HeaderText = "SID"; + this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn"; + // + // requestNameDataGridViewTextBoxColumn + // + this.requestNameDataGridViewTextBoxColumn.DataPropertyName = "requestName"; + this.requestNameDataGridViewTextBoxColumn.HeaderText = "청구자"; + this.requestNameDataGridViewTextBoxColumn.Name = "requestNameDataGridViewTextBoxColumn"; + this.requestNameDataGridViewTextBoxColumn.ReadOnly = true; + // + // pumnameDataGridViewTextBoxColumn + // + this.pumnameDataGridViewTextBoxColumn.DataPropertyName = "pumname"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.pumnameDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.pumnameDataGridViewTextBoxColumn.HeaderText = "품목"; + this.pumnameDataGridViewTextBoxColumn.Name = "pumnameDataGridViewTextBoxColumn"; + // + // pumscaleDataGridViewTextBoxColumn + // + this.pumscaleDataGridViewTextBoxColumn.DataPropertyName = "pumscale"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.pumscaleDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + this.pumscaleDataGridViewTextBoxColumn.HeaderText = "규격"; + this.pumscaleDataGridViewTextBoxColumn.Name = "pumscaleDataGridViewTextBoxColumn"; + // + // pumqtyReqDataGridViewTextBoxColumn + // + this.pumqtyReqDataGridViewTextBoxColumn.DataPropertyName = "pumqtyReq"; + this.pumqtyReqDataGridViewTextBoxColumn.HeaderText = "수량"; + this.pumqtyReqDataGridViewTextBoxColumn.Name = "pumqtyReqDataGridViewTextBoxColumn"; + // + // pumpriceDataGridViewTextBoxColumn + // + this.pumpriceDataGridViewTextBoxColumn.DataPropertyName = "pumprice"; + this.pumpriceDataGridViewTextBoxColumn.HeaderText = "단가"; + this.pumpriceDataGridViewTextBoxColumn.Name = "pumpriceDataGridViewTextBoxColumn"; + // + // pumamtDataGridViewTextBoxColumn + // + this.pumamtDataGridViewTextBoxColumn.DataPropertyName = "pumamt"; + this.pumamtDataGridViewTextBoxColumn.HeaderText = "금액"; + this.pumamtDataGridViewTextBoxColumn.Name = "pumamtDataGridViewTextBoxColumn"; + // + // bigoDataGridViewTextBoxColumn + // + this.bigoDataGridViewTextBoxColumn.DataPropertyName = "bigo"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.bigoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; + this.bigoDataGridViewTextBoxColumn.HeaderText = "용도"; + this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn"; + // + // supplyDataGridViewTextBoxColumn + // + this.supplyDataGridViewTextBoxColumn.DataPropertyName = "supply"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.supplyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + this.supplyDataGridViewTextBoxColumn.HeaderText = "업체명"; + this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn"; + // + // bigo2DataGridViewTextBoxColumn + // + this.bigo2DataGridViewTextBoxColumn.DataPropertyName = "chkremark"; + this.bigo2DataGridViewTextBoxColumn.HeaderText = "구매담당비고"; + this.bigo2DataGridViewTextBoxColumn.Name = "bigo2DataGridViewTextBoxColumn"; + // // fPurchaseEB_ConfRequest // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -529,19 +507,6 @@ private System.Windows.Forms.ToolStripButton btEdit; private System.Windows.Forms.ToolStripButton btSave; private System.Windows.Forms.DataGridView dataGridView1; - private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn requestNameDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumnameDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumscaleDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumunitDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumqtyDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumqtyReqDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumpriceDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn pumamtDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn supplyDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn bigo2DataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn bigoDataGridViewTextBoxColumn; private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.RichTextBox richTextBox1; @@ -549,5 +514,15 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private dsPurchaseTableAdapters.EETGW_PurchaseEBTableAdapter ta; + private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn requestNameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pumnameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pumscaleDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pumqtyReqDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pumpriceDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pumamtDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn bigoDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn supplyDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn bigo2DataGridViewTextBoxColumn; } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs index 4ed1b8b..f27f70a 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs @@ -6,14 +6,8 @@ using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; -using util = FCOMMON.Util; - -using NetOffice; -using Outlook = NetOffice.OutlookApi; -using NetOffice.OutlookApi.Enums; using FEQ0000.Purchase; using FCOMMON; -using NetOffice.OfficeApi; using System.Web.Services.Protocols; using System.Diagnostics; using FarPoint.Win.Spread.CellType; @@ -34,7 +28,7 @@ namespace FEQ0000 Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; - fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); + fn_fpcolsize = FCOMMON.Util.MakeFilePath(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.FormClosing += FPurchase_FormClosing; this.FormClosed += __Closed; @@ -65,7 +59,7 @@ namespace FEQ0000 else { string dt = string.Empty; - if (!util.MakeDateString(input, out dt)) + if (!FCOMMON.Util.MakeDateString(input, out dt)) { FCOMMON.Util.MsgE("입력값이 올바르지 않습니다."); tb.SelectAll(); @@ -386,7 +380,7 @@ namespace FEQ0000 dr.AcceptChanges(); } - dlg = util.MsgQ("메일 전송을 할까요?"); + dlg = FCOMMON.Util.MsgQ("메일 전송을 할까요?"); if (dlg != DialogResult.Yes) return; @@ -436,89 +430,37 @@ namespace FEQ0000 try { - Outlook.Application outlookApplication = new Outlook.Application(); - var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem; + NetOffice.OutlookApi.Application outlookApplication = new NetOffice.OutlookApi.Application(); + var newMail = outlookApplication.CreateItem(NetOffice.OutlookApi.Enums.OlItemType.olMailItem) as NetOffice.OutlookApi.MailItem; newMail.Display(); newMail.Subject = form_subject; // this.tbSubject.Text.Trim(); // dr.title; newMail.To = string.Join(";", tolist.ToArray()); newMail.CC = string.Join(";", cclist.ToArray()); newMail.BCC = string.Join(";", bcclist.ToArray()); + string fn = ""; if (f.chkAttach.Checked) { var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "\\Export\\Purchase_confirmeb_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".xls"); if (fi.Directory.Exists == false) fi.Directory.Create(); - - FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName); + fn = fi.FullName; + //FCOMMON.Util.savetoexcel(this.dataGridView1, fi.FullName); - newMail.Attachments.Add(fi.FullName); + //newMail.Attachments.Add(fi.FullName); } - if (f.chkList.Checked) - { + var rows = this.rows; + var tabledata = UTIL_EQ0000.MakeDataTableToHTML(rows, fn); + - //목록을 본문에 추가한다 - System.Text.StringBuilder sb = new StringBuilder(); - - sb.AppendLine(""); - sb.AppendLine(""); - - foreach (DataGridViewColumn col in this.dataGridView1.Columns) - { - if (col.DataPropertyName.ToLower() == "pumqty") continue; - sb.AppendLine($""); - } - sb.AppendLine(""); - sb.AppendLine(""); - - for (int i = 0; i < this.dataGridView1.RowCount; i++) - { - - sb.AppendLine(""); - - foreach (DataGridViewColumn col in this.dataGridView1.Columns) - { - if (col.DataPropertyName.ToLower() == "pumqty") continue; - var v = dataGridView1.Rows[i].Cells[col.Index].Value; - string value = ""; - if (v != null) value = v.ToString(); - - if (col.ValueType == typeof(int)) - { - var ivalue = (int)v; - sb.AppendLine($""); - } - else if (col.ValueType == typeof(decimal)) - { - var ivalue = (decimal)v; - sb.AppendLine($""); - } - else if (col.ValueType == typeof(float)) - { - var ivalue = (float)v; - sb.AppendLine($""); - } - else if (col.ValueType == typeof(double)) - { - var ivalue = (double)v; - sb.AppendLine($""); - } - else sb.AppendLine($""); - } - sb.AppendLine(""); - } - sb.AppendLine(""); - sb.AppendLine("
{col.HeaderText}
{ivalue:N0}{ivalue:N0}{ivalue:N1}{ivalue:N1}{getmaxstr(value)}
"); - sb.AppendLine($"항목:{this.bs.Count}건,합계금액:{lbSum.Text}"); - form_body = form_body.Replace("{body}", sb.ToString()); - } - - //newMail.BodyFormat = OlBodyFormat.olFormatHTML; + if (fn.isEmpty() == false) + newMail.Attachments.Add(fn); + form_body = form_body.Replace("{body}", tabledata); newMail.HTMLBody = form_body + newMail.HTMLBody; // } catch (Exception ex) { - util.MsgE("전송실패\n\n" + ex.Message + "\n\n" + + FCOMMON.Util.MsgE("전송실패\n\n" + ex.Message + "\n\n" + "아웃룩의 설정이 정상인지 확인하세요"); } } @@ -527,7 +469,7 @@ namespace FEQ0000 { var drv = this.bs.Current as dsPurchase.EETGW_PurchaseEBRow; if (drv == null) return; - var dlg = util.MsgQ("선택된 줄을 제거 할까요?"); + var dlg = FCOMMON.Util.MsgQ("선택된 줄을 제거 할까요?"); if (dlg != DialogResult.Yes) return; this.rows.Remove(drv); if (rows.Any()) diff --git a/SubProject/FEQ0000/PurchaseNR/fMailForm.cs b/SubProject/FEQ0000/PurchaseNR/fMailForm.cs index efe945d..29b19c0 100644 --- a/SubProject/FEQ0000/PurchaseNR/fMailForm.cs +++ b/SubProject/FEQ0000/PurchaseNR/fMailForm.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using YARTE.UI.Buttons; namespace FEQ0000.Purchase { @@ -18,6 +19,7 @@ namespace FEQ0000.Purchase InitializeComponent(); Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + PredefinedButtonSets.SetupDefaultButtons(this.htmlEditor1); Cate = cate; } public fMailForm(string subject, string body, string to, string cc, string bcc) diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index c89173c..8676c17 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -4014,6 +4014,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnbigo_manager; + private global::System.Data.DataColumn columnsite; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public EETGW_PurchaseEBDataTable() : @@ -4496,6 +4498,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn siteColumn { + get { + return this.columnsite; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4587,7 +4597,8 @@ namespace FEQ0000 { string conf_request, string conf_reponse, string bigo_admin, - string bigo_manager) { + string bigo_manager, + string site) { EETGW_PurchaseEBRow rowEETGW_PurchaseEBRow = ((EETGW_PurchaseEBRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -4644,7 +4655,8 @@ namespace FEQ0000 { conf_request, conf_reponse, bigo_admin, - bigo_manager}; + bigo_manager, + site}; rowEETGW_PurchaseEBRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseEBRow); return rowEETGW_PurchaseEBRow; @@ -4705,7 +4717,8 @@ namespace FEQ0000 { string conf_request, string conf_reponse, string bigo_admin, - string bigo_manager) { + string bigo_manager, + string site) { EETGW_PurchaseEBRow rowEETGW_PurchaseEBRow = ((EETGW_PurchaseEBRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -4762,7 +4775,8 @@ namespace FEQ0000 { conf_request, conf_reponse, bigo_admin, - bigo_manager}; + bigo_manager, + site}; rowEETGW_PurchaseEBRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_PurchaseEBRow); return rowEETGW_PurchaseEBRow; @@ -4847,6 +4861,7 @@ namespace FEQ0000 { this.columnconf_reponse = base.Columns["conf_reponse"]; this.columnbigo_admin = base.Columns["bigo_admin"]; this.columnbigo_manager = base.Columns["bigo_manager"]; + this.columnsite = base.Columns["site"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4962,6 +4977,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnbigo_admin); this.columnbigo_manager = new global::System.Data.DataColumn("bigo_manager", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnbigo_manager); + this.columnsite = new global::System.Data.DataColumn("site", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsite); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -5014,6 +5031,7 @@ namespace FEQ0000 { this.columnconf_reponse.MaxLength = 1000; this.columnbigo_admin.MaxLength = 1000; this.columnbigo_manager.MaxLength = 1000; + this.columnsite.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10259,6 +10277,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string site { + get { + if (this.IssiteNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_PurchaseEB.siteColumn])); + } + } + set { + this[this.tableEETGW_PurchaseEB.siteColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IspdateNull() { @@ -10870,6 +10904,18 @@ namespace FEQ0000 { public void Setbigo_managerNull() { this[this.tableEETGW_PurchaseEB.bigo_managerColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IssiteNull() { + return this.IsNull(this.tableEETGW_PurchaseEB.siteColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetsiteNull() { + this[this.tableEETGW_PurchaseEB.siteColumn] = global::System.Convert.DBNull; + } } /// @@ -17936,6 +17982,7 @@ GROUP BY purchase_admin"; tableMapping.ColumnMappings.Add("conf_reponse", "conf_reponse"); tableMapping.ColumnMappings.Add("bigo_admin", "bigo_admin"); tableMapping.ColumnMappings.Add("bigo_manager", "bigo_manager"); + tableMapping.ColumnMappings.Add("site", "site"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -17991,7 +18038,8 @@ GROUP BY purchase_admin"; "D [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@I" + "sNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo" + "_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_ma" + - "nager] = @Original_bigo_manager)))"; + "nager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR " + + "([site] = @Original_site)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -18091,6 +18139,8 @@ GROUP BY purchase_admin"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_admin", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bigo_manager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_site", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", 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_PurchaseEB] ([pdate], [state], [process], [receive], [sc], [re" + @@ -18100,21 +18150,22 @@ GROUP BY purchase_admin"; "derno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate]," + " [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_m" + "anager], [purchase_admin], [currency], [conf_status], [conf_request], [conf_repo" + - "nse], [bigo_admin], [bigo_manager]) VALUES (@pdate, @state, @process, @receive, " + - "@sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt," + - " @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept" + - ", @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @" + - "place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcent" + - "er, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin, @curr" + - "ency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_manager);\r\n" + - "SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN" + - "ame, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscal" + - "e, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, as" + - "set, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc" + - ", orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2" + - ", costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, " + - "currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager FROM" + - " EETGW_PurchaseEB WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC"; + "nse], [bigo_admin], [bigo_manager], [site]) VALUES (@pdate, @state, @process, @r" + + "eceive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, " + + "@pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @p" + + "o, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @" + + "gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @" + + "costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admi" + + "n, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_man" + + "ager, @site);\r\nSELECT idx, pdate, state, process, receive, dbo.getUserName(recei" + + "ve) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, p" + + "umname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project," + + " projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel," + + " bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, wind" + + "ate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, p" + + "urchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bi" + + "go_manager, site FROM EETGW_PurchaseEB WHERE (idx = SCOPE_IDENTITY()) ORDER BY p" + + "date DESC, idx DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; 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("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18167,6 +18218,7 @@ GROUP BY purchase_admin"; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf_reponse", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "conf_reponse", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", 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_PurchaseEB] SET [pdate] = @pdate, [state] = @state, [process] = @pr" + @@ -18183,67 +18235,68 @@ GROUP BY purchase_admin"; "chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin" + "] = @purchase_admin, [currency] = @currency, [conf_status] = @conf_status, [conf" + "_request] = @conf_request, [conf_reponse] = @conf_reponse, [bigo_admin] = @bigo_" + - "admin, [bigo_manager] = @bigo_manager WHERE (([idx] = @Original_idx) AND ((@IsNu" + - "ll_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_" + - "state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_pro" + - "cess = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNul" + - "l_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@" + - "IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request " + - "= 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid" + - " = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AN" + - "D [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale " + - "= 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_" + - "pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@Is" + - "Null_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@I" + - "sNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice))" + - " AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)" + - ") AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply" + - ")) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Origi" + - "nal_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([proj" + - "ectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR" + - " ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([" + - "edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([i" + - "ndate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @O" + - "riginal_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_d" + - "ept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNul" + - "l_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNu" + - "ll_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsN" + - "ull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull" + - "_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manupr" + - "oc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNu" + - "ll_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([" + - "gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([plac" + - "e] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] " + - "= @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pu" + - "mpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NU" + - "LL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] " + - "IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windat" + - "e] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1" + - "] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NU" + - "LL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] " + - "IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AN" + - "D [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqty" + - "Req = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@" + - "IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkrem" + - "ark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([pu" + - "rchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 " + - "AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) " + - "AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_cu" + - "rrency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_stat" + - "us] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] " + - "IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_repons" + - "e = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) " + - "AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Origi" + - "nal_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR (" + - "[bigo_manager] = @Original_bigo_manager)));\r\nSELECT idx, pdate, state, process, " + - "receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(r" + - "equest) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumam" + - "t, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid," + - " wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pum" + - "priceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, " + - "chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request" + - ", conf_reponse, bigo_admin, bigo_manager FROM EETGW_PurchaseEB WHERE (idx = @idx" + - ") ORDER BY pdate DESC, idx DESC"; + "admin, [bigo_manager] = @bigo_manager, [site] = @site WHERE (([idx] = @Original_" + + "idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)" + + ") AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) A" + + "ND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_proces" + + "s)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_r" + + "eceive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((" + + "@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) A" + + "ND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNul" + + "l_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@" + + "IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)" + + ") AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pum" + + "unit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_p" + + "umqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Ori" + + "ginal_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @" + + "Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = " + + "@Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([sup" + + "plyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS" + + " NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [as" + + "set] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate" + + "] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate]" + + " IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NUL" + + "L) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dep" + + "t] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wda" + + "te) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_impo" + + "rt)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pum" + + "idx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel" + + ")) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND " + + "((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manupr" + + "oc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_" + + "orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS" + + " NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NU" + + "LL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] " + + "IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND " + + "[inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid =" + + " 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate" + + " = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_ch" + + "k1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 " + + "AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 A" + + "ND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull" + + "_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND " + + "((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pum" + + "qtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = " + + "@Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] " + + "IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_pur" + + "chase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_p" + + "urchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency" + + "] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL" + + ") OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND" + + " [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@Is" + + "Null_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original" + + "_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo" + + "_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manage" + + "r] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1" + + " AND [site] IS NULL) OR ([site] = @Original_site)));\r\nSELECT idx, pdate, state, " + + "process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getU" + + "serName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumpri" + + "ce, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, de" + + "pt, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, i" + + "nqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pu" + + "mqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, con" + + "f_request, conf_reponse, bigo_admin, bigo_manager, site FROM EETGW_PurchaseEB WH" + + "ERE (idx = @idx) ORDER BY pdate DESC, idx DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; 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("@state", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "state", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18296,6 +18349,7 @@ GROUP BY purchase_admin"; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@conf_reponse", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "conf_reponse", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_admin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_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, "", "", "")); @@ -18394,6 +18448,8 @@ GROUP BY purchase_admin"; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo_admin", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_admin", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bigo_manager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bigo_manager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bigo_manager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_site", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_site", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "site", 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, "", "", "")); } @@ -18410,13 +18466,13 @@ GROUP BY purchase_admin"; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, - pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, - bigo_manager -FROM EETGW_PurchaseEB -WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) -ORDER BY pdate DESC, idx DESC"; + this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, + pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, + place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, + conf_request, conf_reponse, bigo_admin, bigo_manager, site +FROM EETGW_PurchaseEB +WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +ORDER BY pdate DESC, idx DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); @@ -18439,13 +18495,7 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, - pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, - bigo_manager -FROM EETGW_PurchaseEB -WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') -ORDER BY pdate DESC, idx DESC"; + this._commandCollection[3].CommandText = @"SELECT asset, bigo, bigo_admin, bigo_manager, chk1, chk2, chkremark, conf_reponse, conf_request, conf_status, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, site, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseEB WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') ORDER BY pdate DESC, idx DESC"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].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[4] = new global::System.Data.SqlClient.SqlCommand(); @@ -18715,7 +18765,8 @@ ORDER BY pdate DESC, idx DESC"; string Original_conf_request, string Original_conf_reponse, string Original_bigo_admin, - string Original_bigo_manager) { + string Original_bigo_manager, + string Original_site) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -19106,6 +19157,14 @@ ORDER BY pdate DESC, idx DESC"; this.Adapter.DeleteCommand.Parameters[96].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[97].Value = ((string)(Original_bigo_manager)); } + if ((Original_site == null)) { + this.Adapter.DeleteCommand.Parameters[98].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[99].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[98].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[99].Value = ((string)(Original_site)); + } 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)) { @@ -19177,7 +19236,8 @@ ORDER BY pdate DESC, idx DESC"; string conf_request, string conf_reponse, string bigo_admin, - string bigo_manager) { + string bigo_manager, + string site) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -19479,6 +19539,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.InsertCommand.Parameters[50].Value = ((string)(bigo_manager)); } + if ((site == null)) { + this.Adapter.InsertCommand.Parameters[51].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[51].Value = ((string)(site)); + } 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)) { @@ -19551,6 +19617,7 @@ ORDER BY pdate DESC, idx DESC"; string conf_reponse, string bigo_admin, string bigo_manager, + string site, int Original_idx, string Original_pdate, string Original_state, @@ -19602,6 +19669,7 @@ ORDER BY pdate DESC, idx DESC"; string Original_conf_reponse, string Original_bigo_admin, string Original_bigo_manager, + string Original_site, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -19904,397 +19972,411 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(bigo_manager)); } - this.Adapter.UpdateCommand.Parameters[51].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + if ((site == null)) { + this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(site)); + } + this.Adapter.UpdateCommand.Parameters[52].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_pdate)); } if ((Original_state == null)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_state)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_state)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_process)); } if ((Original_receive == null)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_receive)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_receive)); } if ((Original_sc == null)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_sc)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_sc)); } if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_request)); } if ((Original_sid == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_sid)); } if ((Original_pumname == null)) { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_pumname)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_pumname)); } if ((Original_pumscale == null)) { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_pumscale)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_pumscale)); } if ((Original_pumunit == null)) { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_pumunit)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((string)(Original_pumunit)); } if ((Original_pumqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_pumqty.Value)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(Original_pumqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; } if ((Original_pumprice.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((decimal)(Original_pumprice.Value)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((decimal)(Original_pumprice.Value)); } else { - this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; } if ((Original_pumamt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((decimal)(Original_pumamt.Value)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((decimal)(Original_pumamt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; } if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_supply)); } if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((int)(Original_supplyidx.Value)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((int)(Original_supplyidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; } if ((Original_projectidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((int)(Original_projectidx.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((int)(Original_projectidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[86].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((string)(Original_asset)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((string)(Original_edate)); } if ((Original_indate == null)) { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[90].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[89].Value = ((string)(Original_indate)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[90].Value = ((string)(Original_indate)); } if ((Original_po == null)) { - this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[92].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[91].Value = ((string)(Original_po)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[92].Value = ((string)(Original_po)); } if ((Original_dept == null)) { - this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[94].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[93].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_dept)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[94].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[95].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[95].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[96].Value = ((System.DateTime)(Original_wdate)); if ((Original_import.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[97].Value = ((bool)(Original_import.Value)); + this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[98].Value = ((bool)(Original_import.Value)); } else { - this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[97].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[97].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[98].Value = global::System.DBNull.Value; } if ((Original_pumidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[99].Value = ((int)(Original_pumidx.Value)); + this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[100].Value = ((int)(Original_pumidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[99].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[99].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[100].Value = global::System.DBNull.Value; } if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[101].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[102].Value = ((bool)(Original_isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[101].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[101].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[102].Value = global::System.DBNull.Value; } if ((Original_bigo == null)) { - this.Adapter.UpdateCommand.Parameters[102].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[103].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[104].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[102].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[103].Value = ((string)(Original_bigo)); + this.Adapter.UpdateCommand.Parameters[103].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[104].Value = ((string)(Original_bigo)); } if ((Original_manuproc == null)) { - this.Adapter.UpdateCommand.Parameters[104].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[105].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[106].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[104].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[105].Value = ((string)(Original_manuproc)); + this.Adapter.UpdateCommand.Parameters[105].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[106].Value = ((string)(Original_manuproc)); } if ((Original_orderno == null)) { - this.Adapter.UpdateCommand.Parameters[106].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[107].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[108].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[106].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[107].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[107].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[108].Value = ((string)(Original_orderno)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[108].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[109].Value = ((string)(Original_gcode)); } if ((Original_place == null)) { - this.Adapter.UpdateCommand.Parameters[109].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[110].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[110].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[111].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[109].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[110].Value = ((string)(Original_place)); + this.Adapter.UpdateCommand.Parameters[110].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[111].Value = ((string)(Original_place)); } if ((Original_inqty.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[112].Value = ((int)(Original_inqty.Value)); + this.Adapter.UpdateCommand.Parameters[112].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[113].Value = ((int)(Original_inqty.Value)); } else { - this.Adapter.UpdateCommand.Parameters[111].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[112].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[112].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[113].Value = global::System.DBNull.Value; } if ((Original_pumpriceD.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[114].Value = ((decimal)(Original_pumpriceD.Value)); + this.Adapter.UpdateCommand.Parameters[114].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[115].Value = ((decimal)(Original_pumpriceD.Value)); } else { - this.Adapter.UpdateCommand.Parameters[113].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[114].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[114].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[115].Value = global::System.DBNull.Value; } if ((Original_inremark == null)) { - this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[116].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[116].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[117].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[115].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[116].Value = ((string)(Original_inremark)); + this.Adapter.UpdateCommand.Parameters[116].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[117].Value = ((string)(Original_inremark)); } if ((Original_winuid == null)) { - this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[118].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[118].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[119].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[117].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[118].Value = ((string)(Original_winuid)); + this.Adapter.UpdateCommand.Parameters[118].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[119].Value = ((string)(Original_winuid)); } if ((Original_windate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[120].Value = ((System.DateTime)(Original_windate.Value)); + this.Adapter.UpdateCommand.Parameters[120].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[121].Value = ((System.DateTime)(Original_windate.Value)); } else { - this.Adapter.UpdateCommand.Parameters[119].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[120].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[120].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[121].Value = global::System.DBNull.Value; } if ((Original_chk1.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[122].Value = ((bool)(Original_chk1.Value)); + this.Adapter.UpdateCommand.Parameters[122].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[123].Value = ((bool)(Original_chk1.Value)); } else { - this.Adapter.UpdateCommand.Parameters[121].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[122].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[122].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[123].Value = global::System.DBNull.Value; } if ((Original_chk2.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[124].Value = ((bool)(Original_chk2.Value)); + this.Adapter.UpdateCommand.Parameters[124].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[125].Value = ((bool)(Original_chk2.Value)); } else { - this.Adapter.UpdateCommand.Parameters[123].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[124].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[124].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[125].Value = global::System.DBNull.Value; } if ((Original_costcenter == null)) { - this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[126].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[126].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[127].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[125].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[126].Value = ((string)(Original_costcenter)); + this.Adapter.UpdateCommand.Parameters[126].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[127].Value = ((string)(Original_costcenter)); } if ((Original_linecode == null)) { - this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[128].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[128].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[129].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[127].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[128].Value = ((string)(Original_linecode)); + this.Adapter.UpdateCommand.Parameters[128].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[129].Value = ((string)(Original_linecode)); } if ((Original_pumqtyReq.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[130].Value = ((int)(Original_pumqtyReq.Value)); + this.Adapter.UpdateCommand.Parameters[130].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[131].Value = ((int)(Original_pumqtyReq.Value)); } else { - this.Adapter.UpdateCommand.Parameters[129].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[130].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[130].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[131].Value = global::System.DBNull.Value; } if ((Original_chkremark == null)) { - this.Adapter.UpdateCommand.Parameters[131].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[132].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[132].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[133].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[131].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[132].Value = ((string)(Original_chkremark)); + this.Adapter.UpdateCommand.Parameters[132].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[133].Value = ((string)(Original_chkremark)); } if ((Original_purchase_manager == null)) { - this.Adapter.UpdateCommand.Parameters[133].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[134].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[134].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[135].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[133].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[134].Value = ((string)(Original_purchase_manager)); + this.Adapter.UpdateCommand.Parameters[134].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[135].Value = ((string)(Original_purchase_manager)); } if ((Original_purchase_admin == null)) { - this.Adapter.UpdateCommand.Parameters[135].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[136].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[136].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[137].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[135].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[136].Value = ((string)(Original_purchase_admin)); + this.Adapter.UpdateCommand.Parameters[136].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[137].Value = ((string)(Original_purchase_admin)); } if ((Original_currency == null)) { - this.Adapter.UpdateCommand.Parameters[137].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[138].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[138].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[139].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[137].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[138].Value = ((string)(Original_currency)); + this.Adapter.UpdateCommand.Parameters[138].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[139].Value = ((string)(Original_currency)); } if ((Original_conf_status == null)) { - this.Adapter.UpdateCommand.Parameters[139].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[140].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[140].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[141].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[139].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[140].Value = ((string)(Original_conf_status)); + this.Adapter.UpdateCommand.Parameters[140].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[141].Value = ((string)(Original_conf_status)); } if ((Original_conf_request == null)) { - this.Adapter.UpdateCommand.Parameters[141].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[142].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[142].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[143].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[141].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[142].Value = ((string)(Original_conf_request)); + this.Adapter.UpdateCommand.Parameters[142].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[143].Value = ((string)(Original_conf_request)); } if ((Original_conf_reponse == null)) { - this.Adapter.UpdateCommand.Parameters[143].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[144].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[144].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[145].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[143].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[144].Value = ((string)(Original_conf_reponse)); + this.Adapter.UpdateCommand.Parameters[144].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[145].Value = ((string)(Original_conf_reponse)); } if ((Original_bigo_admin == null)) { - this.Adapter.UpdateCommand.Parameters[145].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[146].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[146].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[147].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[145].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[146].Value = ((string)(Original_bigo_admin)); + this.Adapter.UpdateCommand.Parameters[146].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[147].Value = ((string)(Original_bigo_admin)); } if ((Original_bigo_manager == null)) { - this.Adapter.UpdateCommand.Parameters[147].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[148].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[148].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[149].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[147].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[148].Value = ((string)(Original_bigo_manager)); + this.Adapter.UpdateCommand.Parameters[148].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[149].Value = ((string)(Original_bigo_manager)); } - this.Adapter.UpdateCommand.Parameters[149].Value = ((int)(idx)); + if ((Original_site == null)) { + this.Adapter.UpdateCommand.Parameters[150].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[151].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[150].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[151].Value = ((string)(Original_site)); + } + this.Adapter.UpdateCommand.Parameters[152].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)) { @@ -20367,6 +20449,7 @@ ORDER BY pdate DESC, idx DESC"; string conf_reponse, string bigo_admin, string bigo_manager, + string site, int Original_idx, string Original_pdate, string Original_state, @@ -20417,8 +20500,9 @@ ORDER BY pdate DESC, idx DESC"; string Original_conf_request, string Original_conf_reponse, string Original_bigo_admin, - string Original_bigo_manager) { - return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_chk1, Original_chk2, Original_costcenter, Original_linecode, Original_pumqtyReq, Original_chkremark, Original_purchase_manager, Original_purchase_admin, Original_currency, Original_conf_status, Original_conf_request, Original_conf_reponse, Original_bigo_admin, Original_bigo_manager, Original_idx); + string Original_bigo_manager, + string Original_site) { + return this.Update(pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site, Original_idx, Original_pdate, Original_state, Original_process, Original_receive, Original_sc, Original_request, Original_sid, Original_pumname, Original_pumscale, Original_pumunit, Original_pumqty, Original_pumprice, Original_pumamt, Original_supply, Original_supplyidx, Original_projectidx, Original_asset, Original_edate, Original_indate, Original_po, Original_dept, Original_wuid, Original_wdate, Original_import, Original_pumidx, Original_isdel, Original_bigo, Original_manuproc, Original_orderno, Original_gcode, Original_place, Original_inqty, Original_pumpriceD, Original_inremark, Original_winuid, Original_windate, Original_chk1, Original_chk2, Original_costcenter, Original_linecode, Original_pumqtyReq, Original_chkremark, Original_purchase_manager, Original_purchase_admin, Original_currency, Original_conf_status, Original_conf_request, Original_conf_reponse, Original_bigo_admin, Original_bigo_manager, Original_site, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index c26cee8..687c86b 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -1109,7 +1109,7 @@ GROUP BY purchase_admin - DELETE FROM [EETGW_PurchaseEB] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager))) + DELETE FROM [EETGW_PurchaseEB] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site))) @@ -1209,13 +1209,15 @@ GROUP BY purchase_admin + + - INSERT INTO [EETGW_PurchaseEB] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin], [currency], [conf_status], [conf_request], [conf_reponse], [bigo_admin], [bigo_manager]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_manager); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager FROM EETGW_PurchaseEB WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC + INSERT INTO [EETGW_PurchaseEB] ([pdate], [state], [process], [receive], [sc], [request], [sid], [pumname], [pumscale], [pumunit], [pumqty], [pumprice], [pumamt], [supply], [supplyidx], [project], [projectidx], [asset], [edate], [indate], [po], [dept], [wuid], [wdate], [import], [pumidx], [isdel], [bigo], [manuproc], [orderno], [gcode], [place], [inqty], [pumpriceD], [inremark], [winuid], [windate], [chk1], [chk2], [costcenter], [linecode], [pumqtyReq], [chkremark], [purchase_manager], [purchase_admin], [currency], [conf_status], [conf_request], [conf_reponse], [bigo_admin], [bigo_manager], [site]) VALUES (@pdate, @state, @process, @receive, @sc, @request, @sid, @pumname, @pumscale, @pumunit, @pumqty, @pumprice, @pumamt, @supply, @supplyidx, @project, @projectidx, @asset, @edate, @indate, @po, @dept, @wuid, @wdate, @import, @pumidx, @isdel, @bigo, @manuproc, @orderno, @gcode, @place, @inqty, @pumpriceD, @inremark, @winuid, @windate, @chk1, @chk2, @costcenter, @linecode, @pumqtyReq, @chkremark, @purchase_manager, @purchase_admin, @currency, @conf_status, @conf_request, @conf_reponse, @bigo_admin, @bigo_manager, @site); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site FROM EETGW_PurchaseEB WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC @@ -1268,18 +1270,19 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + - SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, - pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, - bigo_manager -FROM EETGW_PurchaseEB -WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) -ORDER BY pdate DESC, idx DESC + SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, + pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, + place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, + conf_request, conf_reponse, bigo_admin, bigo_manager, site +FROM EETGW_PurchaseEB +WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +ORDER BY pdate DESC, idx DESC @@ -1287,8 +1290,8 @@ ORDER BY pdate DESC, idx DESC - UPDATE [EETGW_PurchaseEB] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin, [currency] = @currency, [conf_status] = @conf_status, [conf_request] = @conf_request, [conf_reponse] = @conf_reponse, [bigo_admin] = @bigo_admin, [bigo_manager] = @bigo_manager WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager))); -SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager FROM EETGW_PurchaseEB WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC + UPDATE [EETGW_PurchaseEB] SET [pdate] = @pdate, [state] = @state, [process] = @process, [receive] = @receive, [sc] = @sc, [request] = @request, [sid] = @sid, [pumname] = @pumname, [pumscale] = @pumscale, [pumunit] = @pumunit, [pumqty] = @pumqty, [pumprice] = @pumprice, [pumamt] = @pumamt, [supply] = @supply, [supplyidx] = @supplyidx, [project] = @project, [projectidx] = @projectidx, [asset] = @asset, [edate] = @edate, [indate] = @indate, [po] = @po, [dept] = @dept, [wuid] = @wuid, [wdate] = @wdate, [import] = @import, [pumidx] = @pumidx, [isdel] = @isdel, [bigo] = @bigo, [manuproc] = @manuproc, [orderno] = @orderno, [gcode] = @gcode, [place] = @place, [inqty] = @inqty, [pumpriceD] = @pumpriceD, [inremark] = @inremark, [winuid] = @winuid, [windate] = @windate, [chk1] = @chk1, [chk2] = @chk2, [costcenter] = @costcenter, [linecode] = @linecode, [pumqtyReq] = @pumqtyReq, [chkremark] = @chkremark, [purchase_manager] = @purchase_manager, [purchase_admin] = @purchase_admin, [currency] = @currency, [conf_status] = @conf_status, [conf_request] = @conf_request, [conf_reponse] = @conf_reponse, [bigo_admin] = @bigo_admin, [bigo_manager] = @bigo_manager, [site] = @site WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_state = 1 AND [state] IS NULL) OR ([state] = @Original_state)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_receive = 1 AND [receive] IS NULL) OR ([receive] = @Original_receive)) AND ((@IsNull_sc = 1 AND [sc] IS NULL) OR ([sc] = @Original_sc)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_pumname = 1 AND [pumname] IS NULL) OR ([pumname] = @Original_pumname)) AND ((@IsNull_pumscale = 1 AND [pumscale] IS NULL) OR ([pumscale] = @Original_pumscale)) AND ((@IsNull_pumunit = 1 AND [pumunit] IS NULL) OR ([pumunit] = @Original_pumunit)) AND ((@IsNull_pumqty = 1 AND [pumqty] IS NULL) OR ([pumqty] = @Original_pumqty)) AND ((@IsNull_pumprice = 1 AND [pumprice] IS NULL) OR ([pumprice] = @Original_pumprice)) AND ((@IsNull_pumamt = 1 AND [pumamt] IS NULL) OR ([pumamt] = @Original_pumamt)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_indate = 1 AND [indate] IS NULL) OR ([indate] = @Original_indate)) AND ((@IsNull_po = 1 AND [po] IS NULL) OR ([po] = @Original_po)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_pumidx = 1 AND [pumidx] IS NULL) OR ([pumidx] = @Original_pumidx)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_bigo = 1 AND [bigo] IS NULL) OR ([bigo] = @Original_bigo)) AND ((@IsNull_manuproc = 1 AND [manuproc] IS NULL) OR ([manuproc] = @Original_manuproc)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_place = 1 AND [place] IS NULL) OR ([place] = @Original_place)) AND ((@IsNull_inqty = 1 AND [inqty] IS NULL) OR ([inqty] = @Original_inqty)) AND ((@IsNull_pumpriceD = 1 AND [pumpriceD] IS NULL) OR ([pumpriceD] = @Original_pumpriceD)) AND ((@IsNull_inremark = 1 AND [inremark] IS NULL) OR ([inremark] = @Original_inremark)) AND ((@IsNull_winuid = 1 AND [winuid] IS NULL) OR ([winuid] = @Original_winuid)) AND ((@IsNull_windate = 1 AND [windate] IS NULL) OR ([windate] = @Original_windate)) AND ((@IsNull_chk1 = 1 AND [chk1] IS NULL) OR ([chk1] = @Original_chk1)) AND ((@IsNull_chk2 = 1 AND [chk2] IS NULL) OR ([chk2] = @Original_chk2)) AND ((@IsNull_costcenter = 1 AND [costcenter] IS NULL) OR ([costcenter] = @Original_costcenter)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_pumqtyReq = 1 AND [pumqtyReq] IS NULL) OR ([pumqtyReq] = @Original_pumqtyReq)) AND ((@IsNull_chkremark = 1 AND [chkremark] IS NULL) OR ([chkremark] = @Original_chkremark)) AND ((@IsNull_purchase_manager = 1 AND [purchase_manager] IS NULL) OR ([purchase_manager] = @Original_purchase_manager)) AND ((@IsNull_purchase_admin = 1 AND [purchase_admin] IS NULL) OR ([purchase_admin] = @Original_purchase_admin)) AND ((@IsNull_currency = 1 AND [currency] IS NULL) OR ([currency] = @Original_currency)) AND ((@IsNull_conf_status = 1 AND [conf_status] IS NULL) OR ([conf_status] = @Original_conf_status)) AND ((@IsNull_conf_request = 1 AND [conf_request] IS NULL) OR ([conf_request] = @Original_conf_request)) AND ((@IsNull_conf_reponse = 1 AND [conf_reponse] IS NULL) OR ([conf_reponse] = @Original_conf_reponse)) AND ((@IsNull_bigo_admin = 1 AND [bigo_admin] IS NULL) OR ([bigo_admin] = @Original_bigo_admin)) AND ((@IsNull_bigo_manager = 1 AND [bigo_manager] IS NULL) OR ([bigo_manager] = @Original_bigo_manager)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site))); +SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, bigo_manager, site FROM EETGW_PurchaseEB WHERE (idx = @idx) ORDER BY pdate DESC, idx DESC @@ -1341,6 +1344,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + @@ -1439,6 +1443,8 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + + @@ -1500,6 +1506,7 @@ SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveN + @@ -1540,13 +1547,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc - SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, - pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode, place, inqty, pumpriceD, inremark, - winuid, windate, chk1, chk2, costcenter, linecode, pumqtyReq, chkremark, purchase_manager, purchase_admin, currency, conf_status, conf_request, conf_reponse, bigo_admin, - bigo_manager -FROM EETGW_PurchaseEB -WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') -ORDER BY pdate DESC, idx DESC + SELECT asset, bigo, bigo_admin, bigo_manager, chk1, chk2, chkremark, conf_reponse, conf_request, conf_status, costcenter, currency, dept, edate, gcode, idx, import, indate, inqty, inremark, isdel, linecode, manuproc, orderno, pdate, place, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumpriceD, pumqty, pumqtyReq, pumscale, pumunit, purchase_admin, purchase_manager, receive, dbo.getUserName(receive) AS receiveName, request, dbo.getUserName(request) AS requestName, sc, sid, site, state, supply, supplyidx, wdate, windate, winuid, wuid FROM EETGW_PurchaseEB WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (state = 'Approving') AND (conf_status = '1') ORDER BY pdate DESC, idx DESC @@ -2691,6 +2692,13 @@ ORDER BY pdate DESC, idx DESC + + + + + + + diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index d45888c..330be08 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -1001,7 +1001,7 @@ {f31c242c-1b15-4518-9733-48558499fe4b} arControl - + {db5ee9c8-eacf-4231-877e-b9dfd7a714de} YARTE diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs index 7eacd31..1a31afc 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs @@ -89,11 +89,11 @@ this.HolyTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.stime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.etime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.HolyReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyLocation = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.processsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cmbCf = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -497,11 +497,11 @@ this.HolyTimes, this.stime, this.etime, + this.cmbCf, this.HolyReason, this.HolyLocation, this.telDataGridViewTextBoxColumn, this.processsDataGridViewTextBoxColumn, - this.cmbCf, this.Response, this.HolyBackup, this.remarkDataGridViewTextBoxColumn}); @@ -620,6 +620,20 @@ this.etime.Name = "etime"; this.etime.Width = 64; // + // cmbCf + // + this.cmbCf.DataPropertyName = "conf"; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cmbCf.DefaultCellStyle = dataGridViewCellStyle6; + this.cmbCf.HeaderText = "관리자 승인"; + this.cmbCf.Items.AddRange(new object[] { + "선택안함", + "승인", + "거절"}); + this.cmbCf.Name = "cmbCf"; + this.cmbCf.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.cmbCf.Width = 85; + // // HolyReason // this.HolyReason.DataPropertyName = "HolyReason"; @@ -649,20 +663,6 @@ this.processsDataGridViewTextBoxColumn.ReadOnly = true; this.processsDataGridViewTextBoxColumn.Width = 64; // - // cmbCf - // - this.cmbCf.DataPropertyName = "conf"; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cmbCf.DefaultCellStyle = dataGridViewCellStyle6; - this.cmbCf.HeaderText = "관리자 승인"; - this.cmbCf.Items.AddRange(new object[] { - "선택안함", - "승인", - "거절"}); - this.cmbCf.Name = "cmbCf"; - this.cmbCf.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.cmbCf.Width = 85; - // // Response // this.Response.DataPropertyName = "Response"; @@ -768,11 +768,11 @@ private System.Windows.Forms.DataGridViewTextBoxColumn HolyTimes; private System.Windows.Forms.DataGridViewTextBoxColumn stime; private System.Windows.Forms.DataGridViewTextBoxColumn etime; + private System.Windows.Forms.DataGridViewComboBoxColumn cmbCf; private System.Windows.Forms.DataGridViewTextBoxColumn HolyReason; private System.Windows.Forms.DataGridViewTextBoxColumn HolyLocation; private System.Windows.Forms.DataGridViewTextBoxColumn telDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn processsDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewComboBoxColumn cmbCf; private System.Windows.Forms.DataGridViewTextBoxColumn Response; private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup; private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn; diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx index bea0e0f..014346f 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/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 @@ -141,7 +141,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/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 @@ -150,7 +150,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -159,7 +159,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/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 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 95b4359..27278a1 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -2036,7 +2036,7 @@ this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0); this.btSearch.Size = new System.Drawing.Size(122, 69); this.btSearch.TabIndex = 9; - this.btSearch.Text = "새로고침(&R)"; + this.btSearch.Text = "새로고침(F5)"; this.btSearch.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.btSearch.UseVisualStyleBackColor = true; this.btSearch.Click += new System.EventHandler(this.button2_Click); diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index e800548..6a61324 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -19,8 +19,17 @@ namespace FPJ0000 fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow; this.FormClosed += __Closed; + this.KeyPreview = true; + this.KeyDown += (s1, e1) => { + if(e1.KeyCode == Keys.F5) + { + btSearch.PerformClick(); + } + }; } + + void __Closed(object sender, FormClosedEventArgs e) { timer1.Stop(); diff --git a/SubProject/FPJ0000/Project/fProjectListUser.cs b/SubProject/FPJ0000/Project/fProjectListUser.cs index b4c8365..dc81338 100644 --- a/SubProject/FPJ0000/Project/fProjectListUser.cs +++ b/SubProject/FPJ0000/Project/fProjectListUser.cs @@ -223,7 +223,6 @@ namespace FPJ0000 var idinfo = uidinfo.Split('|'); var uid = idinfo[0]; - if (dtActUser.Select($"id='{uid}'").Any() == false) continue; var newdr = this.dSProjectSummary.ProjectCountForUser.NewProjectCountForUserRow(); @@ -243,21 +242,27 @@ namespace FPJ0000 //진행중인자료의 플랜을 확인한다. var listing = list.Where(t => t.status == "진행").ToList(); - newdr.CntNone = listing.Where(t => string.IsNullOrEmpty(t.ddate)).Count(); - newdr.Plan01 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-01")).Count(); - newdr.Plan02 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-02")).Count(); - newdr.Plan03 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-03")).Count(); - newdr.Plan04 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-04")).Count(); - newdr.Plan05 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-05")).Count(); - newdr.Plan06 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-06")).Count(); - newdr.Plan07 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-07")).Count(); - newdr.Plan08 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-08")).Count(); - newdr.Plan09 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-09")).Count(); - newdr.Plan10 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-10")).Count(); - newdr.Plan11 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-11")).Count(); - newdr.Plan12 = listing.Where(t => t.ddate.StartsWith($"{cmbYearS}-12")).Count(); + if(uid == "395552") + { - var nextyear = (int.Parse(cmbYearS.Text) + 1).ToString(); + } + + var yearstr = cmbYearS.Text; + newdr.CntNone = listing.Where(t => string.IsNullOrEmpty(t.ddate)).Count(); + newdr.Plan01 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-01")).Count(); + newdr.Plan02 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-02")).Count(); + newdr.Plan03 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-03")).Count(); + newdr.Plan04 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-04")).Count(); + newdr.Plan05 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-05")).Count(); + newdr.Plan06 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-06")).Count(); + newdr.Plan07 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-07")).Count(); + newdr.Plan08 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-08")).Count(); + newdr.Plan09 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-09")).Count(); + newdr.Plan10 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-10")).Count(); + newdr.Plan11 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-11")).Count(); + newdr.Plan12 = listing.Where(t => t.ddate.StartsWith($"{yearstr}-12")).Count(); + + var nextyear = (int.Parse(yearstr) + 1).ToString(); newdr.PlanNext = listing.Where(t => t.ddate.StartsWith($"{nextyear}")).Count(); newdr.CntOther = listing.Count - newdr.CntNone - newdr.PlanNext - newdr.Plan01 - newdr.Plan02 - newdr.Plan03 - newdr.Plan04 - newdr.Plan05 - newdr.Plan06 -