diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index e7ccb52..b7b5764 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -50,11 +50,11 @@ 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.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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(); @@ -129,8 +129,8 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -240,6 +240,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"; @@ -348,6 +349,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -593,6 +595,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -608,6 +611,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -661,6 +665,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -754,6 +759,18 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(0, 599); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.label1.Size = new System.Drawing.Size(1213, 23); + this.label1.TabIndex = 6; + this.label1.Text = "--"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -785,13 +802,13 @@ 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, 24).Value = "입고일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "PO#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "비고"; + 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 = "입고수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "PO#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; @@ -956,54 +973,53 @@ 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).AllowAutoFilter = true; 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).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "bigo"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; + 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))))); 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).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType6; + 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).Width = 33F; + 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 = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate"; + 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).Tag = "indate"; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F; + 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; numberCellType7.NegativeRed = true; numberCellType7.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고수량"; - this.fpSpread1_Sheet1.Columns.Get(25).Tag = "inqty"; - this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).Width = 41F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "po"; + 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 = "PO#"; - this.fpSpread1_Sheet1.Columns.Get(26).Tag = "po"; - this.fpSpread1_Sheet1.Columns.Get(26).Width = 32F; + 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 = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(27).Tag = "bigo"; - this.fpSpread1_Sheet1.Columns.Get(27).Width = 33F; + 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 = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨"; @@ -1015,18 +1031,6 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.Location = new System.Drawing.Point(0, 599); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.label1.Size = new System.Drawing.Size(1213, 23); - this.label1.TabIndex = 6; - this.label1.Text = "--"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 736951d..5c6edf1 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -222,6 +222,9 @@ namespace FEQ0000 var delindex = this.fpSpread1.ActiveSheet.Columns["isdel"].Index; var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index; var crcfindex = this.fpSpread1.ActiveSheet.Columns["crcf"].Index; + var prjindex = this.fpSpread1.ActiveSheet.Columns["projectidx"].Index; + + for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex); @@ -277,10 +280,24 @@ namespace FEQ0000 } + //프로젝트가 걸린데이터는 글자를 bold체로 변경한다. + var pidx = (int)this.fpSpread1.ActiveSheet.GetValue(i, prjindex); + if(pidx == -1) //프로젝트가 없다 + { + this.fpSpread1.ActiveSheet.Rows[i].Font = fBase; + } + else + { + this.fpSpread1.ActiveSheet.Rows[i].Font = fBold; + } + } this.fpSpread1.ResumeLayout(); } + Font fBase = new Font("맑은 고딕", 9); + Font fBold = new Font("맑은 고딕", 9, FontStyle.Bold); + private void saveData(Boolean prompt) { this.Validate(); diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index f0609cc..60fb37e 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -234,57 +234,57 @@ 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 + dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 63583fa..e04a72a 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -40,7 +40,7 @@ namespace FEQ0000 } } - + Boolean advInput = false; private void __Load(object sender, EventArgs e) @@ -50,7 +50,7 @@ namespace FEQ0000 // this.Show(); // Application.DoEvents(); advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); - + //상태 var stateList = FCOMMON.DBM.getCodeTable("04"); this.cmbState.DisplayMember = "Value"; @@ -94,7 +94,7 @@ namespace FEQ0000 var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); foreach (var user in userList) { - this.cmbReceive.Items.Add(string.Format("[{0}] {1}",user.Key,user.Value)); + this.cmbReceive.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value)); this.cmbRequest.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value)); } @@ -121,17 +121,18 @@ namespace FEQ0000 ///입력된 데이터를 적용한다. dtPdate.Value = DateTime.Parse(dr.pdate); - if(cmbRequest.Items.Count > 0) + if (cmbRequest.Items.Count > 0) { - for(int i = 0; i< cmbRequest.Items.Count ;i++) + for (int i = 0; i < cmbRequest.Items.Count; i++) { if (cmbRequest.Items[i].ToString().StartsWith("[" + dr.request + "]")) { cmbRequest.SelectedIndex = i; break; - } + } } - } else cmbRequest.Text = dr.request; + } + else cmbRequest.Text = dr.request; if (cmbReceive.Items.Count > 0) { @@ -150,7 +151,7 @@ namespace FEQ0000 tbSID.Text = dr.sid; tbSID.Tag = tbSID.Text; - + if (dr.manuproc == "") cbManuProc.SelectedIndex = -1; else cbManuProc.Text = dr.manuproc; //190106 @@ -194,10 +195,10 @@ namespace FEQ0000 tbProjectIndex.Text = dr.projectidx.ToString(); cmbState.Text = dr.state; - + if (dr.process == "") cbProcess.SelectedIndex = -1; - else cbProcess.Text = dr.process; + else cbProcess.Text = dr.process; if (cbProcess.SelectedIndex == -1) { //181203 - 이 사용자가 마지막으로 사용한 공정값을 사용한다. @@ -243,10 +244,10 @@ namespace FEQ0000 } } - if(advInput==false) + if (advInput == false) { this.Width = 528; - // this.linkLabel7.Enabled = false; + // this.linkLabel7.Enabled = false; this.tbProject.Enabled = false; this.tbProjectIndex.Enabled = false; } @@ -267,7 +268,7 @@ namespace FEQ0000 } } - + } @@ -311,12 +312,12 @@ namespace FEQ0000 } private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - Lov_Item("",true); + Lov_Item("", true); } - void Lov_Item( string search,Boolean allowAll) + void Lov_Item(string search, Boolean allowAll) { - if (search == "" && allowAll==false) + if (search == "" && allowAll == false) { FCOMMON.Util.MsgE("품명은 필수 값 입니다"); tbPumName.Focus(); @@ -342,7 +343,7 @@ namespace FEQ0000 this.tbPumUnit.Enabled = false; if (tbSID.Text != "") tbSID.Enabled = false; else tbSID.Enabled = true; - + //제품을 찾앗다면 suppy 등을 업데이트 해준다. var pcInfo = FCOMMON.DBM.getLastPurchaseInfo(f.item); if (pcInfo.idx != -1) @@ -448,11 +449,27 @@ namespace FEQ0000 tbPumQty.Focus(); return false; } - if ( advInput==true && tbProject.Text == "") + if (advInput == true ) { - FCOMMON.Util.MsgE("프로젝트 정보를 입력하세요."); - tbProject.Focus(); - return false; + if (tbProject.Text == "") + { + //프로젝트명에 입력이 안되있다 + if (tbProjectIndex.Text != "-1") this.tbProjectIndex.Text = "-1"; + } + else + { + //프로젝트에 뭔가를 입력했다 + if(tbProjectIndex.Text == "-1") + { + FCOMMON.Util.MsgE("프로젝트가 선택되지 않았습니다. 직접입력은 허용되지 않습니다.\n" + + "프로젝트 명을 입력하고 Enter 키를 눌러서 관련 프로젝트를 선택하세요\n" + + "프로젝트가 없는 경우에는 비고란에 해당 내용을 기입하세요"); + tbProject.Focus(); + tbProject.SelectAll(); + return false; + } + } + } var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00"); @@ -556,12 +573,12 @@ namespace FEQ0000 } //품목정보에 없는 데이터이므로 자료를 추가한다. - if(tbPumIDX.Text == "-1") + if (tbPumIDX.Text == "-1") { var newidx = FCOMMON.DBM.addItem(tbPumName.Text, tbSID.Text, tbPumModel.Text.Trim(), decimal.Parse(tbPumPrice.Text), tbSupply.Text.Trim(), int.Parse(tbSupplyIndex.Text), null); if (newidx > 0) tbPumIDX.Text = newidx.ToString(); } - else if(tbSID.Text != "" && tbSID.Text != tbSID.Tag.ToString()) + else if (tbSID.Text != "" && tbSID.Text != tbSID.Tag.ToString()) { //SID가 변경되었으므로 업데이트 해주낟. FCOMMON.DBM.UpdateItemSID(int.Parse(tbPumIDX.Text), tbSID.Text); @@ -586,7 +603,7 @@ namespace FEQ0000 dr.pumamt = dr.pumqty * dr.pumprice; if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); - dr.sid = tbSID.Text.Trim(); + dr.sid = tbSID.Text.Trim(); if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToShortDateString(); else dr.SetedateNull(); @@ -750,22 +767,22 @@ namespace FEQ0000 private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - + } private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - + } private void imgpase_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - + } private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - + } private void cbEQManu_SelectedIndexChanged(object sender, EventArgs e) @@ -787,12 +804,12 @@ namespace FEQ0000 private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - + } private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - + } void tbProject_Leave(object sender, EventArgs e) @@ -817,7 +834,7 @@ namespace FEQ0000 var tb = sender as TextBox; if (tb.Text == "") tbPumIDX.Text = "-1"; else if (tb.Text != tb.Tag.ToString()) tbPumIDX.Text = "-1"; - if(tbPumIDX.Text =="-1") + if (tbPumIDX.Text == "-1") { tbPumModel.Enabled = true; tbPumUnit.Enabled = true; diff --git a/SubProject/FPJ0000/CostReduction_2021.xlsx b/SubProject/FPJ0000/CostReduction_2021.xlsx new file mode 100644 index 0000000..9209407 Binary files /dev/null and b/SubProject/FPJ0000/CostReduction_2021.xlsx differ diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs index 07c26e0..38eccc4 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs @@ -30,27 +30,27 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.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.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 numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -63,6 +63,7 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.btAdd = new System.Windows.Forms.ToolStripButton(); this.btCopy = new System.Windows.Forms.ToolStripButton(); this.btEdit = new System.Windows.Forms.ToolStripButton(); @@ -74,6 +75,7 @@ this.btFind = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -125,7 +127,6 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -158,6 +159,7 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, + this.toolStripButton3, this.btAdd, this.btCopy, this.btEdit, @@ -261,6 +263,15 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // + // toolStripButton3 + // + this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.RightToLeftAutoMirrorImage = true; + this.toolStripButton3.Size = new System.Drawing.Size(74, 22); + this.toolStripButton3.Text = "줄추가(&I)"; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); + // // btAdd // this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image"))); @@ -348,6 +359,15 @@ this.toolStripButton1.Text = "가져오기"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // toolStripButton2 + // + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(134, 22); + this.toolStripButton2.Text = "Performance Report"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -503,11 +523,11 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).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(0).CellType = numberCellType15; + 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).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -515,97 +535,97 @@ this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer"; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일"; 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(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType35; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line"; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType36; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType37; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType38; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType39; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName"; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType40; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격"; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType41; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F; - numberCellType16.DecimalPlaces = 0; - numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType16.MaximumValue = 2147483647D; - numberCellType16.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType16; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F; - numberCellType17.MaximumValue = 999999999999999D; - numberCellType17.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType17; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType18.MaximumValue = 999999999999999D; - numberCellType18.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType18; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F; - numberCellType19.MaximumValue = 999999999999999D; - numberCellType19.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType19; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType20.MaximumValue = 999999999999999D; - numberCellType20.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType20; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction"; this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]"; @@ -615,11 +635,11 @@ this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType42; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체"; - numberCellType21.MaximumValue = 999999999999999D; - numberCellType21.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType21; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)"; @@ -1040,15 +1060,6 @@ // this.ta.ClearBeforeFill = true; // - // toolStripButton2 - // - this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(134, 22); - this.toolStripButton2.Text = "Performance Report"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); - // // fEboardList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1159,5 +1170,6 @@ private System.Windows.Forms.ToolStripButton btCopy; private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton toolStripButton3; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 9b0cd8e..ffae781 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -42,7 +42,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { //프로젝트 목록을 처리함 - //this.tbRequest.Text = FCOMMON.info.Login.nameK; + this.tbRequest.Text = FCOMMON.info.Login.nameK; //분류 - 190905 @@ -521,5 +521,17 @@ namespace FPJ0000 var f = new EBoard.fEBoardReport(); f.Show(); } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + var newdr = this.dsMSSQL.EETGW_JobReport_EBoard.NewEETGW_JobReport_EBoardRow(); + newdr.uid = FCOMMON.info.Login.nameK; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.pdate = DateTime.Now.ToShortDateString(); + newdr.Site = "ATK"; + this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx index 338262d..cd63e3a 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.resx +++ b/SubProject/FPJ0000/EBoard/fEboardList.resx @@ -165,6 +165,18 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== @@ -211,20 +223,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZPtS1NRHMf3Kv8G60Wvi9TKnlDoYalNjSzL - VEp8mlM0NdGVYVZMI1MXmuigIpKiFxXSg67p1JxzuuGMTLM0m48Jakvd09F77/x27t1wBkE/+HBenPP7 - cH7fe66Ir/DrupSTVUZtTLXx96kqo4uuREDJryYSU9VHou4ahkPl+tqdcS+2CE2bK/J2j37RRn5Z7YSz - OlZhtfv4ZeMh+DpnQ+nbaUjrxpySXLWft9VT0RWGhRXnGtc3ycA0xcI0zcI4ycIwsQbd91VoRhxYZYHm - by6Uvp5C+v0x118SKnBRAQZmOHycYenKol+QrKF7fBVtI04qcGNgjoPpJ4Ny9TTE1zqfC80JSrHlfFXc - uqzhLNLrz6G+tRFlTUqIbwbiGEVSHoJwxQHUNNcIo9gJi/klJ8JLu1lBEF8tftU51IKWsUeoNxYJkuS6 - KBQ9S0JeYyKkqtNIU6WheXAeLcN2vPu8gmWaU4SihwgCSa3EL7YynzOOduHpkAKVulxBktIQTZvPIOtB - JvTjDmGUjjEXtDSHJQeDiLJej4CvyIpuUvA4FeZxA1SmK7jTXogE5XGk1MXBPOmEmQbLB6z/4cnESgXh - ik2CIzduMgeLtyOpVoKBH30o78qGQl2AxHthaNS9wadZFmYabN8Eg17Kgo2B+JZXsFfuLwuWb0Pekwu4 - 2BCJCzUnBEmBOgnypkx6kzDw+wPTHPr5T0yx0SAPlxg8gmC5/2ywfCs95I/gIn/EVoYh52Eq9CNalGuL - kf0yFdKGeJipwETfhpEKCONGiFznG+FoSQ+ZWyYYnOUEukd/4vLjLGTQRpkqEYVPLm3s8dA3h/35nT5B - 6FUdmbH6BP/DQUfYndnmExwq+OC0LDjW/3X4XxCGcweka+zedhpkVrtlfoXYLIsuNwWWBRfGvSzaGQE+ - efqv8S/RzbndyzuS33/xtotE+7Jac4Kkre17ZFprkKyVbJDhITBD40GqIQFSzdKutPcdganqdJFIJPoD - 0NqjIcbQ72sAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVDhPhZNZTxNRGIZ7pT/BoBdemrhAtEZxSRQELEsC + LggEUQqlEBCQQA1EEVNQWcSABEjUEIjGCzXEBQpYQEoptKEYEUTAsi/KUoG20ykzLa9npg3FhMQveXIu + zvmenO+dMwKu/O+oYkNKtMrQR9o/IUVaK1lpnlJu1dGhJT10UJFm8JRMXb4//PUOvmlrBd7vUi+a6OWl + NcputNhgNLtZNnHQ+DFvQu6HacSVD1OiVMVOV6uzggs1iytm2t4zyUA3xUI3zUI7yUIzsQ7VTxuahyyw + sUDDsBW576YQ/2TY+o8k8IHaukato2/Gji8zLFlZ9PKSdXQabPg0RBGBA33zdujmGBQopuGb0/6Kb44s + 9Rm/UhS+Ia26hPjKy6hsqUN+fSl88zzhQxAVnIS//BjKGsr4Ucw0i4UVCv63O1leEFHi+7Z9oBGNo89R + qc3iJdcrgpD1MgZpdVGQVIchrjoODf0LaBw04+O3NaySnALkXTQvEJWLdoYVptu1Ix14MSBHsSqVl8RW + BZPmC0h6mgi1wcKP0jZqhZLksGJhEJDf7RRwFVjYSWfUiKE3aFCtu4WHrZmILD2H2Ipw6Ccp6EmwXMDq + MWcmRiLwl28RnLmbxxzP3ouYchH6xnpQ0JEMuSIDUY/9UKd6j6+zLPQk2J4JBt2ERRMD33suwRGZh1Qo + 24O02mhcrQpEdNl5XpKhiIGsPpHcxA/cft+0Hb3cJyaYSJCnczROgVC2a1Yo200OeUCY5YGLxX5IeSaG + ekiJAmU2kt+IIamKgJ4IdORtaImAZhzwzlS5Rzib00XPr9Lon7XzdI7M4WZNEhJIo7Q6Cpm1Nzb3OKh1 + O4TprW7BCZmKnjG6Bf/DQkbwSmx2C7wzPlOG36aN7Q5vB2VjHIfECrOrnQSZ1Dr+a40yGRYsjvElK8YX + rTC4WDIzPFzy5HcBefIOhmVX911r+u5qFwiOJrWkeEmaWw9LlUYvaRO9SYITzwSFE4mCPiBpWjkY19Tm + KVbECwQCwV8VL6KkvF4YKgAAAABJRU5ErkJggg== @@ -242,9 +254,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 252, 17 diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index e4ccd7e..ab36c92 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -260,6 +260,12 @@ fProjectPartListEdit.cs + + Form + + + fSaveCostReport.cs + Form @@ -475,6 +481,9 @@ fProjectPartListEdit.cs + + fSaveCostReport.cs + fSaveCostData.cs @@ -562,6 +571,9 @@ True + + PreserveNewest + dsMail.xsd diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index c1d778b..d7dde56 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -546,6 +546,7 @@ this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(72, 24); this.bindingNavigatorDeleteItem.Text = "삭제(&D)"; + this.bindingNavigatorDeleteItem.Visible = false; this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); // // bindingNavigatorMoveFirstItem diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index f57203b..de7bf06 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY - zVTMvM0pmprowiBbTCPzEpo4oUKUIuiCdtGpTZ3bnNtwRuYytXm/gJel7nKO7mx+e87ZUgOhH3x4Xjzn - ++H8vufw2Am9p0q6WK5XRFXof4dJ9BQ5aY5K9jTQUeU6OuKx1nRGrKn2j367jwvtnvCHvZolK71iMplc - FvsGLLYdVqwsNH4uWFH0aQZxFSMOQbbcxxv1TGSpdokN66acMEwzMMww0E8x0E5uQvVrA+3DdmwwQMsI - haIP00h9aqL+kYRJ2ql1xyYGZl34OsuQk0E/J9mE2ryBL8MOInBjYMEFw7wTJfIZ8O92v+bCsZXBE9cl - 0Vsi2VWk1l5DbUcjipsqwZcEIJggKDmNUOkJVLVUcavYaAaLqw6EJqoZThBTzn/fPdSK1rEXqNUXcJLE - mggUvEpATmMchHWXkFKXgpbBRbSabPj8fR1rpKcwaS/NCQTVAh9/Sa5LP9qDl0NSlKmyOUmSLJKELyPj - WTo0Zju3StcYBQXpYdXuRFhxn0fATnipms6rT4bRrEWd4Q4edeYjtvI8kmqiYZxywEiKZQvWjHs6sRBB - qHSX4Ox9ifNk4SEkVAswMK5DSU8mpPI8xD0JQaPqI77NMTCSYnWTTvQRlqxO8B94BcfEvqIg8UHkNMTj - hiwc8VUXOEmePAHipnTyJiFg7wdmXOhnPzHBSooMzNV6BEHi/XNB4gPkIV8EFfjiSlkIsp4nQzOsQImi - EJnvkiGUxcBIBAbyb+iJgHa6iUC1s8K53F56YY3G4JyLQz06j9v1GUgjQVFdHPIbbm3fsTg2XUTQvCNg - bbOWHcH/sLMrpO8SnMpTOt60Krf2engv1Fqd+0hii80bJ0VmdE5MrzusSqXKPbFMYWKJgtnLss3JwTZv - o11QqvvcFEWt+d1s++GN83jHMzqyAoXtnUdFCkugqJneJs1DwF+EzbSfsG31cEpbV0CyPJXH4/H+AEI4 - nnH5RegDAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY + zVTMvM0pmprowiBbzEXmJTRxQoUoXV5UaJZOberc5nTDGZnL1LzfwMtSdzln7mx+e87ZUgOhH3x4Xjzn + ++H8vufw2Am5r068VKpXRpbpf4dK9BQ5aY5y9jTQkaV9dPgTnemsWFvpF/VuHxfaPWGPerTLFnrVZDK5 + zDYHzNYdVi0sNH4uWlD4aRaxZSN2QZZivzfqmYhi3TIb7pt2wjDDwDDLQD/NQDe1CfUvB9qGbXAwQPMI + hcKPM0h5ZqL+kYRK2qgN+yYG5lz4OseQk0E/J9mEZtyBL8N2InBjYNEFw4ITMsUs+Pe63nLhmPKgyRuS + qC2R/BpSqq+jur0eRQ3l4Ev8EUQQyM4gRHoSFc0V3CpWmsHSmh0hCRqGE0SX8j90DbWgZewlqvX5nCSh + Khz5r+ORXR8LYc1lJNcko3lwCS0mKz5/38A66SlU2kNzAkGlYL+fJMelH+3GqyEpStRZnCRRHkHCV5D+ + PA3acRu3SucYBSXpYc3mRGhRr0fATlixhs6tTYJxXIcaw1087shDTPkFJFZFwThth5EUyxasnfB0YiaC + EOkuwbkHEuepgsOIrxRgYKIPsu4MSBW5iH0ajHp1E77NMzCSYvumnOglLFuc4D/0Co6LfUSB4kPIrovD + TXkY4ioucpJcRTzEDWnkTYLB3g/MutDPfmKChRQZkKPzCALFB+YDxQfJQz4IzPfB1ZJgZL5IgnZYCZmy + ABnvkyCUR8NIBAbyb+iJgHa6iUC9s8L5nB56cZ3G4LyLQzO6gDu16UglQVFNLPLqbm/fsdg3XUTQuCNg + bXPmHcH/sLErpO0SnM5V2d80Kbf2engvVGqt+2hCs9UbJ0Wmd0zObNgtKpXKPblCYXKZwriXFauTg23e + SpOwSuOmKGrd91brD2+cxzuR3p4ZIGzrOCZSmgNEjfQ2qR78/yJspH2FrWtHkls7/ZMUKTwej/cHMGye + UcYINAcAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index a64c817..c2d6a28 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -266,6 +266,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(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -388,6 +389,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -569,8 +571,14 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_JobReport_AutoInputTableAdapter = null; + this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectToDoTableAdapter = null; + this.tam.EETGW_SaveCostTableAdapter = null; this.tam.JobReportTableAdapter = null; + this.tam.ProjectPartStatusTableAdapter = null; this.tam.ProjectsHistoryTableAdapter = null; this.tam.ProjectsIOMapTableAdapter = null; this.tam.ProjectsMailListTableAdapter = null; @@ -885,6 +893,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 25); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index ef91e46..cc2e736 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,34 +230,34 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGiVpa5NWhotMFCK - kEIlZm3ThpqsDBNL15SbuVLWWotRWW7pZGqzpS3p1V5mL9tdm9taWxnd073fXXR3+VN94HDhPuccHr48 - 1H9jsH9E+80A9Jb30A0v4tTQG6jpV4+EsYjBiahmYHx5aeBhBCZnGH0PwqCS6V/IVX23lxUyImhX9Huu - lzrjaYHerYFuXI2Tzkbys874DEJGRL/rK5kPLVwG7b8E01w3KOTAGw5fnF+3wDgWJvNsKLM7hGzxhkMX - fKKCKrNMUUHvRlmvFMo+mchPWaaCQleGcDwNVad3taDKXKqQd5WwzWNNaJtoRvn5nSTIMzwZzBTYZkKw - TQfhmA3i7ZcE9nVMkwLlYKlC1rmDVd+tx15jOYpPF0DauhUjnhAsvKaYvzd4/SmOilYPFPSuyrKzUrbR - UQeJtpAt0uZtN9xaQjy1AusMQ7w27ksKyBbcBlZONZaDkPeXoPrafhyzH8EW7SZ2s3bjNn6jNusHxJIr - sHsZ3J7NiBp9wiCRWntZ1ZVK6FxqHLXVoFhbwOY3ZcI8LSPvsPztJ+74Mhvcn+MOyfGYQbaUvXJI2gtR - pMtD/okNq2EezfVFUjDKBfkwKbjBPUQ2LwIxqAyede9AffUlolyB82mYeF1+roAP5ErW4fotZEQ00M8R - SfwAE0vjcySFAJMEtUfvRq4kDfdsQkbEcdPCZG2PP1nbM4/qLh8OnFu7l3+Eov4AJ5ItJ4lVSPEAAAAA + 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 SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPpZFJTBNRHMbn4J2bdw9eRCSKVE9q4sl48SJy - M8F4AQ8EEw4eUEJA1ARlcUklEAXZF7VIaA0hGGhZZO1Yh9KW6UKlZZky01k6nc7naxkFDyYuX96XmTd5 - v+///7+h/luuobxFv/WqGrBdO+ACdXX4rNfTf+Kwtycv6xd/zMsaGzt/yMApaqnHpOh6CoBOVtp770k5 - itBYcSLoKFJ+ODxXKvsdZX7m3akCA6coejA/pmsylFAdRF89RLYVkr8PepIjWXHomkC8u7dP7kCK7yaY - ARNt4BTl7jjJp9RdAjch7mkE/6US2zPFiM7eAuesBrd8D9ziHewslBOXkc4icA+cFgycBPTmq0lpAxzd - hJ35WkTGb0OKTJOqvFE9/Yz97CA93lJvrmzg6Q7OqJn5UwqxBGhiBtQkBkr4KWi6Gxb7FFpGWXROrMO2 - EMBs2znFwEnAC1NC1yRo/BSSnBXqVh8SG82Qg4/gXG7D0FwEq99ErG0pmPbyGFncxHtLi2bg5C+YTUpK - 5aFuW5CItGeqyoFqSL5y9NjDcIUEzLAS7D4Rk8TOsIKuTywMnAQ8zpV1lSPwKyjr9ZD9lQQug+i+kWnb - E1Vg98Yx4YljlBEwF1DQPh7aD1h5kBOWYnRsk+5MxVdbILifQWDqIHytQReZ2bUuYty9B6f9OajAPLyy - H8DUZJcytcc76PvHogu1OfJBfxhs1aY9POYJ5GBlzJLqliUBT8zdurXi4nUj4vdqsLJHzDb2bi+5i+7J - MF7aXKk6c7/uHGnGVGMh/6Yku9A4+ud6W3HppuN5EeezNmC46oJofP47vS45WjhSdVmyPbyyfxf/Jor6 - DpFxJZqzAb7fAAAAAElFTkSuQmCC + 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 diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs index a58752f..d1ba71e 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs @@ -46,6 +46,7 @@ System.Windows.Forms.Label qtybuyLabel; System.Windows.Forms.Label qtyinLabel; System.Windows.Forms.Label label1; + System.Windows.Forms.Label itemModelLabel; this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter(); @@ -59,6 +60,7 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); this.panel3 = new System.Windows.Forms.Panel(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.bbuyCheckBox = new System.Windows.Forms.CheckBox(); @@ -76,7 +78,7 @@ this.itemNameTextBox = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.itemModelTextBox = new System.Windows.Forms.TextBox(); pdateLabel = new System.Windows.Forms.Label(); statusLabel = new System.Windows.Forms.Label(); nameLabel = new System.Windows.Forms.Label(); @@ -94,6 +96,7 @@ qtybuyLabel = new System.Windows.Forms.Label(); qtyinLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); + itemModelLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); this.groupBox1.SuspendLayout(); @@ -149,7 +152,7 @@ // itemNameLabel // itemNameLabel.AutoSize = true; - itemNameLabel.Location = new System.Drawing.Point(369, 23); + itemNameLabel.Location = new System.Drawing.Point(369, 16); itemNameLabel.Name = "itemNameLabel"; itemNameLabel.Size = new System.Drawing.Size(29, 12); itemNameLabel.TabIndex = 0; @@ -158,7 +161,7 @@ // itemSidLabel // itemSidLabel.AutoSize = true; - itemSidLabel.Location = new System.Drawing.Point(138, 23); + itemSidLabel.Location = new System.Drawing.Point(138, 16); itemSidLabel.Name = "itemSidLabel"; itemSidLabel.Size = new System.Drawing.Size(24, 12); itemSidLabel.TabIndex = 2; @@ -167,7 +170,7 @@ // itemUnitLabel // itemUnitLabel.AutoSize = true; - itemUnitLabel.Location = new System.Drawing.Point(64, 73); + itemUnitLabel.Location = new System.Drawing.Point(64, 94); itemUnitLabel.Name = "itemUnitLabel"; itemUnitLabel.Size = new System.Drawing.Size(29, 12); itemUnitLabel.TabIndex = 4; @@ -185,7 +188,7 @@ // itemManuLabel // itemManuLabel.AutoSize = true; - itemManuLabel.Location = new System.Drawing.Point(629, 23); + itemManuLabel.Location = new System.Drawing.Point(629, 16); itemManuLabel.Name = "itemManuLabel"; itemManuLabel.Size = new System.Drawing.Size(41, 12); itemManuLabel.TabIndex = 8; @@ -194,7 +197,7 @@ // memoLabel // memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(64, 101); + memoLabel.Location = new System.Drawing.Point(64, 122); memoLabel.Name = "memoLabel"; memoLabel.Size = new System.Drawing.Size(29, 12); memoLabel.TabIndex = 12; @@ -203,7 +206,7 @@ // qtyLabel // qtyLabel.AutoSize = true; - qtyLabel.Location = new System.Drawing.Point(214, 73); + qtyLabel.Location = new System.Drawing.Point(214, 94); qtyLabel.Name = "qtyLabel"; qtyLabel.Size = new System.Drawing.Size(29, 12); qtyLabel.TabIndex = 14; @@ -212,7 +215,7 @@ // priceLabel // priceLabel.AutoSize = true; - priceLabel.Location = new System.Drawing.Point(354, 73); + priceLabel.Location = new System.Drawing.Point(354, 94); priceLabel.Name = "priceLabel"; priceLabel.Size = new System.Drawing.Size(29, 12); priceLabel.TabIndex = 16; @@ -221,7 +224,7 @@ // amtLabel // amtLabel.AutoSize = true; - amtLabel.Location = new System.Drawing.Point(565, 72); + amtLabel.Location = new System.Drawing.Point(565, 93); amtLabel.Name = "amtLabel"; amtLabel.Size = new System.Drawing.Size(29, 12); amtLabel.TabIndex = 18; @@ -230,7 +233,7 @@ // qtybuyLabel // qtybuyLabel.AutoSize = true; - qtybuyLabel.Location = new System.Drawing.Point(36, 139); + qtybuyLabel.Location = new System.Drawing.Point(36, 167); qtybuyLabel.Name = "qtybuyLabel"; qtybuyLabel.Size = new System.Drawing.Size(53, 12); qtybuyLabel.TabIndex = 20; @@ -239,7 +242,7 @@ // qtyinLabel // qtyinLabel.AutoSize = true; - qtyinLabel.Location = new System.Drawing.Point(389, 139); + qtyinLabel.Location = new System.Drawing.Point(389, 167); qtyinLabel.Name = "qtyinLabel"; qtyinLabel.Size = new System.Drawing.Size(53, 12); qtyinLabel.TabIndex = 22; @@ -248,7 +251,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(553, 139); + label1.Location = new System.Drawing.Point(553, 167); label1.Name = "label1"; label1.Size = new System.Drawing.Size(41, 12); label1.TabIndex = 6; @@ -378,6 +381,8 @@ // // groupBox2 // + this.groupBox2.Controls.Add(itemModelLabel); + this.groupBox2.Controls.Add(this.itemModelTextBox); this.groupBox2.Controls.Add(this.textBox1); this.groupBox2.Controls.Add(this.panel3); this.groupBox2.Controls.Add(qtyinLabel); @@ -406,11 +411,20 @@ this.groupBox2.Location = new System.Drawing.Point(10, 100); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(10); - this.groupBox2.Size = new System.Drawing.Size(713, 223); + this.groupBox2.Size = new System.Drawing.Size(713, 268); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; this.groupBox2.Text = "파트정보"; // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Item", true)); + this.textBox1.Location = new System.Drawing.Point(538, 35); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(58, 21); + this.textBox1.TabIndex = 24; + // // panel3 // this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); @@ -419,7 +433,7 @@ this.panel3.Controls.Add(this.itemSupplyTextBox); this.panel3.Controls.Add(itemSupplyLabel); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(10, 168); + this.panel3.Location = new System.Drawing.Point(10, 213); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(693, 45); this.panel3.TabIndex = 0; @@ -457,7 +471,7 @@ // qtyinTextBox // this.qtyinTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "qtyin", true)); - this.qtyinTextBox.Location = new System.Drawing.Point(447, 135); + this.qtyinTextBox.Location = new System.Drawing.Point(447, 163); this.qtyinTextBox.Name = "qtyinTextBox"; this.qtyinTextBox.Size = new System.Drawing.Size(100, 21); this.qtyinTextBox.TabIndex = 23; @@ -466,7 +480,7 @@ // option1TextBox // this.option1TextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "option2", true)); - this.option1TextBox.Location = new System.Drawing.Point(600, 135); + this.option1TextBox.Location = new System.Drawing.Point(600, 163); this.option1TextBox.Name = "option1TextBox"; this.option1TextBox.Size = new System.Drawing.Size(100, 21); this.option1TextBox.TabIndex = 11; @@ -476,7 +490,7 @@ // this.qtybuyTextBox.BackColor = System.Drawing.Color.SkyBlue; this.qtybuyTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "qtybuy", true)); - this.qtybuyTextBox.Location = new System.Drawing.Point(98, 135); + this.qtybuyTextBox.Location = new System.Drawing.Point(98, 163); this.qtybuyTextBox.Name = "qtybuyTextBox"; this.qtybuyTextBox.Size = new System.Drawing.Size(100, 21); this.qtybuyTextBox.TabIndex = 21; @@ -485,7 +499,7 @@ // amtTextBox // this.amtTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "amt", true)); - this.amtTextBox.Location = new System.Drawing.Point(600, 68); + this.amtTextBox.Location = new System.Drawing.Point(600, 89); this.amtTextBox.Name = "amtTextBox"; this.amtTextBox.Size = new System.Drawing.Size(100, 21); this.amtTextBox.TabIndex = 19; @@ -493,7 +507,7 @@ // priceTextBox // this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true)); - this.priceTextBox.Location = new System.Drawing.Point(398, 69); + this.priceTextBox.Location = new System.Drawing.Point(398, 90); this.priceTextBox.Name = "priceTextBox"; this.priceTextBox.Size = new System.Drawing.Size(100, 21); this.priceTextBox.TabIndex = 17; @@ -502,7 +516,7 @@ // qtyTextBox // this.qtyTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "qty", true)); - this.qtyTextBox.Location = new System.Drawing.Point(247, 69); + this.qtyTextBox.Location = new System.Drawing.Point(247, 90); this.qtyTextBox.Name = "qtyTextBox"; this.qtyTextBox.Size = new System.Drawing.Size(100, 21); this.qtyTextBox.TabIndex = 15; @@ -511,7 +525,7 @@ // memoTextBox // this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Location = new System.Drawing.Point(98, 95); + this.memoTextBox.Location = new System.Drawing.Point(98, 116); this.memoTextBox.Name = "memoTextBox"; this.memoTextBox.Size = new System.Drawing.Size(602, 21); this.memoTextBox.TabIndex = 13; @@ -519,7 +533,7 @@ // itemManuTextBox // this.itemManuTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemManu", true)); - this.itemManuTextBox.Location = new System.Drawing.Point(600, 42); + this.itemManuTextBox.Location = new System.Drawing.Point(600, 35); this.itemManuTextBox.Name = "itemManuTextBox"; this.itemManuTextBox.Size = new System.Drawing.Size(100, 21); this.itemManuTextBox.TabIndex = 9; @@ -527,7 +541,7 @@ // itemUnitTextBox // this.itemUnitTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemUnit", true)); - this.itemUnitTextBox.Location = new System.Drawing.Point(98, 69); + this.itemUnitTextBox.Location = new System.Drawing.Point(98, 90); this.itemUnitTextBox.Name = "itemUnitTextBox"; this.itemUnitTextBox.Size = new System.Drawing.Size(100, 21); this.itemUnitTextBox.TabIndex = 5; @@ -536,7 +550,7 @@ // itemSidTextBox // this.itemSidTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemSid", true)); - this.itemSidTextBox.Location = new System.Drawing.Point(98, 42); + this.itemSidTextBox.Location = new System.Drawing.Point(98, 35); this.itemSidTextBox.Name = "itemSidTextBox"; this.itemSidTextBox.Size = new System.Drawing.Size(100, 21); this.itemSidTextBox.TabIndex = 3; @@ -544,7 +558,7 @@ // itemNameTextBox // this.itemNameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemName", true)); - this.itemNameTextBox.Location = new System.Drawing.Point(206, 42); + this.itemNameTextBox.Location = new System.Drawing.Point(206, 35); this.itemNameTextBox.Name = "itemNameTextBox"; this.itemNameTextBox.ReadOnly = true; this.itemNameTextBox.Size = new System.Drawing.Size(328, 21); @@ -553,7 +567,7 @@ // button1 // this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.button1.Location = new System.Drawing.Point(10, 328); + this.button1.Location = new System.Drawing.Point(10, 373); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(713, 39); this.button1.TabIndex = 17; @@ -564,25 +578,33 @@ // panel2 // this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(10, 323); + this.panel2.Location = new System.Drawing.Point(10, 368); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(713, 5); this.panel2.TabIndex = 18; // - // textBox1 + // itemModelLabel // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Item", true)); - this.textBox1.Location = new System.Drawing.Point(538, 42); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(58, 21); - this.textBox1.TabIndex = 24; + itemModelLabel.AutoSize = true; + itemModelLabel.Location = new System.Drawing.Point(44, 66); + itemModelLabel.Name = "itemModelLabel"; + itemModelLabel.Size = new System.Drawing.Size(48, 12); + itemModelLabel.TabIndex = 24; + itemModelLabel.Text = "MODEL"; + // + // itemModelTextBox + // + this.itemModelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemModel", true)); + this.itemModelTextBox.Location = new System.Drawing.Point(98, 62); + this.itemModelTextBox.Name = "itemModelTextBox"; + this.itemModelTextBox.Size = new System.Drawing.Size(602, 21); + this.itemModelTextBox.TabIndex = 25; // // fProjectPartListEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 377); + this.ClientSize = new System.Drawing.Size(733, 422); this.Controls.Add(this.groupBox2); this.Controls.Add(this.panel2); this.Controls.Add(this.button1); @@ -639,5 +661,6 @@ private System.Windows.Forms.Panel panel3; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox itemModelTextBox; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.resx b/SubProject/FPJ0000/Project/fProjectPartListEdit.resx index 84502ac..c8a1ee0 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.resx +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.resx @@ -183,4 +183,7 @@ 226, 17 + + False + \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs index 19cd642..ef44997 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs @@ -35,11 +35,11 @@ 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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(); @@ -47,7 +47,6 @@ 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.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); @@ -62,6 +61,7 @@ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btAdd = new System.Windows.Forms.ToolStripButton(); this.btEdit = new System.Windows.Forms.ToolStripButton(); this.btDel = new System.Windows.Forms.ToolStripButton(); @@ -71,7 +71,7 @@ this.tbFind = new System.Windows.Forms.ToolStripTextBox(); this.btFind = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.sbCount = new System.Windows.Forms.ToolStripLabel(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -146,6 +146,7 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, + this.toolStripButton2, this.btAdd, this.btEdit, this.btDel, @@ -155,7 +156,7 @@ this.tbFind, this.btFind, this.toolStripSeparator6, - this.sbCount}); + this.toolStripButton1}); this.bn.Location = new System.Drawing.Point(0, 642); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -246,6 +247,15 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // + // toolStripButton2 + // + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.RightToLeftAutoMirrorImage = true; + this.toolStripButton2.Size = new System.Drawing.Size(74, 22); + this.toolStripButton2.Text = "줄추가(&I)"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // btAdd // this.btAdd.Image = ((System.Drawing.Image)(resources.GetObject("btAdd.Image"))); @@ -314,11 +324,14 @@ this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); // - // sbCount + // toolStripButton1 // - this.sbCount.Name = "sbCount"; - this.sbCount.Size = new System.Drawing.Size(83, 22); - this.sbCount.Text = "프로젝트 수량"; + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(91, 22); + this.toolStripButton1.Text = "Report Data"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // cm // @@ -430,30 +443,30 @@ 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 = 20; + this.fpSpread1_Sheet1.ColumnCount = 19; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "등록일"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "항목"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "요청"; - 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 = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "InHouse($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "완료일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "담당 파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Work Group"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Site"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Category"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Sub Category"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Highlight"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "요청파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "담당자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "InHouse($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Effect\r\n($K)"; + 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 = "Part"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Work Group"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "process/Equipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Site"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Category"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Sub Category"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Fan\r\nOut"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "High\r\nLight"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; @@ -469,113 +482,122 @@ this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "파트"; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 69F; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청파트"; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); 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.Left; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정"; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "reqstaff"; + 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 = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "userManager"; 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).Label = "담당자"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; - 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 = 78F; numberCellType1.DecimalPlaces = 0; numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType1.MaximumValue = 2147483647D; numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "수량"; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "수량"; numberCellType2.MaximumValue = 999999999999999D; numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "Original\r\n($K)"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Original\r\n($K)"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType3.MaximumValue = 999999999999999D; numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "InHouse($K)"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "InHouse($K)"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType4.MaximumValue = 999999999999999D; numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(9).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(8).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "effect"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "effect"; + 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 = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "edate"; - 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).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "eepart"; + this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Part"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "workgroup"; + this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "자산번호"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "Work Group"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "eepart"; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "담당 파트"; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "process/Equipment"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "workgroup"; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "site"; + this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "Work Group"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "Site"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "site"; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "category"; + this.fpSpread1_Sheet1.Columns.Get(15).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "Site"; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "Category"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "category"; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "subcate"; + this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "Category"; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "Sub Category"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "subcate"; + this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(17).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "fanout"; + this.fpSpread1_Sheet1.Columns.Get(17).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "Sub Category"; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "Fan\r\nOut"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "fanout"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "fanout"; + this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.fpSpread1_Sheet1.Columns.Get(18).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "weekly"; + this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "fanout"; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "High\r\nLight"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "weekly"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = checkBoxCellType2; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "weekly"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "Highlight"; - this.fpSpread1_Sheet1.Columns.Get(19).Tag = "weekly"; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -1018,7 +1040,6 @@ private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; - private System.Windows.Forms.ToolStripLabel sbCount; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.ToolStripComboBox cmbDateType; private dsPRJTableAdapters.EETGW_SaveCostTableAdapter ta; @@ -1031,5 +1052,7 @@ private System.Windows.Forms.ToolStripLabel lbEnd; private System.Windows.Forms.ToolStripTextBox dtED; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs index a0196ed..811ab40 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs @@ -64,6 +64,14 @@ namespace FPJ0000 void refreshData() { + + if (this.dsMSSQL.EETGW_SaveCost.GetChanges() != null) + { + var dlg = util.MsgQ("변경된 내용이 있습니다. 지금 새로고침 하면 해당 자료는 손실 됩니다. 진행 할까요?"); + if (dlg != DialogResult.Yes) return; + } + + string state = ""; string State_Select = " SELECT * FROM EETGW_SaveCost"; string State_where = " WHERE gcode=@gcode and "; @@ -418,5 +426,22 @@ namespace FPJ0000 { funcEdit(); } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + var f = new SaveCost.fSaveCostReport(); + f.Show(); + + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow(); + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = DateTime.Now.ToShortDateString(); + newdr.gcode = FCOMMON.info.Login.gcode; + this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.resx b/SubProject/FPJ0000/SaveCost/fSaveCostList.resx index d899411..8a91aab 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.resx +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.resx @@ -165,6 +165,18 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== @@ -206,6 +218,21 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostReport.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostReport.Designer.cs new file mode 100644 index 0000000..a72a823 --- /dev/null +++ b/SubProject/FPJ0000/SaveCost/fSaveCostReport.Designer.cs @@ -0,0 +1,231 @@ + +namespace FPJ0000.SaveCost +{ + partial class fSaveCostReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.progressBar2 = new System.Windows.Forms.ProgressBar(); + this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter(); + this.btSave = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.dte = new System.Windows.Forms.DateTimePicker(); + this.label2 = new System.Windows.Forms.Label(); + this.dts = new System.Windows.Forms.DateTimePicker(); + this.btRefresh = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.dsReport = new FPJ0000.dsReport(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + this.SuspendLayout(); + // + // fpSpread1 + // + this.fpSpread1.AccessibleDescription = ""; + this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; + this.fpSpread1.Location = new System.Drawing.Point(0, 58); + this.fpSpread1.Name = "fpSpread1"; + this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { + this.fpSpread1_Sheet1}); + this.fpSpread1.Size = new System.Drawing.Size(1114, 539); + this.fpSpread1.TabIndex = 7; + // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // + // progressBar2 + // + this.progressBar2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.progressBar2.Location = new System.Drawing.Point(0, 597); + this.progressBar2.Name = "progressBar2"; + this.progressBar2.Size = new System.Drawing.Size(1114, 23); + this.progressBar2.TabIndex = 8; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // btSave + // + this.btSave.Dock = System.Windows.Forms.DockStyle.Right; + this.btSave.Location = new System.Drawing.Point(959, 5); + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(75, 48); + this.btSave.TabIndex = 12; + this.btSave.Text = "파일저장"; + this.btSave.UseVisualStyleBackColor = true; + this.btSave.Click += new System.EventHandler(this.btSave_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(261, 27); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(14, 12); + this.label3.TabIndex = 9; + this.label3.Text = "~"; + // + // dte + // + this.dte.Location = new System.Drawing.Point(289, 23); + this.dte.Name = "dte"; + this.dte.Size = new System.Drawing.Size(180, 21); + this.dte.TabIndex = 8; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(10, 27); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 7; + this.label2.Text = "검색기간"; + // + // dts + // + this.dts.Location = new System.Drawing.Point(68, 23); + this.dts.Name = "dts"; + this.dts.Size = new System.Drawing.Size(180, 21); + this.dts.TabIndex = 6; + // + // btRefresh + // + this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; + this.btRefresh.Location = new System.Drawing.Point(1034, 5); + this.btRefresh.Name = "btRefresh"; + this.btRefresh.Size = new System.Drawing.Size(75, 48); + this.btRefresh.TabIndex = 2; + this.btRefresh.Text = "새로고침"; + this.btRefresh.UseVisualStyleBackColor = true; + this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.checkBox2); + this.panel1.Controls.Add(this.checkBox1); + this.panel1.Controls.Add(this.btSave); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.dte); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.dts); + this.panel1.Controls.Add(this.btRefresh); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(5); + this.panel1.Size = new System.Drawing.Size(1114, 58); + this.panel1.TabIndex = 6; + this.panel1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDoubleClick); + // + // dsReport + // + this.dsReport.DataSetName = "dsReport"; + this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bs + // + this.bs.DataMember = "JobReportDay"; + this.bs.DataSource = this.dsReport; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Checked = true; + this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox1.Location = new System.Drawing.Point(493, 25); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(108, 16); + this.checkBox1.TabIndex = 13; + this.checkBox1.Text = "High Light 포함"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Checked = true; + this.checkBox2.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBox2.Location = new System.Drawing.Point(611, 25); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(96, 16); + this.checkBox2.TabIndex = 14; + this.checkBox2.Text = "Fan Out 포함"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // fSaveCostReport + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1114, 620); + this.Controls.Add(this.fpSpread1); + this.Controls.Add(this.progressBar2); + this.Controls.Add(this.panel1); + this.Name = "fSaveCostReport"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Cost Reduction Report"; + 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(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private FarPoint.Win.Spread.FpSpread fpSpread1; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.ProgressBar progressBar2; + private dsReportTableAdapters.JobReportDayTableAdapter ta; + private System.Windows.Forms.Button btSave; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.DateTimePicker dte; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.DateTimePicker dts; + private System.Windows.Forms.Button btRefresh; + private System.Windows.Forms.Panel panel1; + private dsReport dsReport; + private System.Windows.Forms.BindingSource bs; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.CheckBox checkBox2; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs b/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs new file mode 100644 index 0000000..b867fba --- /dev/null +++ b/SubProject/FPJ0000/SaveCost/fSaveCostReport.cs @@ -0,0 +1,255 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FPJ0000.SaveCost +{ + public partial class fSaveCostReport : Form + { + public fSaveCostReport() + { + InitializeComponent(); + } + + private void fEBoardReport_Load(object sender, EventArgs e) + { + //기본엑셀파일을 가져온다 + this.Show(); + Application.DoEvents(); + + dts.Value = new DateTime(DateTime.Now.Year, 1, 1); + dte.Value = new DateTime(DateTime.Now.Year, 12, 31); + + //파일불러오기 + LoadExcel(); + } + + void LoadExcel() + { + //파일불러오기 + var fn = "CostReduction_" + DateTime.Now.Year.ToString("0000") + ".xlsx"; + var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + fn); + this.fpSpread1.OpenExcel(fi.FullName); + } + + + int GetColIndex(string colname) + { + var sIndex = (int)'A'; + var eIndex = (int)'Z'; + var colsize = eIndex - sIndex + 1; + var collist = colname.ToCharArray(); + var idx = 0; + + for (int i = collist.Length; i > 0; i--) + { + var c = collist[i - 1]; + idx += (int)(c - sIndex) + (colsize * (i - 1)); + } + return idx; + } + string GetColName(int idx) + { + var sIndex = (int)'A'; + var eIndex = (int)'Z'; + var colsize = eIndex - sIndex + 1; + string colName = string.Empty; + while (true) + { + var mok = (int)(Math.Floor((idx * 1.0) / colsize)); + if (mok > 0) colName += (char)(mok + sIndex); + var namoji = (idx % colsize); + if (namoji < colsize) + { + colName += (char)(namoji + sIndex); + break; + } + else idx = namoji; + } + return colName; + } + private void btRefresh_Click(object sender, EventArgs e) + { + //새로고침 + //a2 에 날짜를 표시함. + var db = new EEEntities(); + var sd = this.dts.Value.ToShortDateString(); + var ed = this.dte.Value.ToShortDateString(); + + this.fpSpread1.ActiveSheetIndex = 1; + var 기간자료 = db.EETGW_SaveCost.Where(t => t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0).OrderBy(t => t.pdate).GroupBy(t => t.name); + + + var row = 6; + foreach (var item in 기간자료) + { + var dr = item.FirstOrDefault(); + this.fpSpread1.ActiveSheet.Cells["C" + row.ToString()].Value = dr.eepart; + this.fpSpread1.ActiveSheet.Cells["D" + row.ToString()].Value = dr.workgroup; + this.fpSpread1.ActiveSheet.Cells["E" + row.ToString()].Value = dr.process; + this.fpSpread1.ActiveSheet.Cells["F" + row.ToString()].Value = dr.site; + this.fpSpread1.ActiveSheet.Cells["G" + row.ToString()].Value = dr.category; + this.fpSpread1.ActiveSheet.Cells["H" + row.ToString()].Value = dr.subcate; + this.fpSpread1.ActiveSheet.Cells["I" + row.ToString()].Value = dr.name; + + this.fpSpread1.ActiveSheet.Cells["J" + row.ToString()].Value = "--"; + this.fpSpread1.ActiveSheet.Cells["K" + row.ToString()].Value = "--"; + + this.fpSpread1.ActiveSheet.Cells["L" + row.ToString()].Value = dr.part; + var str_fanout = dr.fanout == null ? "New" : ((bool)dr.fanout ? "Fan-Out" : "New"); + this.fpSpread1.ActiveSheet.Cells["M" + row.ToString()].Value = str_fanout; + + this.fpSpread1.ActiveSheet.Cells["N" + row.ToString()].Value = item.Sum(t => t.costo); + this.fpSpread1.ActiveSheet.Cells["O" + row.ToString()].Value = item.Sum(t => t.costn); + + this.fpSpread1.ActiveSheet.Cells["AM" + row.ToString()].Value = dr.userManager; + + //1월수량 + var colZ = GetColIndex("Z"); + for (int ii = 0; ii < 12; ii++) + { + var psd = new DateTime(2021,ii+1,1); + var ped = psd.AddMonths(1).AddDays(-1); + var datas = item.Where(t => t.pdate.CompareTo(psd.ToShortDateString()) >= 0 && t.pdate.CompareTo(ped.ToShortDateString()) <= 0); + var tCnt = datas.Count(); + this.fpSpread1.ActiveSheet.Cells[row, colZ + ii].Value = tCnt;// datas.Count(); + } + + row += 1; + } + + + + + + //var 분류목록 = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.분류) == false).OrderBy(t => t.분류).GroupBy(t => t.분류).ToList(); + + + //var 담당목록 = db.vGroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.processs == "전자실" && string.IsNullOrEmpty(t.state) == true).OrderBy(t => t.name).GroupBy(t => t.name); + + + //var row = 1; + //var col = 1; + //var col0 = 1; + //foreach (var item in 분류목록) + //{ + // var dr = item.FirstOrDefault(); + // var cell = this.fpSpread1.Sheets[0].Cells[row, col + 0]; + // cell.Value = dr.분류; + // cell.ColumnSpan = 2; + // cell.BackColor = Color.SkyBlue; + // cell.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + // cell.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + + // cell = this.fpSpread1.Sheets[0].Cells[row + 1, col + 0]; + // cell.Value = "건"; + // cell.BackColor = Color.Khaki; + // cell.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + // cell.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + + // cell = this.fpSpread1.Sheets[0].Cells[row + 1, col + 1]; + // cell.Value = "시간"; + // cell.BackColor = Color.Khaki; + // cell.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + // cell.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + + // col += 2; + // col0 += 1; + //} + + ////마지막 열에는 비용절감항목을 추가한다. + //fpSpread1.Sheets[0].Cells[1, col].Value = "비용절감"; + //fpSpread1.Sheets[0].Cells[1, col].BackColor = Color.WhiteSmoke; + //fpSpread1.Sheets[0].Cells[1, col].RowSpan = 2; + //fpSpread1.Sheets[0].Cells[1, col].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + //fpSpread1.Sheets[0].Cells[1, col].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + + //var MaxCol = col0; + //col = 0; + //row = 3; + //foreach (var item in 담당목록) + //{ + // //var dr = item.KeY; + // this.fpSpread1.Sheets[0].Cells[row, col].Value = item.Key; + + // //이 담당자의 횟수를 읽어온다 + // for (int i = 1; i < MaxCol; i++) + // { + // var 분류명 = fpSpread1.Sheets[0].Cells[1, 1 + (i - 1) * 2].Value.ToString(); + // var 분류데이터 = 기간자료.Where(t => t.uid.Contains(item.Key) && t.분류 == 분류명); + // var 건수 = 분류데이터.Count(); + // var 시간 = 분류데이터.Sum(t => t.RepairTime); + // this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 1].Value = 건수; + // this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].Value = 시간; + // this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + // this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + + // this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 1].Column.Width = 50; + // this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].Column.Width = 70; + // } + + // //이 담당자의 수리완료건의 비용절감비용을 가져온다 + // var 절감비용 = 기간자료.Where(t => t.uid.Contains(item.Key) && t.분류 == "수리완료" && string.IsNullOrEmpty(t.수리완료일) == false && string.IsNullOrEmpty(t.외주업체) == true).Sum(t => t.CostReduction); + // this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].Value = 절감비용; + // this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].BackColor = Color.WhiteSmoke; + // this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + // this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + // row += 1; + //} + + //this.fpSpread1.Sheets[0].Cells[row, 0].Value = "합계"; + + + //for (int i = 1; i < MaxCol; i++) + //{ + // var colIdx = (i - 1) * 2; + // var c1 = (char)(65 + colIdx + 1); + // var c2 = (char)(65 + colIdx + 2); + // this.fpSpread1.Sheets[0].Cells[row, colIdx + 1].Formula = $"SUM({c1}4:{c1}" + row.ToString() + ")"; + // this.fpSpread1.Sheets[0].Cells[row, colIdx + 2].Formula = $"SUM({c2}4:{c2}" + row.ToString() + ")"; + //} + //var c3 = (char)(65 + MaxCol * 2 - 1); + //this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].Formula = $"SUM({c3}4:{c3}" + row.ToString() + ")"; + //this.fpSpread1.Sheets[0].Cells["A1"].Value = "Performance"; + //this.fpSpread1.Sheets[0].Cells["A1"].ColumnSpan = MaxCol * 2; + //this.fpSpread1.Sheets[0].Cells["A2"].Value = "성명"; + //this.fpSpread1.Sheets[0].Cells["A2"].RowSpan = 2; + + //this.fpSpread1.Sheets[0].Cells[$"A2:A{row}"].BackColor = Color.WhiteSmoke; + + ////합계필드 색상변경 + //this.fpSpread1.Sheets[0].Cells[$"A{row + 1}:{c3}{row + 1}"].BackColor = Color.WhiteSmoke; + ////this.fpSpread1.Sheets[0].Cells[$"A{row + 1}:{c3}{row + 1}"].Border = + //// new FarPoint.Win.ComplexBorder( + //// new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine)); + + + ////모든열을 중앙정렬한다 + + this.fpSpread1.ActiveSheetIndex = 0; + this.fpSpread1.Invalidate(); + } + + private void btSave_Click(object sender, EventArgs e) + { + //파일저장 + var sd = new SaveFileDialog(); + sd.Filter = "excel|*.xls"; + if (sd.ShowDialog() == DialogResult.OK) + { + this.fpSpread1.SaveExcel(sd.FileName); + } + } + + private void panel1_MouseDoubleClick(object sender, MouseEventArgs e) + { + LoadExcel(); + } + } +} diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostReport.resx b/SubProject/FPJ0000/SaveCost/fSaveCostReport.resx new file mode 100644 index 0000000..7362dc4 --- /dev/null +++ b/SubProject/FPJ0000/SaveCost/fSaveCostReport.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 397, 17 + + + 397, 17 + + + 549, 17 + + + 611, 17 + + + 713, 17 + + \ No newline at end of file