diff --git a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs
index 9cc72a8..23eae73 100644
--- a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs
@@ -55,6 +55,8 @@
this.tbCostReduct = new System.Windows.Forms.TextBox();
this.tbQty = new System.Windows.Forms.TextBox();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
+ this.bs = new System.Windows.Forms.BindingSource(this.components);
+ this.dsPRJ = new FPJ0000.dsPRJ();
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
@@ -85,14 +87,12 @@
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.arLabel6 = new arCtl.arLabel();
this.arPanel1 = new arCtl.arPanel();
+ this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.arPanel2 = new arCtl.arPanel();
- this.arLabel7 = new arCtl.arLabel();
- this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
this.richTextBoxEx2 = new RichTextBoxEx.RichTextBoxEx();
- this.bs = new System.Windows.Forms.BindingSource(this.components);
- this.dsPRJ = new FPJ0000.dsPRJ();
+ this.arLabel7 = new arCtl.arLabel();
this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter();
this.tableAdapterManager = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
costoLabel = new System.Windows.Forms.Label();
@@ -115,13 +115,13 @@
label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
this.panel1.SuspendLayout();
this.arPanel1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.arPanel2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
this.SuspendLayout();
//
// costoLabel
@@ -372,6 +372,17 @@
this.bn.TabIndex = 65;
this.bn.Text = "bindingNavigator1";
//
+ // bs
+ //
+ this.bs.DataMember = "EETGW_JobReport_EBoard";
+ this.bs.DataSource = this.dsPRJ;
+ this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
+ //
+ // dsPRJ
+ //
+ this.dsPRJ.DataSetName = "dsPRJ";
+ this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+ //
// bindingNavigatorCountItem
//
this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -773,7 +784,8 @@
//
// arPanel1
//
- this.arPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.arPanel1.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.arPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
@@ -803,6 +815,29 @@
this.arPanel1.TextShadow = false;
this.arPanel1.UseProgressBar = false;
//
+ // richTextBoxEx1
+ //
+ this.richTextBoxEx1.AllowBullets = true;
+ this.richTextBoxEx1.AllowDefaultInsertText = true;
+ this.richTextBoxEx1.AllowDefaultSmartText = true;
+ this.richTextBoxEx1.AllowHyphenation = true;
+ this.richTextBoxEx1.AllowPictures = true;
+ this.richTextBoxEx1.AllowSpellCheck = true;
+ this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
+ this.richTextBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+ this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBoxEx1.FilePath = "";
+ this.richTextBoxEx1.Location = new System.Drawing.Point(1, 24);
+ this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.richTextBoxEx1.Name = "richTextBoxEx1";
+ this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
+ "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
+ "Ex1\\par\r\n}\r\n";
+ this.richTextBoxEx1.SetColorWithFont = true;
+ this.richTextBoxEx1.ShowToolStrip = true;
+ this.richTextBoxEx1.Size = new System.Drawing.Size(545, 215);
+ this.richTextBoxEx1.TabIndex = 87;
+ //
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
@@ -859,6 +894,28 @@
this.arPanel2.TextShadow = false;
this.arPanel2.UseProgressBar = false;
//
+ // richTextBoxEx2
+ //
+ this.richTextBoxEx2.AllowBullets = true;
+ this.richTextBoxEx2.AllowDefaultInsertText = true;
+ this.richTextBoxEx2.AllowDefaultSmartText = true;
+ this.richTextBoxEx2.AllowHyphenation = true;
+ this.richTextBoxEx2.AllowPictures = true;
+ this.richTextBoxEx2.AllowSpellCheck = true;
+ this.richTextBoxEx2.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
+ this.richTextBoxEx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBoxEx2.FilePath = "";
+ this.richTextBoxEx2.Location = new System.Drawing.Point(1, 24);
+ this.richTextBoxEx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.richTextBoxEx2.Name = "richTextBoxEx2";
+ this.richTextBoxEx2.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
+ "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
+ "Ex2\\par\r\n}\r\n";
+ this.richTextBoxEx2.SetColorWithFont = true;
+ this.richTextBoxEx2.ShowToolStrip = true;
+ this.richTextBoxEx2.Size = new System.Drawing.Size(453, 631);
+ this.richTextBoxEx2.TabIndex = 87;
+ //
// arLabel7
//
this.arLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
@@ -903,62 +960,6 @@
this.arLabel7.TextShadow = true;
this.arLabel7.TextVisible = true;
//
- // richTextBoxEx1
- //
- this.richTextBoxEx1.AllowBullets = true;
- this.richTextBoxEx1.AllowDefaultInsertText = true;
- this.richTextBoxEx1.AllowDefaultSmartText = true;
- this.richTextBoxEx1.AllowHyphenation = true;
- this.richTextBoxEx1.AllowPictures = true;
- this.richTextBoxEx1.AllowSpellCheck = true;
- this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
- this.richTextBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
- this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.richTextBoxEx1.FilePath = "";
- this.richTextBoxEx1.Location = new System.Drawing.Point(1, 24);
- this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.richTextBoxEx1.Name = "richTextBoxEx1";
- this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
- "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
- "Ex1\\par\r\n}\r\n";
- this.richTextBoxEx1.SetColorWithFont = true;
- this.richTextBoxEx1.ShowToolStrip = true;
- this.richTextBoxEx1.Size = new System.Drawing.Size(545, 215);
- this.richTextBoxEx1.TabIndex = 87;
- //
- // richTextBoxEx2
- //
- this.richTextBoxEx2.AllowBullets = true;
- this.richTextBoxEx2.AllowDefaultInsertText = true;
- this.richTextBoxEx2.AllowDefaultSmartText = true;
- this.richTextBoxEx2.AllowHyphenation = true;
- this.richTextBoxEx2.AllowPictures = true;
- this.richTextBoxEx2.AllowSpellCheck = true;
- this.richTextBoxEx2.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
- this.richTextBoxEx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.richTextBoxEx2.FilePath = "";
- this.richTextBoxEx2.Location = new System.Drawing.Point(1, 24);
- this.richTextBoxEx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.richTextBoxEx2.Name = "richTextBoxEx2";
- this.richTextBoxEx2.Rtf = "{\\rtf1\\ansi\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\*\\generator " +
- "Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBoxEx2\\par\r\n}\r\n" +
- "";
- this.richTextBoxEx2.SetColorWithFont = true;
- this.richTextBoxEx2.ShowToolStrip = true;
- this.richTextBoxEx2.Size = new System.Drawing.Size(453, 631);
- this.richTextBoxEx2.TabIndex = 87;
- //
- // bs
- //
- this.bs.DataMember = "EETGW_JobReport_EBoard";
- this.bs.DataSource = this.dsPRJ;
- this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
- //
- // dsPRJ
- //
- this.dsPRJ.DataSetName = "dsPRJ";
- this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
- //
// ta
//
this.ta.ClearBeforeFill = true;
@@ -997,14 +998,14 @@
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.arPanel1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.arPanel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/SubProject/FPJ0000/EBoard/fEboardData.resx b/SubProject/FPJ0000/EBoard/fEboardData.resx
index 117f376..28a9728 100644
--- a/SubProject/FPJ0000/EBoard/fEboardData.resx
+++ b/SubProject/FPJ0000/EBoard/fEboardData.resx
@@ -236,9 +236,6 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-
- 17, 17
-
230, 17