From e12f310ca2edf222f9583e0b5f5d0835777b917b Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 20 Nov 2024 11:41:35 +0900 Subject: [PATCH] .. --- Project/Properties/AssemblyInfo.cs | 4 +- .../FPJ0000/Project/fProjectList.Designer.cs | 76 ++++--- SubProject/FPJ0000/Project/fProjectList.resx | 2 +- .../fProjectPartToPurchaseCR.Designer.cs | 186 ++++++++++-------- .../Project/fProjectPartToPurchaseCR.cs | 6 +- 5 files changed, 144 insertions(+), 130 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 49be71a..4f28885 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.11.13.0000")] -[assembly: AssemblyFileVersion("24.11.13.0000")] +[assembly: AssemblyVersion("24.11.15.0000")] +[assembly: AssemblyFileVersion("24.11.15.0000")] diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index d7da195..a514557 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -337,7 +337,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(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -460,7 +459,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, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -527,7 +525,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(299, 418); + this.cm.Size = new System.Drawing.Size(297, 418); // // columnSizeToolStripMenuItem // @@ -537,14 +535,14 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.columnSizeToolStripMenuItem.Text = "열 너비"; // // autoToolStripMenuItem // this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.autoToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.autoToolStripMenuItem.Text = "Auto"; this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); // @@ -552,7 +550,7 @@ // this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // @@ -560,7 +558,7 @@ // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -568,40 +566,40 @@ // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(295, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(293, 6); // // 편집ToolStripMenuItem // this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem"; - this.편집ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.편집ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.편집ToolStripMenuItem.Text = "편집"; this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); // // partListToolStripMenuItem // this.partListToolStripMenuItem.Name = "partListToolStripMenuItem"; - this.partListToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.partListToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.partListToolStripMenuItem.Text = "부품목록"; this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click); // // iOMapToolStripMenuItem // this.iOMapToolStripMenuItem.Name = "iOMapToolStripMenuItem"; - this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.iOMapToolStripMenuItem.Text = "I/O LIST"; this.iOMapToolStripMenuItem.Click += new System.EventHandler(this.iOMapToolStripMenuItem_Click); // // 공유폴더ToolStripMenuItem // this.공유폴더ToolStripMenuItem.Name = "공유폴더ToolStripMenuItem"; - this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.공유폴더ToolStripMenuItem.Text = "공유 폴더"; this.공유폴더ToolStripMenuItem.Click += new System.EventHandler(this.공유폴더ToolStripMenuItem_Click); // @@ -609,52 +607,52 @@ // this.scheduleToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.scheduleToolStripMenuItem.Name = "scheduleToolStripMenuItem"; - this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.scheduleToolStripMenuItem.Text = "스케쥴 관리"; this.scheduleToolStripMenuItem.Click += new System.EventHandler(this.scheduleToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(295, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(293, 6); // // 메일발송주소관리ToolStripMenuItem // this.메일발송주소관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Gray; this.메일발송주소관리ToolStripMenuItem.Name = "메일발송주소관리ToolStripMenuItem"; - this.메일발송주소관리ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.메일발송주소관리ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.메일발송주소관리ToolStripMenuItem.Text = "메일발송 주소 관리"; this.메일발송주소관리ToolStripMenuItem.Click += new System.EventHandler(this.메일발송주소관리ToolStripMenuItem_Click); // // makeRepeatToolStripMenuItem // this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; - this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.makeRepeatToolStripMenuItem.Text = "복사"; this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // // 편집ToolStripMenuItem1 // this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(298, 36); + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(296, 36); this.편집ToolStripMenuItem1.Text = "편집"; // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(295, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(293, 6); // // 엑셀파일로저장ToolStripMenuItem // this.엑셀파일로저장ToolStripMenuItem.Name = "엑셀파일로저장ToolStripMenuItem"; - this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(298, 36); + this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(296, 36); this.엑셀파일로저장ToolStripMenuItem.Text = "목록 내보내기"; this.엑셀파일로저장ToolStripMenuItem.Click += new System.EventHandler(this.엑셀파일로저장ToolStripMenuItem_Click); // @@ -701,7 +699,6 @@ this.fpSpread1.Size = new System.Drawing.Size(1339, 261); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; - this.fpSpread1.SetViewportLeftColumn(0, 0, 15); // // fpSpread1_Sheet1 // @@ -795,6 +792,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).Tag = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; @@ -1831,7 +1829,7 @@ this.label33.BackColor = System.Drawing.Color.Gainsboro; this.label33.Dock = System.Windows.Forms.DockStyle.Fill; this.label33.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label33.Location = new System.Drawing.Point(667, 1); + this.label33.Location = new System.Drawing.Point(670, 1); this.label33.Margin = new System.Windows.Forms.Padding(0); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(80, 27); @@ -1846,7 +1844,7 @@ this.label34.Dock = System.Windows.Forms.DockStyle.Fill; this.label34.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label34.Location = new System.Drawing.Point(223, 1); + this.label34.Location = new System.Drawing.Point(224, 1); this.label34.Margin = new System.Windows.Forms.Padding(0); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(80, 27); @@ -1861,7 +1859,7 @@ this.label35.Dock = System.Windows.Forms.DockStyle.Fill; this.label35.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label35.Location = new System.Drawing.Point(445, 1); + this.label35.Location = new System.Drawing.Point(447, 1); this.label35.Margin = new System.Windows.Forms.Padding(0); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(80, 27); @@ -2237,7 +2235,7 @@ this.lbcnt1.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbcnt1.Location = new System.Drawing.Point(85, 1); this.lbcnt1.Name = "lbcnt1"; - this.lbcnt1.Size = new System.Drawing.Size(134, 27); + this.lbcnt1.Size = new System.Drawing.Size(135, 27); this.lbcnt1.TabIndex = 1; this.lbcnt1.Text = "000"; this.lbcnt1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2246,9 +2244,9 @@ // this.lbcnt2.Dock = System.Windows.Forms.DockStyle.Fill; this.lbcnt2.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbcnt2.Location = new System.Drawing.Point(307, 1); + this.lbcnt2.Location = new System.Drawing.Point(308, 1); this.lbcnt2.Name = "lbcnt2"; - this.lbcnt2.Size = new System.Drawing.Size(134, 27); + this.lbcnt2.Size = new System.Drawing.Size(135, 27); this.lbcnt2.TabIndex = 1; this.lbcnt2.Text = "000"; this.lbcnt2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2257,9 +2255,9 @@ // this.lbcnt3.Dock = System.Windows.Forms.DockStyle.Fill; this.lbcnt3.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbcnt3.Location = new System.Drawing.Point(529, 1); + this.lbcnt3.Location = new System.Drawing.Point(531, 1); this.lbcnt3.Name = "lbcnt3"; - this.lbcnt3.Size = new System.Drawing.Size(134, 27); + this.lbcnt3.Size = new System.Drawing.Size(135, 27); this.lbcnt3.TabIndex = 1; this.lbcnt3.Text = "000"; this.lbcnt3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2268,9 +2266,9 @@ // this.lbcnt4.Dock = System.Windows.Forms.DockStyle.Fill; this.lbcnt4.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbcnt4.Location = new System.Drawing.Point(751, 1); + this.lbcnt4.Location = new System.Drawing.Point(754, 1); this.lbcnt4.Name = "lbcnt4"; - this.lbcnt4.Size = new System.Drawing.Size(134, 27); + this.lbcnt4.Size = new System.Drawing.Size(135, 27); this.lbcnt4.TabIndex = 1; this.lbcnt4.Text = "000"; this.lbcnt4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2280,7 +2278,7 @@ this.label40.BackColor = System.Drawing.Color.Gainsboro; this.label40.Dock = System.Windows.Forms.DockStyle.Fill; this.label40.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label40.Location = new System.Drawing.Point(889, 1); + this.label40.Location = new System.Drawing.Point(893, 1); this.label40.Margin = new System.Windows.Forms.Padding(0); this.label40.Name = "label40"; this.label40.Size = new System.Drawing.Size(80, 27); @@ -2293,7 +2291,7 @@ this.label41.BackColor = System.Drawing.Color.Gainsboro; this.label41.Dock = System.Windows.Forms.DockStyle.Fill; this.label41.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label41.Location = new System.Drawing.Point(1111, 1); + this.label41.Location = new System.Drawing.Point(1116, 1); this.label41.Margin = new System.Windows.Forms.Padding(0); this.label41.Name = "label41"; this.label41.Size = new System.Drawing.Size(80, 27); @@ -2305,9 +2303,9 @@ // this.lbcnt5.Dock = System.Windows.Forms.DockStyle.Fill; this.lbcnt5.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbcnt5.Location = new System.Drawing.Point(973, 1); + this.lbcnt5.Location = new System.Drawing.Point(977, 1); this.lbcnt5.Name = "lbcnt5"; - this.lbcnt5.Size = new System.Drawing.Size(134, 27); + this.lbcnt5.Size = new System.Drawing.Size(135, 27); this.lbcnt5.TabIndex = 1; this.lbcnt5.Text = "000"; this.lbcnt5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2316,9 +2314,9 @@ // this.lbcnt6.Dock = System.Windows.Forms.DockStyle.Fill; this.lbcnt6.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbcnt6.Location = new System.Drawing.Point(1195, 1); + this.lbcnt6.Location = new System.Drawing.Point(1200, 1); this.lbcnt6.Name = "lbcnt6"; - this.lbcnt6.Size = new System.Drawing.Size(140, 27); + this.lbcnt6.Size = new System.Drawing.Size(135, 27); this.lbcnt6.TabIndex = 1; this.lbcnt6.Text = "000"; this.lbcnt6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2517,7 +2515,6 @@ private System.Windows.Forms.Label label41; private System.Windows.Forms.Label lbcnt5; private System.Windows.Forms.Label lbcnt6; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.Panel panel6; private System.Windows.Forms.Label label36; private System.Windows.Forms.Panel panel7; @@ -2525,5 +2522,6 @@ private System.Windows.Forms.Label label37; private System.Windows.Forms.Panel panel8; private System.Windows.Forms.Label label38; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 2940841..3a9f634 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -339,7 +339,7 @@ 248, 17 - 17, 56 + 17, 54 455, 17 diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs index e9ef7cc..b6e5ca2 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs @@ -37,7 +37,6 @@ System.Windows.Forms.Label label2; System.Windows.Forms.Label label17; System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectPartToPurchaseCR)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -46,6 +45,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectPartToPurchaseCR)); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); @@ -69,6 +69,16 @@ this.btEQManu = new System.Windows.Forms.Button(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.dv1 = new arCtl.arDatagridView(); + this.dvc_sid = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_model = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_priced = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_qtyreq = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_qty = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_amt = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_spm = new System.Windows.Forms.DataGridViewButtonColumn(); + this.dvc_remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); @@ -82,16 +92,7 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.taProject = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); - this.dvc_sid = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_model = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_priced = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_qtyreq = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_qty = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_amt = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_spm = new System.Windows.Forms.DataGridViewButtonColumn(); - this.dvc_remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.chkPriceZero = new System.Windows.Forms.CheckBox(); projectLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label(); @@ -326,6 +327,7 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.chkPriceZero); this.groupBox2.Controls.Add(this.tbManager); this.groupBox2.Controls.Add(label17); this.groupBox2.Controls.Add(this.btEQModel); @@ -442,6 +444,83 @@ this.dv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv1_CellEndEdit_1); this.dv1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dv1_CellFormatting); // + // dvc_sid + // + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_sid.DefaultCellStyle = dataGridViewCellStyle1; + this.dvc_sid.HeaderText = "SID"; + this.dvc_sid.Name = "dvc_sid"; + this.dvc_sid.ReadOnly = true; + // + // dvc_name + // + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_name.DefaultCellStyle = dataGridViewCellStyle2; + this.dvc_name.HeaderText = "품명"; + this.dvc_name.Name = "dvc_name"; + this.dvc_name.ReadOnly = true; + // + // dvc_model + // + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_model.DefaultCellStyle = dataGridViewCellStyle3; + this.dvc_model.HeaderText = "모델"; + this.dvc_model.Name = "dvc_model"; + this.dvc_model.ReadOnly = true; + // + // dvc_price + // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle4.Format = "N0"; + this.dvc_price.DefaultCellStyle = dataGridViewCellStyle4; + this.dvc_price.HeaderText = "단가(KRW)"; + this.dvc_price.Name = "dvc_price"; + // + // dvc_priced + // + this.dvc_priced.HeaderText = "단가(USD)"; + this.dvc_priced.Name = "dvc_priced"; + // + // dvc_qtyreq + // + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_qtyreq.DefaultCellStyle = dataGridViewCellStyle5; + this.dvc_qtyreq.HeaderText = "구매요청"; + this.dvc_qtyreq.Name = "dvc_qtyreq"; + this.dvc_qtyreq.ReadOnly = true; + // + // dvc_qty + // + dataGridViewCellStyle6.Format = "N0"; + this.dvc_qty.DefaultCellStyle = dataGridViewCellStyle6; + this.dvc_qty.HeaderText = "구매신청"; + this.dvc_qty.Name = "dvc_qty"; + // + // dvc_amt + // + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle7.Format = "N0"; + this.dvc_amt.DefaultCellStyle = dataGridViewCellStyle7; + this.dvc_amt.HeaderText = "구매금액"; + this.dvc_amt.Name = "dvc_amt"; + this.dvc_amt.ReadOnly = true; + // + // dvc_spm + // + this.dvc_spm.HeaderText = "SPM"; + this.dvc_spm.Name = "dvc_spm"; + // + // dvc_remark + // + this.dvc_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dvc_remark.DefaultCellStyle = dataGridViewCellStyle8; + this.dvc_remark.HeaderText = "비고"; + this.dvc_remark.Name = "dvc_remark"; + // // toolStrip1 // this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -562,82 +641,16 @@ // this.taPart.ClearBeforeFill = true; // - // dvc_sid + // chkPriceZero // - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_sid.DefaultCellStyle = dataGridViewCellStyle1; - this.dvc_sid.HeaderText = "SID"; - this.dvc_sid.Name = "dvc_sid"; - this.dvc_sid.ReadOnly = true; - // - // dvc_name - // - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_name.DefaultCellStyle = dataGridViewCellStyle2; - this.dvc_name.HeaderText = "품명"; - this.dvc_name.Name = "dvc_name"; - this.dvc_name.ReadOnly = true; - // - // dvc_model - // - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_model.DefaultCellStyle = dataGridViewCellStyle3; - this.dvc_model.HeaderText = "모델"; - this.dvc_model.Name = "dvc_model"; - this.dvc_model.ReadOnly = true; - // - // dvc_price - // - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle4.Format = "N0"; - this.dvc_price.DefaultCellStyle = dataGridViewCellStyle4; - this.dvc_price.HeaderText = "단가(KRW)"; - this.dvc_price.Name = "dvc_price"; - // - // dvc_priced - // - this.dvc_priced.HeaderText = "단가(USD)"; - this.dvc_priced.Name = "dvc_priced"; - // - // dvc_qtyreq - // - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_qtyreq.DefaultCellStyle = dataGridViewCellStyle5; - this.dvc_qtyreq.HeaderText = "구매요청"; - this.dvc_qtyreq.Name = "dvc_qtyreq"; - this.dvc_qtyreq.ReadOnly = true; - // - // dvc_qty - // - dataGridViewCellStyle6.Format = "N0"; - this.dvc_qty.DefaultCellStyle = dataGridViewCellStyle6; - this.dvc_qty.HeaderText = "구매신청"; - this.dvc_qty.Name = "dvc_qty"; - // - // dvc_amt - // - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle7.Format = "N0"; - this.dvc_amt.DefaultCellStyle = dataGridViewCellStyle7; - this.dvc_amt.HeaderText = "구매금액"; - this.dvc_amt.Name = "dvc_amt"; - this.dvc_amt.ReadOnly = true; - // - // dvc_spm - // - this.dvc_spm.HeaderText = "SPM"; - this.dvc_spm.Name = "dvc_spm"; - // - // dvc_remark - // - this.dvc_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dvc_remark.DefaultCellStyle = dataGridViewCellStyle8; - this.dvc_remark.HeaderText = "비고"; - this.dvc_remark.Name = "dvc_remark"; + this.chkPriceZero.AutoSize = true; + this.chkPriceZero.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.chkPriceZero.Location = new System.Drawing.Point(315, 124); + this.chkPriceZero.Name = "chkPriceZero"; + this.chkPriceZero.Size = new System.Drawing.Size(168, 25); + this.chkPriceZero.TabIndex = 50; + this.chkPriceZero.Text = "단가 0원 입력 허용"; + this.chkPriceZero.UseVisualStyleBackColor = true; // // fProjectPartToPurchaseCR // @@ -719,5 +732,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dvc_amt; private System.Windows.Forms.DataGridViewButtonColumn dvc_spm; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_remark; + private System.Windows.Forms.CheckBox chkPriceZero; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs index 6804e41..3367062 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs @@ -283,12 +283,14 @@ namespace FPJ0000 FCOMMON.Util.MsgE("SPM검사가 완료되지 않았습니다"); return false; } - //if (sidval.Length != 9) + if (chkPriceZero.Checked == false) { decimal.TryParse(prival, out decimal price); if (price < 2) { - FCOMMON.Util.MsgE("단가를 입력해야 합니다\n신규 품목이라면 견적서의 단가를 입력하세요\n기존 품목 중 단가를 알 수 없다면 [구매담당]에게 문의하세요"); + FCOMMON.Util.MsgE("단가를 입력해야 합니다\n신규 품목이라면 견적서의 단가를 입력하세요\n" + + "기존 품목 중 단가를 알 수 없다면 [구매담당]에게 문의하세요\n" + + "0원 단가를 강제 입력하려면 상단의 '단가 0원 입력허용] 체크를 한 후 다시 시도하세요"); return false; } }