From 71b362c05bd5d742432d04d41c0b23ec4077ed18 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 3 Jun 2021 18:28:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=9E=90=EC=8B=A4=20=EC=97=85?= =?UTF-8?q?=EB=AC=B4=EC=9D=BC=EC=A7=80=20=EC=9D=BC=EB=B6=80=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=EB=A7=8C=20=EC=9D=B4=EC=98=A4=EB=82=98=EC=9D=B4?= =?UTF-8?q?=EC=A0=80=EB=A1=9C=20=EB=AA=A9=EB=A1=9D=EC=9D=84=20=EA=B3=A0?= =?UTF-8?q?=EC=A0=95=ED=95=A8(=EC=A0=95=EA=B8=B0=EC=88=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FPJ0000/EBoard/fEboardData.Designer.cs | 10 ++++++--- SubProject/FPJ0000/EBoard/fEboardData.cs | 21 +++++++++++-------- SubProject/FPJ0000/EBoard/fEboardList.cs | 1 + 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs index f4fda99..f4bb689 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs @@ -584,8 +584,9 @@ this.cmbBoardName.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbBoardName.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbBoardName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "BoardName", true)); - this.cmbBoardName.Enabled = false; this.cmbBoardName.FormattingEnabled = true; + this.cmbBoardName.Items.AddRange(new object[] { + "IONIZER"}); this.cmbBoardName.Location = new System.Drawing.Point(89, 383); this.cmbBoardName.Name = "cmbBoardName"; this.cmbBoardName.Size = new System.Drawing.Size(148, 20); @@ -596,8 +597,9 @@ this.cmbModel.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbModel.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbModel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Model", true)); - this.cmbModel.Enabled = false; this.cmbModel.FormattingEnabled = true; + this.cmbModel.Items.AddRange(new object[] { + "IONIZER"}); this.cmbModel.Location = new System.Drawing.Point(89, 344); this.cmbModel.Name = "cmbModel"; this.cmbModel.Size = new System.Drawing.Size(148, 20); @@ -608,8 +610,9 @@ this.cmbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbProcess.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbProcess.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Process", true)); - this.cmbProcess.Enabled = false; this.cmbProcess.FormattingEnabled = true; + this.cmbProcess.Items.AddRange(new object[] { + "IONIZER"}); this.cmbProcess.Location = new System.Drawing.Point(89, 305); this.cmbProcess.Name = "cmbProcess"; this.cmbProcess.Size = new System.Drawing.Size(148, 20); @@ -971,6 +974,7 @@ this.tableAdapterManager.EETGW_JobReport_EBoardTableAdapter = this.ta; this.tableAdapterManager.EETGW_NoteTableAdapter = null; this.tableAdapterManager.EETGW_ProjecthistoryDTableAdapter = null; + this.tableAdapterManager.EETGW_ProjectsScheduleTableAdapter = null; this.tableAdapterManager.EETGW_ProjectToDoTableAdapter = null; this.tableAdapterManager.EETGW_SaveCostTableAdapter = null; this.tableAdapterManager.JobReportTableAdapter = null; diff --git a/SubProject/FPJ0000/EBoard/fEboardData.cs b/SubProject/FPJ0000/EBoard/fEboardData.cs index 057ca20..e347cbe 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.cs @@ -55,13 +55,15 @@ namespace FPJ0000 var lst_req = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.요청자) == false).OrderBy(t => t.요청자).GroupBy(t => t.요청자).Select(t => t.FirstOrDefault()); SetComboboxItems(cmb요청자,lst_req.Select(t => t.요청자).ToArray()); - //모델 - var lst_mod = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Model) == false).OrderBy(t => t.Model).GroupBy(t => t.Model).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbModel,lst_mod.Select(t => t.Model).ToArray()); + ////모델 + //var lst_mod = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Model) == false).OrderBy(t => t.Model).GroupBy(t => t.Model).Select(t => t.FirstOrDefault()); + //SetComboboxItems(cmbModel,lst_mod.Select(t => t.Model).ToArray()); + // cmbModel.Enabled = true; - //BoardName - var lst_bon = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.BoardName) == false).OrderBy(t => t.BoardName).GroupBy(t => t.BoardName).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbBoardName,lst_bon.Select(t => t.BoardName).ToArray()); + ////BoardName + //var lst_bon = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.BoardName) == false).OrderBy(t => t.BoardName).GroupBy(t => t.BoardName).Select(t => t.FirstOrDefault()); + //SetComboboxItems(cmbBoardName,lst_bon.Select(t => t.BoardName).ToArray()); + // cmbBoardName.Enabled = true; //BoardVender var lst_bvn = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.BoardVender) == false).OrderBy(t => t.BoardVender).GroupBy(t => t.BoardVender).Select(t => t.FirstOrDefault()); @@ -95,9 +97,10 @@ namespace FPJ0000 //var lst_tem = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Team) == false).OrderBy(t => t.Team).GroupBy(t => t.Team).Select(t => t.FirstOrDefault()); //SetComboboxItems(cmbTeam,lst_tem.Select(t => t.Team).ToArray()); - //Process - var lst_prc = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Process) == false).OrderBy(t => t.Process).GroupBy(t => t.Process).Select(t => t.FirstOrDefault()); - SetComboboxItems(cmbProcess,lst_prc.Select(t => t.Process).ToArray()); + ////Process + //var lst_prc = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.Process) == false).OrderBy(t => t.Process).GroupBy(t => t.Process).Select(t => t.FirstOrDefault()); + //SetComboboxItems(cmbProcess,lst_prc.Select(t => t.Process).ToArray()); + // cmbProcess.Enabled = true; //외주업체 var lst_ext = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.외주업체) == false).OrderBy(t => t.외주업체).GroupBy(t => t.외주업체).Select(t => t.FirstOrDefault()); diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 0931328..4a8b46d 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -26,6 +26,7 @@ namespace FPJ0000 private void FpSpread1_KeyDown(object sender, KeyEventArgs e) { var cell = this.fpSpread1.ActiveSheet.ActiveCell; + if (cell == null) return; var colIndex = cell.Column.Index; var rowIndex = cell.Row.Index; if (e.KeyCode == Keys.L && e.Alt)