From fc25ac4ccaf39b8e9bdb169f9f80d5a1bc2e7be2 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 17 Feb 2021 11:59:26 +0900 Subject: [PATCH] .. --- Project/Dialog/fLogin.cs | 9 +- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FBS0000/formSetting/fBase.xml | 3 + SubProject/FCM0000/Mail/fMailList.Designer.cs | 21 +- .../FEQ0000/Purchase/fPurchase.Designer.cs | 313 +++++++++--------- SubProject/FEQ0000/Purchase/fPurchase.resx | 84 ++--- .../Purchase/fPurchaseNRList.Designer.cs | 264 ++++++++------- .../FEQ0000/Purchase/fPurchaseNRList.cs | 12 +- .../FEQ0000/Purchase/fPurchaseNRList.resx | 5 +- .../FPJ0000/EBoard/fEboardData.Designer.cs | 24 +- SubProject/FPJ0000/EETGW_JobReport_EBoard.cs | 2 + SubProject/FPJ0000/EETGW_SaveCost.cs | 1 + SubProject/FPJ0000/FPJ0000.csproj | 6 + SubProject/FPJ0000/MailData.cs | 35 ++ SubProject/FPJ0000/MailForm.cs | 35 ++ SubProject/FPJ0000/Model1.Context.cs | 2 + SubProject/FPJ0000/Model1.edmx | 153 ++++++++- SubProject/FPJ0000/Model1.edmx.diagram | 2 + .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- .../FPJ0000/Project/fProjectData.Designer.cs | 128 +++---- SubProject/FPJ0000/Project/fProjectData.cs | 69 +++- .../FPJ0000/Project/fProjectList.Designer.cs | 2 + SubProject/FPJ0000/Project/fProjectList.cs | 1 + SubProject/FPJ0000/Project/fProjectList.resx | 44 +-- SubProject/FPJ0000/vUserWorkTimeList.cs | 1 + 25 files changed, 787 insertions(+), 461 deletions(-) create mode 100644 SubProject/FBS0000/formSetting/fBase.xml create mode 100644 SubProject/FPJ0000/MailData.cs create mode 100644 SubProject/FPJ0000/MailForm.cs diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 4d3bdde..6f1ffe5 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -23,6 +23,7 @@ namespace Project.Dialog { if (e1.KeyCode == Keys.Escape) this.Close(); }; + this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion); } private void fLogin_Load(object sender, EventArgs e) { @@ -132,8 +133,8 @@ namespace Project.Dialog FCOMMON.info.Login.hp = userdr.hp; FCOMMON.info.Login.tel = userdr.tel; FCOMMON.info.Login.title = userdr.ads_title; - var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + userdr.dept + "'"); - var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + userdr.dept + "'"); + //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); FCOMMON.info.Login.gcode = gCode;// gcode; FCOMMON.info.Login.process = userdr.processs; FCOMMON.info.Login.permission = 0; @@ -142,10 +143,10 @@ namespace Project.Dialog using (var dbEnity = new EEEntitiesMain()) { - var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gcode).FirstOrDefault(); + var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); FCOMMON.info.Login.process = drGrpUser.Process; } - + //로그인정보 기록 AddLoginInfo(); diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 69a0144..116b2ab 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("21.02.07.0030")] -[assembly: AssemblyFileVersion("21.02.07.0030")] +[assembly: AssemblyVersion("21.02.16.1430")] +[assembly: AssemblyFileVersion("21.02.16.1430")] diff --git a/SubProject/FBS0000/formSetting/fBase.xml b/SubProject/FBS0000/formSetting/fBase.xml new file mode 100644 index 0000000..1c127b4 --- /dev/null +++ b/SubProject/FBS0000/formSetting/fBase.xml @@ -0,0 +1,3 @@ + + + diff --git a/SubProject/FCM0000/Mail/fMailList.Designer.cs b/SubProject/FCM0000/Mail/fMailList.Designer.cs index 8582c38..0007de9 100644 --- a/SubProject/FCM0000/Mail/fMailList.Designer.cs +++ b/SubProject/FCM0000/Mail/fMailList.Designer.cs @@ -38,7 +38,9 @@ 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.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); this.dSMail = new FCM0000.DSMail(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FCM0000.DSMailTableAdapters.MailDataTableAdapter(); @@ -179,6 +181,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"; @@ -305,7 +308,7 @@ 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 = 9; + this.fpSpread1_Sheet1.ColumnCount = 11; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -317,6 +320,8 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "숨은참조"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "참조"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "전송"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "전송시간"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 32F; this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "SendOK"; @@ -343,8 +348,18 @@ this.fpSpread1_Sheet1.Columns.Get(7).DataField = "SendMsg"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "cate"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "SendOK"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "전송"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "SendMsg"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "cate"; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 8b7a7f1..7427dd3 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,33 +30,33 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + 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.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -83,6 +83,7 @@ this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton(); this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.구매승인양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -130,7 +131,6 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.label1 = new System.Windows.Forms.Label(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -370,6 +370,15 @@ this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(6, 26); // + // toolStripButton6 + // + this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(92, 23); + this.toolStripButton6.Text = "ClipCopy(&V)"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); + // // toolStripButton1 // this.toolStripButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -448,7 +457,7 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.columnSizeToolStripMenuItem.Text = "Column Size"; // // autoToolStripMenuItem @@ -486,64 +495,64 @@ // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(313, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(310, 6); // // exportDataToolStripMenuItem // this.exportDataToolStripMenuItem.Name = "exportDataToolStripMenuItem"; - this.exportDataToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.exportDataToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.exportDataToolStripMenuItem.Text = "목록 내보내기(xls)"; this.exportDataToolStripMenuItem.Click += new System.EventHandler(this.exportDataToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(313, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(310, 6); // // 추가ToolStripMenuItem // this.추가ToolStripMenuItem.Name = "추가ToolStripMenuItem"; - this.추가ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.추가ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.추가ToolStripMenuItem.Text = "추가"; this.추가ToolStripMenuItem.Click += new System.EventHandler(this.추가ToolStripMenuItem_Click); // // makeRepeatToolStripMenuItem // this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; - this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.makeRepeatToolStripMenuItem.Text = "복사"; this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); // // 편집ToolStripMenuItem1 // this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(316, 42); + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(313, 42); this.편집ToolStripMenuItem1.Text = "편집"; this.편집ToolStripMenuItem1.Click += new System.EventHandler(this.편집ToolStripMenuItem1_Click); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(313, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(310, 6); // // sC검색ToolStripMenuItem // this.sC검색ToolStripMenuItem.Name = "sC검색ToolStripMenuItem"; - this.sC검색ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.sC검색ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.sC검색ToolStripMenuItem.Text = "S/C 검색"; this.sC검색ToolStripMenuItem.Click += new System.EventHandler(this.sC검색ToolStripMenuItem_Click); // // cRCF검색ToolStripMenuItem // this.cRCF검색ToolStripMenuItem.Name = "cRCF검색ToolStripMenuItem"; - this.cRCF검색ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.cRCF검색ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); this.cRCF검색ToolStripMenuItem.Text = "CR/CF 검색"; this.cRCF검색ToolStripMenuItem.Click += new System.EventHandler(this.cRCF검색ToolStripMenuItem_Click); // @@ -795,9 +804,9 @@ 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 = "비고"; - 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, 21).Value = "프로젝트"; + 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 = "입고일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "입고수량"; @@ -806,234 +815,228 @@ 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 = textCellType39; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; 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 = 77F; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F; 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 = textCellType40; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; 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 = 49F; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType41; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType42; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 49F; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType43; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; 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 = 37F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType44; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; 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 = "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).Width = 24F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType45; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; 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 = "CR/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).Width = 43F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType46; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; 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 = 33F; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType47; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; 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 = 51F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType48; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; 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 = 33F; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType15.DecimalPlaces = 0; - numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType15.MaximumValue = 2147483647D; - numberCellType15.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType15; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; 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 = 14F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType49; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; 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 = 33F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType50; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사"; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 45F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType50; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정"; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType50; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델"; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 33F; - numberCellType16.DecimalPlaces = 0; - numberCellType16.NegativeRed = true; - numberCellType16.NullDisplay = "--"; - numberCellType16.Separator = ","; - numberCellType16.ShowSeparator = true; - numberCellType16.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType16; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumqty"; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType51; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit"; 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).Width = 33F; - numberCellType17.DecimalPlaces = 0; - numberCellType17.MaximumValue = 9999999999999.99D; - numberCellType17.MinimumValue = -9999999999999.99D; - numberCellType17.NegativeRed = true; - numberCellType17.NullDisplay = "--"; - numberCellType17.Separator = ","; - numberCellType17.ShowSeparator = true; - numberCellType17.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType17; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; + numberCellType3.DecimalPlaces = 0; + numberCellType3.MaximumValue = 9999999999999.99D; + numberCellType3.MinimumValue = -9999999999999.99D; + numberCellType3.NegativeRed = true; + numberCellType3.NullDisplay = "--"; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + numberCellType3.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; 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 = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 33F; - numberCellType18.DecimalPlaces = 0; - numberCellType18.MaximumValue = 9999999999999.99D; - numberCellType18.MinimumValue = -9999999999999.99D; - numberCellType18.NegativeRed = true; - numberCellType18.NullDisplay = "--"; - numberCellType18.Separator = ","; - numberCellType18.ShowSeparator = true; - numberCellType18.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType18; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; + numberCellType4.DecimalPlaces = 0; + numberCellType4.MaximumValue = 9999999999999.99D; + numberCellType4.MinimumValue = -9999999999999.99D; + numberCellType4.NegativeRed = true; + numberCellType4.NullDisplay = "--"; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + numberCellType4.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; 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 = 33F; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType52; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; 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 = 49F; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType19.DecimalPlaces = 0; - numberCellType19.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType19.MaximumValue = 2147483647D; - numberCellType19.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType19; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5; 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).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType53; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "비고"; - 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(22).CellType = textCellType54; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "프로젝트"; - this.fpSpread1_Sheet1.Columns.Get(22).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType20.DecimalPlaces = 0; - numberCellType20.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType20.MaximumValue = 2147483647D; - numberCellType20.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType20; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx"; - 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 = "projectidx"; - this.fpSpread1_Sheet1.Columns.Get(23).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType55; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "프로젝트"; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx"; + this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + 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 = 51F; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate"; 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).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType56; + this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(25).Tag = "indate"; - this.fpSpread1_Sheet1.Columns.Get(25).Width = 33F; - numberCellType21.NegativeRed = true; - numberCellType21.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType21; + this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; + numberCellType7.NegativeRed = true; + numberCellType7.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(26).Width = 41F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType57; + this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po"; - this.fpSpread1_Sheet1.Columns.Get(27).Width = 32F; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType1; 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 = 45F; + this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton6 - // - this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image"))); - this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton6.Name = "toolStripButton6"; - this.toolStripButton6.Size = new System.Drawing.Size(92, 23); - this.toolStripButton6.Text = "ClipCopy(&V)"; - this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1136,7 +1139,7 @@ private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripMenuItem 구매승인양식ToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton6; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 035adbc..eb62ab3 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -249,57 +249,57 @@ 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 - sbJ4gUAg+AsGD6FJM3GofAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9 + WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO + 98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2 + 1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ + QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30 + xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9 + IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T + 8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9 + ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN + yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt + kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh + EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC + WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV + LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII= @@ -401,7 +401,7 @@ - 17, 62 + 579, 23 65 diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNRList.Designer.cs index 95c1d13..fa4441c 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNRList.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNRList.Designer.cs @@ -30,21 +30,20 @@ namespace FEQ0000 private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseNRList)); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = 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 textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.bs1 = new System.Windows.Forms.BindingSource(this.components); this.ds1 = new FEQ0000.dsPurchase(); this.ta1 = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -60,17 +59,19 @@ namespace FEQ0000 this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // fpSpread1 // this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.AutoFitColumnOptions = FarPoint.Win.Spread.PreferredSizeColumnOptions.IncludeAll; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.Location = new System.Drawing.Point(0, 0); this.fpSpread1.Name = "fpSpread1"; @@ -79,118 +80,6 @@ namespace FEQ0000 this.fpSpread1.Size = new System.Drawing.Size(1114, 595); this.fpSpread1.TabIndex = 7; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - 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 = 12; - 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 = "Shopping Cart#"; - 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 = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단위"; - 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 = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "requestName"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 108F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sc"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "Shopping Cart#"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 112F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 98F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pumname"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "pumscale"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 104F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "pumqty"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "수량"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 91F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumunit"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 126F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumprice"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 75F; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumamt"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 75F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supply"; - 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 126F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "bigo2"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 133F; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs1; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // bs1 // this.bs1.DataMember = "Purchase"; @@ -279,6 +168,7 @@ namespace FEQ0000 // 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"; @@ -322,6 +212,124 @@ namespace FEQ0000 this.toolStripButton1.Text = "Save Excel"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + 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 = 12; + 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 = "Shopping Cart#"; + 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 = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단위"; + 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 = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType5; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "requestName"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 108F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sc"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "Shopping Cart#"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 112F; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 98F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pumname"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "pumscale"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 104F; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + numberCellType6.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "pumqty"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "수량"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 91F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumunit"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 126F; + numberCellType7.DecimalPlaces = 0; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + numberCellType7.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumprice"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 75F; + numberCellType8.DecimalPlaces = 0; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + numberCellType8.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumamt"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "합계금액"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 75F; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "supply"; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 126F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "bigo2"; + 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 = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 133F; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs1; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // fPurchaseNRList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -335,12 +343,12 @@ namespace FEQ0000 this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.fEBoardReport_Load); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ds1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit(); this.bindingNavigator1.ResumeLayout(false); this.bindingNavigator1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -352,7 +360,6 @@ namespace FEQ0000 private dsPurchaseTableAdapters.PurchaseTableAdapter ta1; private dsPurchase ds1; private System.Windows.Forms.BindingSource bs1; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.BindingNavigator bindingNavigator1; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; @@ -365,5 +372,6 @@ namespace FEQ0000 private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.ToolStripButton toolStripButton1; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs b/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs index 94d6be2..c0b28de 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs @@ -23,7 +23,7 @@ namespace FEQ0000 { //기본엑셀파일을 가져온다 this.Show(); - this.bs1.Sort = "sc desc,requestname,sid,pumname"; + this.bs1.Sort = "sc,sid,pumname"; this.bs1.Filter = "sc <> ''"; Application.DoEvents(); @@ -31,11 +31,19 @@ namespace FEQ0000 LoadExcel(); //순번맥기기 + var sumamt = ds1.Purchase.Where(t=>t.sc != "").Sum(t => t.pumamt); for (int r = 0; r < this.fpSpread1.ActiveSheet.RowCount; r++) { - fpSpread1.ActiveSheet.Cells[r, 0].Value = r+1; + fpSpread1.ActiveSheet.Cells[r, 0].Value = r + 1; + } + //마지막 한줄 추가하고 합계 + fpSpread1.ActiveSheet.AddUnboundRows(fpSpread1.ActiveSheet.RowCount, 1); + fpSpread1.ActiveSheet.Cells[$"J{fpSpread1.ActiveSheet.RowCount}"].Value = sumamt; + fpSpread1.ActiveSheet.Cells[$"B{fpSpread1.ActiveSheet.RowCount}"].Value = "Total"; + fpSpread1.ActiveSheet.Cells[$"A{fpSpread1.ActiveSheet.RowCount}:L{fpSpread1.ActiveSheet.RowCount}"].BackColor = Color.FromArgb(220, 220, 220); + } void LoadExcel() diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.resx b/SubProject/FEQ0000/Purchase/fPurchaseNRList.resx index dde744d..e86ed04 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNRList.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNRList.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 373, 17 + 681, 17 302, 17 @@ -126,6 +126,9 @@ 231, 17 + + 231, 17 + 169, 17 diff --git a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs index 23eae73..903c94d 100644 --- a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs @@ -513,7 +513,7 @@ // // cmbBoardVender // - this.cmbBoardVender.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbBoardVender.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbBoardVender.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbBoardVender.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "BoardVender", true)); this.cmbBoardVender.Enabled = false; @@ -533,7 +533,7 @@ // // cmb분류 // - this.cmb분류.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmb분류.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmb분류.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmb분류.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "분류", true)); this.cmb분류.Enabled = false; @@ -545,7 +545,7 @@ // // cmb요청자 // - this.cmb요청자.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmb요청자.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmb요청자.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmb요청자.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "요청자", true)); this.cmb요청자.Enabled = false; @@ -557,7 +557,7 @@ // // cmb외주업체 // - this.cmb외주업체.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmb외주업체.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmb외주업체.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmb외주업체.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "외주업체", true)); this.cmb외주업체.Enabled = false; @@ -569,7 +569,7 @@ // // cmbSN // - this.cmbSN.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbSN.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbSN.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbSN.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "SN", true)); this.cmbSN.Enabled = false; @@ -581,7 +581,7 @@ // // cmbBoardName // - this.cmbBoardName.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + 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; @@ -593,7 +593,7 @@ // // cmbModel // - this.cmbModel.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + 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; @@ -605,7 +605,7 @@ // // cmbProcess // - this.cmbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + 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; @@ -617,7 +617,7 @@ // // cmbDivision // - this.cmbDivision.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbDivision.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbDivision.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbDivision.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Division", true)); this.cmbDivision.Enabled = false; @@ -629,7 +629,7 @@ // // cmbLine // - this.cmbLine.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbLine.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbLine.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbLine.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Line", true)); this.cmbLine.Enabled = false; @@ -641,7 +641,7 @@ // // cmbSite // - this.cmbSite.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbSite.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Append; this.cmbSite.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbSite.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Site", true)); this.cmbSite.Enabled = false; @@ -653,7 +653,7 @@ // // cmbUID // - this.cmbUID.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.cmbUID.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.cmbUID.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.cmbUID.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "uid", true)); this.cmbUID.Enabled = false; diff --git a/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs b/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs index 01d1f3c..2767314 100644 --- a/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs +++ b/SubProject/FPJ0000/EETGW_JobReport_EBoard.cs @@ -45,5 +45,7 @@ namespace FPJ0000 public Nullable import { get; set; } public string wuid { get; set; } public System.DateTime wdate { get; set; } + public string 원인2 { get; set; } + public string 결과2 { get; set; } } } diff --git a/SubProject/FPJ0000/EETGW_SaveCost.cs b/SubProject/FPJ0000/EETGW_SaveCost.cs index c7b943d..3e6a055 100644 --- a/SubProject/FPJ0000/EETGW_SaveCost.cs +++ b/SubProject/FPJ0000/EETGW_SaveCost.cs @@ -45,5 +45,6 @@ namespace FPJ0000 public string eepart { get; set; } public Nullable fanout { get; set; } public Nullable weekly { get; set; } + public Nullable Highlight { get; set; } } } diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index dec1e72..0146883 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -233,6 +233,12 @@ rJobReportUser.cs + + Model1.tt + + + Model1.tt + True True diff --git a/SubProject/FPJ0000/MailData.cs b/SubProject/FPJ0000/MailData.cs new file mode 100644 index 0000000..a010338 --- /dev/null +++ b/SubProject/FPJ0000/MailData.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace FPJ0000 +{ + using System; + using System.Collections.Generic; + + public partial class MailData + { + public int idx { get; set; } + public Nullable project { get; set; } + public string gcode { get; set; } + public string cate { get; set; } + public string pdate { get; set; } + public string subject { get; set; } + public string fromlist { get; set; } + public string tolist { get; set; } + public string bcc { get; set; } + public string cc { get; set; } + public string body { get; set; } + public Nullable SendOK { get; set; } + public string SendMsg { get; set; } + public Nullable aidx { get; set; } + public string atime { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } + } +} diff --git a/SubProject/FPJ0000/MailForm.cs b/SubProject/FPJ0000/MailForm.cs new file mode 100644 index 0000000..20d7790 --- /dev/null +++ b/SubProject/FPJ0000/MailForm.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace FPJ0000 +{ + using System; + using System.Collections.Generic; + + public partial class MailForm + { + public int idx { get; set; } + public string gcode { get; set; } + public string cate { get; set; } + public string title { get; set; } + public string tolist { get; set; } + public string bcc { get; set; } + public string cc { get; set; } + public string subject { get; set; } + public string tail { get; set; } + public string body { get; set; } + public Nullable selfTo { get; set; } + public Nullable selfCC { get; set; } + public Nullable selfBCC { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } + public string exceptmail { get; set; } + public string exceptmailcc { get; set; } + } +} diff --git a/SubProject/FPJ0000/Model1.Context.cs b/SubProject/FPJ0000/Model1.Context.cs index 8296734..3f6e0ea 100644 --- a/SubProject/FPJ0000/Model1.Context.cs +++ b/SubProject/FPJ0000/Model1.Context.cs @@ -35,5 +35,7 @@ namespace FPJ0000 public virtual DbSet vJobReportForUser { get; set; } public virtual DbSet EETGW_JobReport_EBoard { get; set; } public virtual DbSet EETGW_SaveCost { get; set; } + public virtual DbSet MailData { get; set; } + public virtual DbSet MailForm { get; set; } } } diff --git a/SubProject/FPJ0000/Model1.edmx b/SubProject/FPJ0000/Model1.edmx index 2dea09e..a827f6c 100644 --- a/SubProject/FPJ0000/Model1.edmx +++ b/SubProject/FPJ0000/Model1.edmx @@ -55,6 +55,8 @@ + + @@ -91,6 +93,7 @@ + @@ -103,6 +106,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,12 +268,15 @@ + + + @@ -292,7 +342,8 @@ [vUserWorkTimeList].[uid] AS [uid], [vUserWorkTimeList].[uname] AS [uname], [vUserWorkTimeList].[hrs] AS [hrs], - [vUserWorkTimeList].[ot] AS [ot] + [vUserWorkTimeList].[ot] AS [ot], + [vUserWorkTimeList].[UserProcess] AS [UserProcess] FROM [dbo].[vUserWorkTimeList] AS [vUserWorkTimeList] @@ -380,6 +431,7 @@ + @@ -392,6 +444,8 @@ + + @@ -484,6 +538,8 @@ + + @@ -520,6 +576,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -599,6 +700,7 @@ + @@ -670,6 +772,8 @@ + + @@ -707,6 +811,7 @@ + @@ -741,6 +846,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/Model1.edmx.diagram b/SubProject/FPJ0000/Model1.edmx.diagram index e0afde4..f39ba70 100644 --- a/SubProject/FPJ0000/Model1.edmx.diagram +++ b/SubProject/FPJ0000/Model1.edmx.diagram @@ -15,6 +15,8 @@ + + diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 5ff68ff..5e2dfa6 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY - zVTMvM0pmprowiBbTCPzEprooEK0ohcV2kWnNnVuc7rhjMxlajrvgpel7nKO29n89pyzpQZCP/jwvHjO - 98P5fc/hsRN6T5V0sVyniKrQ/Q6T6Chy0hyV7Kmno8r76YjHWuMZsabaP/rtPi60e8If9mqWLfSq0Wh0 - mW2bMFt3WLWw0Pi5aEHRp1nEVYzaBdlyH2/UM5Gl2mU23D/thH6GgX6WgW6agXbKAdWvTbSP2LDJAC2j - FIo+zCD1qZH6RxImaac27A4MzrnwdY4hJ4MBTuKAemITX0bsRODG4KIL+gUnSuSzCL7b/YYLx1YGma5L - ordEdVeRWnsNtR2NKG6qRLAkAEEEQclphEpPoKqlilvFSjNYWrMjNFHNcIKY8uD33cOtaB1/gVpdASdJ - rIlAwesE5DTGQSi7hBRZClqGltBqtOLz9w2sk57CpL00JxBUC3z8Jbku3VgPXg1LUabK5iRJdZEkfBkZ - z9KhmbBxq3SNU1CQHtZsToQV93kE7ISXqum8+mQYJrSQ6e/gUWc+YivPI6kmGoZpOwykWLZgzaSnEzMR - hEp3Cc7elzhPFh5CQrUAg5P9KOnJhFSeh7gnIWhUfcS3eQYGUmz/lBN9hGWLE8EPvIJjYl8RX3wQOQ3x - uFEXjviqC5wkT54AcVM6eZMQsPeDsy4MsJ+YYCFFBuZqPQK+eP88X3yAPOQLfoEvrpSFIOt5MjQjCpQo - CpH5LhnCuhgYiEBP/g0dEdBONxGodlY4l9tLL67TGJp3cajHFnC7PgNpJCiSxSG/4db2HYvd4SKC5h0B - a5sz7wj+h41dIX2X4FSe0v6yqX1rr4f3QqnscR9JbLF646TIjE7TzIbdolQq3aYVCqZlChNeVqxODrZ5 - K82GlW6Kotb9brb98MZ5vOMZHVmBwvbOoyKFOVDUTG+T5iHgL8Jm2k/YtnY4pa0rIFmeyuPxeH8AJkCe - QKbSHUYAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY + zXSYeZtTNDXRhUG2mEamLjRRoUKUohddtItObd7mnG44I3OZ2px3welSdzlHd6bfnnO2nIHQDz48L57z + /XB+33N47ITeUyVeLNMqo8q1v8OkWoqcNIecPXV0VNkAHfFYYzgjUVf6R7/Zx4V2T/jDPrXZSq8YDAaX + xb4Bi83LipWFxs9FKwo/zUJYPuYQZCl8PFH3RJZozGx4YNoJ3QwD3SwD7TQDzdQmVL820DZqxwYDNI9R + KPwwg5SnBuofSZi0jVp3bGJozoWvcww5GQxykk30GjfwZdRBBFsYWnRBt+BEsWIWwXe7XnPhWHmQ6bo0 + eltccxUp1ddQ3d6AokY5gqUBCCIIik8jVHYCFc0V3Co2msHSqgOhCb0MJ4gpC37XNdKClokXqNbmc5KE + qgjkv4pHdoMQotpLSK5NRvPwEloMNnz+vo410lOYrI/mBIJKgY+/NMelHe/ByxEZSlVZnCSxJpKELyP9 + WRrURju3SucEBSXpYdXuRFhRv1vATnhJL51blwS9UYNa3R086shDrPw8EquioZ92QE+KZQtWT7o7sRBB + qGyX4Ox9qfNkwSHEVwowNDmA4p4MyBS5ED4JQYPqI77NM9CTYgemnOgnmK1OBD/wCI5JfMV8yUFk18fh + Rk044ioucJJcRTwkjWnkTULA3g/NujDIfmKClRQZmKNxC/iS/fN8yQHykC/4+b64UhqCzOdJUI8qUaws + QMbbJIhqYqAnAh35N7REQDu3iEDlXeFcTh+9uEZjeN7F0Tu+gNt16UglQXGtEHn1t3buWBybLiJo8gpY + 25zFK/gfdnaFtF2CU7ndjob3rdt7PbwX3d3dW0cSmm2eOCkyvcM0s+6wshemZQomMwWjh2Wbk4Nt3ka7 + wxRFrfndbP3hifN4x9PbMwNFbR1HxUpLoLiJ3iHVTcBfRE20n6h19XBya2dAkiKFx+Px/gAjiZ48us3T + TgAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 60829b9..dc7b01b 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -58,8 +58,8 @@ this.dsPRJ = new FPJ0000.dsPRJ(); this.nameTextBox = new System.Windows.Forms.TextBox(); this.reqstaffTextBox = new System.Windows.Forms.TextBox(); - this.sdateTextBox = new System.Windows.Forms.TextBox(); - this.edateTextBox = new System.Windows.Forms.TextBox(); + this.tbSdate = new System.Windows.Forms.TextBox(); + this.tbEdate = new System.Windows.Forms.TextBox(); this.usermainTextBox = new System.Windows.Forms.TextBox(); this.usersubTextBox = new System.Windows.Forms.TextBox(); this.userManagerTextBox = new System.Windows.Forms.TextBox(); @@ -68,7 +68,7 @@ this.costeTextBox = new System.Windows.Forms.TextBox(); this.cntTextBox = new System.Windows.Forms.TextBox(); this.remark_reqTextBox = new System.Windows.Forms.TextBox(); - this.ddateTextBox = new System.Windows.Forms.TextBox(); + this.tbXdate = new System.Windows.Forms.TextBox(); this.assetTextBox = new System.Windows.Forms.TextBox(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -94,7 +94,7 @@ this.bsHistWeek = new System.Windows.Forms.BindingSource(this.components); this.cmbProcess = new System.Windows.Forms.ComboBox(); this.cmbState = new System.Windows.Forms.ComboBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.tbODate = new System.Windows.Forms.TextBox(); this.panel7 = new System.Windows.Forms.Panel(); this.cmbPart = new System.Windows.Forms.ComboBox(); this.arLabel1 = new arCtl.arLabel(); @@ -488,23 +488,23 @@ this.reqstaffTextBox.Size = new System.Drawing.Size(113, 21); this.reqstaffTextBox.TabIndex = 9; // - // sdateTextBox + // tbSdate // - this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); - this.sdateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.sdateTextBox.Location = new System.Drawing.Point(93, 31); - this.sdateTextBox.Name = "sdateTextBox"; - this.sdateTextBox.Size = new System.Drawing.Size(190, 21); - this.sdateTextBox.TabIndex = 11; + this.tbSdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true)); + this.tbSdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbSdate.Location = new System.Drawing.Point(93, 31); + this.tbSdate.Name = "tbSdate"; + this.tbSdate.Size = new System.Drawing.Size(190, 21); + this.tbSdate.TabIndex = 11; // - // edateTextBox + // tbEdate // - this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); - this.edateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.edateTextBox.Location = new System.Drawing.Point(341, 58); - this.edateTextBox.Name = "edateTextBox"; - this.edateTextBox.Size = new System.Drawing.Size(190, 21); - this.edateTextBox.TabIndex = 13; + this.tbEdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); + this.tbEdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbEdate.Location = new System.Drawing.Point(341, 58); + this.tbEdate.Name = "tbEdate"; + this.tbEdate.Size = new System.Drawing.Size(190, 21); + this.tbEdate.TabIndex = 13; // // usermainTextBox // @@ -586,14 +586,14 @@ this.remark_reqTextBox.Size = new System.Drawing.Size(485, 280); this.remark_reqTextBox.TabIndex = 49; // - // ddateTextBox + // tbXdate // - this.ddateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); - this.ddateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.ddateTextBox.Location = new System.Drawing.Point(341, 31); - this.ddateTextBox.Name = "ddateTextBox"; - this.ddateTextBox.Size = new System.Drawing.Size(190, 21); - this.ddateTextBox.TabIndex = 53; + this.tbXdate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); + this.tbXdate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbXdate.Location = new System.Drawing.Point(341, 31); + this.tbXdate.Name = "tbXdate"; + this.tbXdate.Size = new System.Drawing.Size(190, 21); + this.tbXdate.TabIndex = 53; // // assetTextBox // @@ -671,6 +671,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"; @@ -852,14 +853,14 @@ this.cmbState.Size = new System.Drawing.Size(127, 20); this.cmbState.TabIndex = 5; // - // textBox1 + // tbODate // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); - this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox1.Location = new System.Drawing.Point(93, 58); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(190, 21); - this.textBox1.TabIndex = 79; + this.tbODate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); + this.tbODate.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbODate.Location = new System.Drawing.Point(93, 58); + this.tbODate.Name = "tbODate"; + this.tbODate.Size = new System.Drawing.Size(190, 21); + this.tbODate.TabIndex = 79; // // panel7 // @@ -1154,10 +1155,10 @@ this.panel2.Controls.Add(this.linkLabel3); this.panel2.Controls.Add(this.linkLabel2); this.panel2.Controls.Add(this.arLabel4); - this.panel2.Controls.Add(this.sdateTextBox); - this.panel2.Controls.Add(this.ddateTextBox); - this.panel2.Controls.Add(this.edateTextBox); - this.panel2.Controls.Add(this.textBox1); + this.panel2.Controls.Add(this.tbSdate); + this.panel2.Controls.Add(this.tbXdate); + this.panel2.Controls.Add(this.tbEdate); + this.panel2.Controls.Add(this.tbODate); this.panel2.Location = new System.Drawing.Point(6, 461); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(547, 94); @@ -1485,6 +1486,7 @@ // this.bindingNavigatorPositionItem1.AccessibleName = "위치"; this.bindingNavigatorPositionItem1.AutoSize = false; + this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem1.Text = "0"; @@ -1590,7 +1592,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 257); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(500, 355); + this.panel4.Size = new System.Drawing.Size(516, 355); this.panel4.TabIndex = 90; // // rtBef @@ -1599,7 +1601,7 @@ this.rtBef.Location = new System.Drawing.Point(0, 23); this.rtBef.Name = "rtBef"; this.rtBef.ReadOnly = true; - this.rtBef.Size = new System.Drawing.Size(500, 332); + this.rtBef.Size = new System.Drawing.Size(516, 332); this.rtBef.TabIndex = 87; this.rtBef.Text = ""; this.rtBef.Click += new System.EventHandler(this.rtBack_Click); @@ -1642,7 +1644,7 @@ this.arLabel8.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel8.SignColor = System.Drawing.Color.Yellow; this.arLabel8.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel8.Size = new System.Drawing.Size(500, 23); + this.arLabel8.Size = new System.Drawing.Size(516, 23); this.arLabel8.TabIndex = 86; this.arLabel8.Text = "개선 전"; this.arLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1664,7 +1666,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 254F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1012, 615); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1044, 615); this.tableLayoutPanel1.TabIndex = 91; // // panel8 @@ -1673,9 +1675,9 @@ this.panel8.Controls.Add(this.rtDesc); this.panel8.Controls.Add(this.arLabel11); this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(509, 3); + this.panel8.Location = new System.Drawing.Point(525, 3); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(500, 248); + this.panel8.Size = new System.Drawing.Size(516, 248); this.panel8.TabIndex = 94; // // rtDesc @@ -1684,7 +1686,7 @@ this.rtDesc.Location = new System.Drawing.Point(0, 23); this.rtDesc.Name = "rtDesc"; this.rtDesc.ReadOnly = true; - this.rtDesc.Size = new System.Drawing.Size(500, 225); + this.rtDesc.Size = new System.Drawing.Size(516, 225); this.rtDesc.TabIndex = 87; this.rtDesc.Text = ""; this.rtDesc.Click += new System.EventHandler(this.rtBack_Click); @@ -1727,7 +1729,7 @@ this.arLabel11.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel11.SignColor = System.Drawing.Color.Yellow; this.arLabel11.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel11.Size = new System.Drawing.Size(500, 23); + this.arLabel11.Size = new System.Drawing.Size(516, 23); this.arLabel11.TabIndex = 86; this.arLabel11.Text = "완료내역"; this.arLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1758,7 +1760,7 @@ this.arPanel3.ProgressValue = 0F; this.arPanel3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel3.ShowBorder = true; - this.arPanel3.Size = new System.Drawing.Size(500, 248); + this.arPanel3.Size = new System.Drawing.Size(516, 248); this.arPanel3.TabIndex = 92; this.arPanel3.Text = "arPanel3"; this.arPanel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1771,7 +1773,7 @@ this.rtBack.Location = new System.Drawing.Point(1, 24); this.rtBack.Name = "rtBack"; this.rtBack.ReadOnly = true; - this.rtBack.Size = new System.Drawing.Size(498, 223); + this.rtBack.Size = new System.Drawing.Size(514, 223); this.rtBack.TabIndex = 87; this.rtBack.Text = ""; this.rtBack.Click += new System.EventHandler(this.rtBack_Click); @@ -1814,7 +1816,7 @@ this.arLabel10.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel10.SignColor = System.Drawing.Color.Yellow; this.arLabel10.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel10.Size = new System.Drawing.Size(498, 23); + this.arLabel10.Size = new System.Drawing.Size(514, 23); this.arLabel10.TabIndex = 86; this.arLabel10.Text = "개선 배경"; this.arLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1827,9 +1829,9 @@ this.panel6.Controls.Add(this.rtAft); this.panel6.Controls.Add(this.arLabel9); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel6.Location = new System.Drawing.Point(509, 257); + this.panel6.Location = new System.Drawing.Point(525, 257); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(500, 355); + this.panel6.Size = new System.Drawing.Size(516, 355); this.panel6.TabIndex = 90; // // rtAft @@ -1838,7 +1840,7 @@ this.rtAft.Location = new System.Drawing.Point(0, 23); this.rtAft.Name = "rtAft"; this.rtAft.ReadOnly = true; - this.rtAft.Size = new System.Drawing.Size(500, 332); + this.rtAft.Size = new System.Drawing.Size(516, 332); this.rtAft.TabIndex = 87; this.rtAft.Text = ""; this.rtAft.Click += new System.EventHandler(this.rtBack_Click); @@ -1881,7 +1883,7 @@ this.arLabel9.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel9.SignColor = System.Drawing.Color.Yellow; this.arLabel9.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel9.Size = new System.Drawing.Size(500, 23); + this.arLabel9.Size = new System.Drawing.Size(516, 23); this.arLabel9.TabIndex = 86; this.arLabel9.Text = "개선 후"; this.arLabel9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2104,6 +2106,7 @@ // this.toolStripTextBox1.AccessibleName = "위치"; this.toolStripTextBox1.AutoSize = false; + this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox1.Text = "0"; @@ -2171,7 +2174,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1018, 653); + this.tabPage2.Size = new System.Drawing.Size(1050, 653); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "완료내역"; this.tabPage2.UseVisualStyleBackColor = true; @@ -2213,7 +2216,7 @@ this.arLabel12.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel12.SignColor = System.Drawing.Color.Yellow; this.arLabel12.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel12.Size = new System.Drawing.Size(1012, 32); + this.arLabel12.Size = new System.Drawing.Size(1044, 32); this.arLabel12.TabIndex = 92; this.arLabel12.Text = "내역을 편집하려면 각 창을 \"더블클릭\" 하세요."; this.arLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2225,7 +2228,7 @@ this.tabPage5.Controls.Add(this.arPanel5); this.tabPage5.Location = new System.Drawing.Point(4, 22); this.tabPage5.Name = "tabPage5"; - this.tabPage5.Size = new System.Drawing.Size(1018, 653); + this.tabPage5.Size = new System.Drawing.Size(1050, 653); this.tabPage5.TabIndex = 2; this.tabPage5.Text = "TODO"; this.tabPage5.UseVisualStyleBackColor = true; @@ -2255,7 +2258,7 @@ this.arPanel5.ProgressValue = 0F; this.arPanel5.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel5.ShowBorder = true; - this.arPanel5.Size = new System.Drawing.Size(1018, 653); + this.arPanel5.Size = new System.Drawing.Size(1050, 653); this.arPanel5.TabIndex = 91; this.arPanel5.Text = "arPanel5"; this.arPanel5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -2297,7 +2300,7 @@ this.dataGridView3.RowHeadersVisible = false; this.dataGridView3.RowTemplate.Height = 23; this.dataGridView3.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView3.Size = new System.Drawing.Size(1016, 469); + this.dataGridView3.Size = new System.Drawing.Size(1048, 469); this.dataGridView3.TabIndex = 0; // // sort @@ -2372,7 +2375,7 @@ this.panel9.Dock = System.Windows.Forms.DockStyle.Top; this.panel9.Location = new System.Drawing.Point(1, 1); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(1016, 157); + this.panel9.Size = new System.Drawing.Size(1048, 157); this.panel9.TabIndex = 88; this.panel9.Paint += new System.Windows.Forms.PaintEventHandler(this.panel9_Paint); // @@ -2404,7 +2407,7 @@ this.bnTodo.MovePreviousItem = this.toolStripButton9; this.bnTodo.Name = "bnTodo"; this.bnTodo.PositionItem = this.toolStripTextBox2; - this.bnTodo.Size = new System.Drawing.Size(1016, 25); + this.bnTodo.Size = new System.Drawing.Size(1048, 25); this.bnTodo.TabIndex = 87; this.bnTodo.Text = "bindingNavigator3"; // @@ -2442,6 +2445,7 @@ // this.toolStripTextBox2.AccessibleName = "위치"; this.toolStripTextBox2.AutoSize = false; + this.toolStripTextBox2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox2.Name = "toolStripTextBox2"; this.toolStripTextBox2.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox2.Text = "0"; @@ -2596,8 +2600,8 @@ private System.Windows.Forms.TextBox tbIdx; private System.Windows.Forms.TextBox nameTextBox; private System.Windows.Forms.TextBox reqstaffTextBox; - private System.Windows.Forms.TextBox sdateTextBox; - private System.Windows.Forms.TextBox edateTextBox; + private System.Windows.Forms.TextBox tbSdate; + private System.Windows.Forms.TextBox tbEdate; private System.Windows.Forms.TextBox usermainTextBox; private System.Windows.Forms.TextBox usersubTextBox; private System.Windows.Forms.TextBox userManagerTextBox; @@ -2606,7 +2610,7 @@ private System.Windows.Forms.TextBox costeTextBox; private System.Windows.Forms.TextBox cntTextBox; private System.Windows.Forms.TextBox remark_reqTextBox; - private System.Windows.Forms.TextBox ddateTextBox; + private System.Windows.Forms.TextBox tbXdate; private System.Windows.Forms.TextBox assetTextBox; private System.Windows.Forms.BindingNavigator bn; private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; @@ -2628,7 +2632,7 @@ private System.Windows.Forms.ToolStripButton btIO; private System.Windows.Forms.ComboBox cmbProcess; private System.Windows.Forms.ComboBox cmbState; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox tbODate; private System.Windows.Forms.Panel panel7; private arCtl.arLabel arLabel1; private System.Windows.Forms.Panel panel1; diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index f2b6708..1a0b648 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -108,9 +108,11 @@ namespace FPJ0000 } } - + string oldsta = string.Empty; private void btSave_Click(object sender, EventArgs e) { + + oldsta = dr.status; this.dr.process = cmbProcess.Text; this.dr.status = cmbState.Text; this.dr.part = cmbPart.Text; @@ -120,6 +122,8 @@ namespace FPJ0000 this.dr.CMP_Description = rtDesc.Rtf; this.dr.CMP_Background = rtBack.Rtf; + + this.Validate(); this.bs.EndEdit(); this.bsHistWeek.EndEdit(); @@ -128,10 +132,56 @@ namespace FPJ0000 this.taToDo.Update(this.dsPRJ.EETGW_ProjectToDo); this.taHist.Update(this.dsPRJ.ProjectsHistory); this.taHistD.Update(this.dsPRJ.EETGW_ProjecthistoryD); + + //상태가 변경되면 메일을 전송한다 210216 + if (oldsta != dr.status && dr.RowState != DataRowState.Detached) + { + var db = new EEEntities(); + var mf = db.MailForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "PS").FirstOrDefault(); + if (mf != null) + { + try + { + var mbody = new MailData(); + mbody.tolist = mf.tolist; + mbody.bcc = mf.bcc; + mbody.cc = mf.cc; + mbody.project = dr.pidx; + mbody.gcode = FCOMMON.info.Login.gcode; + mbody.cate = mf.cate; + mbody.fromlist = "chikyun.kim@amkor.co.kr"; + mbody.pdate = DateTime.Now.ToShortDateString(); + mbody.subject = maildataupdate(mf.subject); + mbody.body = maildataupdate(mf.body); + mbody.wuid = FCOMMON.info.Login.no; + mbody.wdate = DateTime.Now; + db.MailData.Add(mbody); + db.SaveChanges(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("상태변경 메일 전송 실패" + ex.Message); + } + } + } this.DialogResult = System.Windows.Forms.DialogResult.OK; //this.tableAdapterManager.UpdateAll(this.dsPRJ); } + string maildataupdate(string org) + { + org = org.Replace("{pname}", nameTextBox.Text); + org = org.Replace("{pidx}", tbIdx.Text); + org = org.Replace("{old}", oldsta); + org = org.Replace("{new}", dr.status); + org = org.Replace("{champion}", userManagerTextBox.Text); + org = org.Replace("{sdate}", tbSdate.Text); + org = org.Replace("{edate}", tbEdate.Text); + org = org.Replace("{xdate}", tbXdate.Text); + org = org.Replace("{odate}", tbODate.Text); + return org; + } + private void btMailAddr_Click(object sender, EventArgs e) { @@ -296,22 +346,22 @@ namespace FPJ0000 } private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(sdateTextBox); + SelectDate(tbSdate); } private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(ddateTextBox); + SelectDate(tbXdate); } private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(edateTextBox); + SelectDate(tbEdate); } private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - SelectDate(textBox1); + SelectDate(tbODate); } private void bs_CurrentChanged(object sender, EventArgs e) @@ -394,10 +444,6 @@ namespace FPJ0000 this.dsPRJ.EETGW_ProjectToDo.AddEETGW_ProjectToDoRow(newdr); } - private void toolStripButton13_Click(object sender, EventArgs e) - { - //edit - } private void toolStripButton14_Click(object sender, EventArgs e) { @@ -405,10 +451,7 @@ namespace FPJ0000 this.bsTodo.RemoveCurrent(); } - private void toolStripButton16_Click(object sender, EventArgs e) - { - } void updatetimetable() { @@ -427,7 +470,7 @@ namespace FPJ0000 if (o_grp != null) v_grp = o_grp.ToString(); if (o_item != null) v_item = o_item.ToString(); if (v_grp.Equals("") == false && v_item.Equals("")) - dr.DefaultCellStyle.BackColor = System.Drawing.Color.White; + dr.DefaultCellStyle.BackColor = System.Drawing.Color.White; else dr.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(220, 220, 220); } diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index c2d6a28..8a0c4ac 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -1380,7 +1380,9 @@ // // chk완료 // + this.chk완료.Checked = true; this.chk완료.CheckOnClick = true; + this.chk완료.CheckState = System.Windows.Forms.CheckState.Checked; this.chk완료.Image = ((System.Drawing.Image)(resources.GetObject("chk완료.Image"))); this.chk완료.ImageTransparentColor = System.Drawing.Color.Magenta; this.chk완료.Name = "chk완료"; diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 5a889c9..9a98065 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -588,6 +588,7 @@ namespace FPJ0000 { funcSave(false); //자동저장 } + FormattingData(); } } diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index cc2e736..f94a048 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,34 +230,34 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL7S1NxGMbPfxQEKqVILGiVpVubtDRaYKAU - IYVKzNqmDTUZdjEsXVNO5kpZay1GZbmlk3ltaUu62mV22c7a3Nbayug8nfPdQXeWP9UHHg6c93keXr68 - 1H9jdHxE260ADNb30A8u4tTAG2joV9PCWET/WFTbN7q81PcoArMrjJ6HYVDJ9C/kqq5zmhUyImh39Huu - lzrjbYbBo4V+VIOTrgbys9b0DEJGRK/7K5kPLFwB7b8M89xFUMiBNxy+NL9ugWkkTObZUBZPCNniDYc6 - faKCSotcWU7vRlm3FKoeuchPWSeCQleGcDwN9dmZ1YJKS6lScb6EbRppROtYE2TndpIgz+B4MFNgnwrB - PhmEczaIt18S2Nc+SQpU/aVKeccOVnOvDntNMhSfLoC0ZSuGvCFYeU0wf2/w+lMc5S1eKOldFWVGKdvg - rIVEV8gW6fK2G28vIZ5agW2KIV479yUFZAtuAxunautBKHpLUHV9P445jmCLbhO7WbdxG79Rq+0DYskV - OGYY3JnNiBp+wiCRWntZ9dUK6N0aHLVXo1hXwOY3ZsI8zUPvsPztJ+76Mhs8mOMOyfmYQbZU3QpI2gpR - pM9D/okNq2Ee7Y1FUjDMBfkwKbjJPUQ2LwIxqI3ede9Ac+0lolyB62mYeN1+roAP5ErW7v4tZETU088R - SfwAE0vjcySFAJMEtcfgQa4k9fftQkbEcfPCeE2XP1nTNY+qCz4c6Fi7l3+Eov4AGYAtIYs3pewAAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rtEWlSUSuEhbtNmm + qzVXU9ewAI2pGZWzZimhu5mUjohorLKEFIeSRhq5Xu1Fe4FLIBBB2bqne7/cKZf8qT7b2d3uc87Zs+8e + 6r8xOj6i7eYCDNb30A/O48TAG2joV4+EsYj+sai2b3Rpse9hBGZXGD0PwqCS6V/IVV2njxUyImh39Huu + lzrlbYbBo4V+VIPjrgbys9b0DEJGRK/7K5kPzF0GHbgE88wFUMiBNxy8OLtmgWkkTObZUBZPCNniDQfO + +0UFlRa5spzeCVm3FKoeuchPWSeCQleGcDwN9bmplYJKS6lS0VHCNo00onWsCWUd20mQZ3A8mCmw+0Kw + TwbhnA7i7ZcE9rRPkgJVf6lSfmYbq7lbh92mMhSfLIC0ZTOGvCFYeU0wf2/w+lMc5S1eKOkdFbLTUrbB + WQuJrpAt0uVtNd5aRDy1DJuPIV479yUFZAtuAxunaut+KHpLUHVtL444DmGTbgO7Ubd+C79Rq+0DYsll + OKYY3J7OiBp+wiCRWn1Z9ZUK6N0aHLZXo1hXwOY3ZsI8zUPvsPTtJ+74Mxvcn+EOyfmYQbZU3QpI2gpR + pM9D/rF1K2Ee7fV5UjDMBfkwKbjBPUQ2LxZiUBu9a96B5upLRLkC19Mw8boDXAEfyJWs3f1byIiop58j + kvgBJpbG50gKC0wS1C6DB7mS1N+zCxkRR81z4zVdgWRN1yyqOv3Yd3b1Xv4RivoDC24tGxJwwQYAAAAA SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVDeGhStduVDC - zqhxAyYaTFi4QNGAqBHCQwmIGAV5C2qRtDWEYKDlIVDpgENfTkuptAJTZjqPTqdzvC2j4MLEx8k9mbmT - +53//+9Q/62loTxnwHJWDVoLd/mc6hk+7vO+OrTX15uX9Yvf52WNjhbsMXCKcvaYFF1PAdDJSnv7PSlH - ERotTqw4Lig/HJ69KgccpQHmzZFCA6coejA/pmsylFANRH8dRPYZpEA/9CRHsuLQNYF4a3uf3IQoxBLM - gIk2cIpydx7mU+oWgRsR9zaAX6zAxnQxojNXwLkqwS3cAue8gc35MuJS0lkE7oGjgoGTgL58NSmtgaMb - sTlXjcjYdUiRKVKVN6qnn7GfHaTHc/blygae7uCYmpk/pRBLgCZmQE1ioIQfgaZ7YLZPom2ERdf4Kmzz - QUy3n1AMnAQ0mRK6JkHjJ5HkrFDX+5FYa4W88gCuhXYMzUbg+Sriy7qCKR8Pi/Mb3pqfagZO/kKLSUmp - PNQNMxKRjkxVOVgJyV+GXnsYSyEB06wEu1/EBLErrKD7AwsDJwG1ubKucgR+DmW1DnKggsClEN2XMm17 - owrsvjjGvXGMMAJmgwo6xkI7Acv3csJSjI5FXV2puKcNgvsxBKYGwucqdJOZl1ZFjLm34bQ/rihoGV7e - CWCqsq8x1Qc76bsHovPVOfJuvxts06a8POYI5GBlzJDq5k8Capu7dWv5yfNGxO9Vb2X3tdjYm33kLnom - wnhiW0w9bO7XXZZWTDYU8S9LsouMo3+u1+WnLjuaLnJ+az2G7xSIxue/04uS/UWW26cl2/0zO3fxb6Ko - 7zLgJXOmts/2AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ8SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVBcmLFyxM/ER + dhqNGzDRYMLCBUoMiI9geIgEEaMgryKoRWxrCMFAS0Eo0hGH0tZpKZVWYMpM59HpdI63ZRRcmPg4uScz + d3K/8///Heq/tTBUMBd8e1INWU/v8Cl1afio3/fiwG5/X0HOL35XkDM6WrTLwCnK3WNSdD0NQCcr4633 + lBxDeLQ0uew8p/xwZOayHHSWB5lXh84YOEXRg4VxXZOhhOsgBuohsk8gBfuhpziSlYCuCcSbW/vUBhI8 + l2QGTLSBU5S36yCfVjcJ3ISErxH8pyqsT5UiNn0JnKca3PwNcHPXsOGuIC4nnUXhHTgsGDgJMBeqKWkV + HN2EjdlaRMeuQoq6SFXeqJ55xn92kBnPbc6XDTzTwRE1O39aIZYATcyCmsRAiTwATffC4phE+wiL7vEV + 2N0huDqOKQZOAppNSV2ToPGTSHE2qGv9SK62QV6+C898B4Zmolj6KuLLmgKXn4d17hteW9o0Ayd/odWk + pFUe6roFyWhntqocqoYUqECfI4KFsIApVoIjIGKC2BNR0POehYGTgPv5sq5yBH4KZaUecrCKwOUQvRey + bftiChz+BMZ9CYwwAmZCCjrHwtsBi7fzIlKcjkfnu9OJpXYI3mYITB2EzzXoITMvrIgY827BGX9YVtA6 + vLgdwNTkXmFq93fRt/bF3LV58k6/GXysuXw8ZgnkZGVMk+qWjwLqWrp1W+Xxs0bE79VgY/e02tnrZnIX + vRMRPLLT6XstZt1jbcNkYwn/vCy3xDj653pZWXzR+fA8F7A1YPhmkWh8/js9K9tbYq0qlux3Tmzfxb+J + or4D2CMlTsoxq5sAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/vUserWorkTimeList.cs b/SubProject/FPJ0000/vUserWorkTimeList.cs index 7ac3c7b..724caf9 100644 --- a/SubProject/FPJ0000/vUserWorkTimeList.cs +++ b/SubProject/FPJ0000/vUserWorkTimeList.cs @@ -21,5 +21,6 @@ namespace FPJ0000 public string uname { get; set; } public Nullable hrs { get; set; } public Nullable ot { get; set; } + public string UserProcess { get; set; } } }