diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3c1310b..6bdd023 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("19.09.05.1450")] -[assembly: AssemblyFileVersion("19.09.05.1450")] +[assembly: AssemblyVersion("19.09.26.0830")] +[assembly: AssemblyFileVersion("19.09.26.0830")] diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index fcd5e28..6aa4fc1 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -392,7 +392,7 @@ namespace FPJ0000 newdr.wdate = DateTime.Now; newdr.wuid = FCOMMON.info.Login.no; newdr.uid = FCOMMON.info.Login.no; - newdr.description = ""; + //newdr.description = ""; newdr.pdate = DateTime.Now.ToShortDateString(); //190509 newdr.idx = -1; newdr.hrs = 8.0; diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs index e590c38..fabe7da 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs @@ -12,7 +12,8 @@ namespace FPJ0000.JobReport public partial class fJobReport_Add : Form { dsPRJ.JobReportRow dr; - public fJobReport_Add(dsPRJ.JobReportRow dr_) + Boolean copyMOde = false; + public fJobReport_Add(dsPRJ.JobReportRow dr_,Boolean copy=false) { InitializeComponent(); dr = dr_; @@ -30,6 +31,7 @@ namespace FPJ0000.JobReport ctl.KeyDown += ctl_KeyDown; } } + copyMOde = copy; } private void fJobReport_Add_Load(object sender, EventArgs e) @@ -107,8 +109,16 @@ namespace FPJ0000.JobReport this.Show(); Application.DoEvents(); - tbProject.Focus(); - tbProject.SelectAll(); + if(tbDescription.Text.Trim() != "") + { + tbDescription.Focus(); + tbDescription.SelectAll(); + } + else + { + tbProject.Focus(); + tbProject.SelectAll(); + } } void ctl_KeyDown(object sender, KeyEventArgs e) diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 4ce932d..d8ad6fd 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -42,21 +42,21 @@ FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = 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.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo3 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); + 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.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.textBox1 = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -100,12 +100,12 @@ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.lbSum = new System.Windows.Forms.ToolStripLabel(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); pdateLabel = new System.Windows.Forms.Label(); requestLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); @@ -604,6 +604,16 @@ this.toolStripButton3.Text = "가져오기"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // + // toolStripButton4 + // + this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(75, 22); + this.toolStripButton4.Text = "구매등록"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // // ta // this.ta.ClearBeforeFill = true; @@ -685,73 +695,74 @@ this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - numberCellType13.DecimalPlaces = 0; - numberCellType13.NegativeRed = true; - numberCellType13.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType13; + numberCellType1.DecimalPlaces = 0; + numberCellType1.NegativeRed = true; + numberCellType1.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "no"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "No"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ItemGroup"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "구분"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "ItemName"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType14.DecimalPlaces = 0; - numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType14.MaximumValue = 2147483647D; - numberCellType14.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType14; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "Item"; 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 = 88F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "SID"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Label = "모델"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 99F; - numberCellType15.DecimalPlaces = 0; - numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType15.MaximumValue = 2147483647D; - numberCellType15.MinimumValue = -2147483648D; - numberCellType15.NegativeRed = true; - numberCellType15.Separator = ","; - numberCellType15.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType15; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + numberCellType3.NegativeRed = true; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 97F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemUnit"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType16.DecimalPlaces = 0; - numberCellType16.MaximumValue = 999999999999999D; - numberCellType16.MinimumValue = -999999999999999D; - numberCellType16.NegativeRed = true; - numberCellType16.Separator = ","; - numberCellType16.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType16; + numberCellType4.DecimalPlaces = 0; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + numberCellType4.NegativeRed = true; + numberCellType4.Separator = ","; + numberCellType4.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(8).Formula = "qty*price"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; @@ -759,26 +770,26 @@ this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType17.DecimalPlaces = 0; - numberCellType17.MaximumValue = 999999999999999D; - numberCellType17.MinimumValue = -999999999999999D; - numberCellType17.NegativeRed = true; - numberCellType17.Separator = ","; - numberCellType17.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType17; + numberCellType5.DecimalPlaces = 0; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + numberCellType5.NegativeRed = true; + numberCellType5.Separator = ","; + numberCellType5.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(9).Label = "금액"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ItemManu"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(10).Label = "제조사"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).ImeMode = System.Windows.Forms.ImeMode.Hangul; @@ -786,17 +797,17 @@ this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType18.DecimalPlaces = 0; - numberCellType18.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType18.MaximumValue = 2147483647D; - numberCellType18.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType18; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ItemSupplyidx"; 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 62F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; @@ -813,11 +824,11 @@ this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; - noPrinterPrintInfo3.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); - noPrinterPrintInfo3.HardMarginX = 0F; - noPrinterPrintInfo3.HardMarginY = 0F; - noPrinterPrintInfo3.SupportColor = true; - this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo3; + noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); + noPrinterPrintInfo1.HardMarginX = 0F; + noPrinterPrintInfo1.HardMarginY = 0F; + noPrinterPrintInfo1.SupportColor = true; + this.fpSpread1_Sheet1.PrintInfo.NoPrinterSetting = noPrinterPrintInfo1; this.fpSpread1_Sheet1.PrintInfo.PdfSecurity = null; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; @@ -830,16 +841,6 @@ this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist"; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // toolStripButton4 - // - this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(75, 22); - this.toolStripButton4.Text = "구매등록"; - this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); - // // fPartList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -916,7 +917,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.ToolStripButton toolStripButton3; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton toolStripButton4; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index de3d245..7815f32 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -67,9 +67,9 @@ namespace FPJ0000 else if (colname == "qty") colidx_qty = col.Index; else if (colname == "price") colidx_price = col.Index; else if (colname == "amt") colidx_amt = col.Index; - else if (colname == "supplyidx") colidx_supplyidx = col.Index; - else if (col.Label.ToLower() == "supply") colidx_supply = col.Index; - else if (col.Label.ToLower() == "sid") colidx_sid = col.Index; + else if (colname == "itemsupplyidx") colidx_supplyidx = col.Index; + else if (colname == "itemsupply") colidx_supply = col.Index; + else if (colname == "itemsid") colidx_sid = col.Index; } this.Show(); Application.DoEvents(); diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 5136248..357184b 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -147,12 +147,6 @@ 100, 17 - - 100, 17 - - - 17, 17 - 17, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 26d8a35..2bd5fb6 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -266,7 +266,7 @@ namespace FPJ0000 var dr = drv.Row as dsPRJ.ProjectsRow; var f = new fPartList(dr.idx); //f.TopMost = true; - f.ShowDialog(); + f.Show(); } @@ -363,7 +363,7 @@ namespace FPJ0000 if (drv == null) return; var dr = drv.Row as dsPRJ.ProjectsRow; var f = new fProjectIOMap(dr.idx); - f.ShowDialog(); + f.Show(); } private void tbFind_KeyDown(object sender, KeyEventArgs e)