diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
index 3e56366..0012649 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
@@ -30,31 +30,31 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
- FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
this.dsPurchase = new FEQ0000.dsPurchase();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -83,6 +83,7 @@
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton();
this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -125,7 +126,7 @@
this.btViewDel = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
- this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
+ this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -145,6 +146,7 @@
//
this.bs.DataMember = "Purchase";
this.bs.DataSource = this.dsPurchase;
+ this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
//
// ta
//
@@ -376,6 +378,15 @@
this.집계표ToolStripMenuItem.Text = "집계표";
this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click);
//
+ // toolStripButton3
+ //
+ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
+ this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton3.Name = "toolStripButton3";
+ this.toolStripButton3.Size = new System.Drawing.Size(87, 23);
+ this.toolStripButton3.Text = "견적서폴더";
+ this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
+ //
// cm1
//
this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F);
@@ -715,7 +726,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(1184, 602);
+ this.fpSpread1.Size = new System.Drawing.Size(1184, 579);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
//
@@ -760,7 +771,7 @@
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType39;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
@@ -768,7 +779,7 @@
this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType40;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
@@ -776,165 +787,166 @@
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 49F;
this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType41;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType42;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 49F;
this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType43;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청";
this.fpSpread1_Sheet1.Columns.Get(4).Width = 37F;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType44;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 24F;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType45;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "CR/CF#";
+ this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 43F;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType46;
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령";
this.fpSpread1_Sheet1.Columns.Get(7).Width = 33F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType47;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType48;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 33F;
this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType11.DecimalPlaces = 0;
- numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType11.MaximumValue = 2147483647D;
- numberCellType11.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType11;
+ numberCellType1.DecimalPlaces = 0;
+ numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType1.MaximumValue = 2147483647D;
+ numberCellType1.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 14F;
- this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType49;
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격";
this.fpSpread1_Sheet1.Columns.Get(11).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType50;
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept";
this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사";
this.fpSpread1_Sheet1.Columns.Get(12).Width = 45F;
- this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType50;
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc";
this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정";
this.fpSpread1_Sheet1.Columns.Get(13).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType50;
+ this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset";
this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델";
this.fpSpread1_Sheet1.Columns.Get(14).Width = 33F;
- numberCellType12.DecimalPlaces = 0;
- numberCellType12.NegativeRed = true;
- numberCellType12.NullDisplay = "--";
- numberCellType12.Separator = ",";
- numberCellType12.ShowSeparator = true;
- numberCellType12.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType12;
+ numberCellType2.DecimalPlaces = 0;
+ numberCellType2.NegativeRed = true;
+ numberCellType2.NullDisplay = "--";
+ numberCellType2.Separator = ",";
+ numberCellType2.ShowSeparator = true;
+ numberCellType2.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량";
this.fpSpread1_Sheet1.Columns.Get(15).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType51;
+ this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit";
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위";
this.fpSpread1_Sheet1.Columns.Get(16).Width = 33F;
- numberCellType13.DecimalPlaces = 0;
- numberCellType13.NegativeRed = true;
- numberCellType13.NullDisplay = "--";
- numberCellType13.Separator = ",";
- numberCellType13.ShowSeparator = true;
- numberCellType13.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType13;
+ numberCellType3.DecimalPlaces = 0;
+ numberCellType3.NegativeRed = true;
+ numberCellType3.NullDisplay = "--";
+ numberCellType3.Separator = ",";
+ numberCellType3.ShowSeparator = true;
+ numberCellType3.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가";
this.fpSpread1_Sheet1.Columns.Get(17).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType13;
+ this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt";
this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액";
this.fpSpread1_Sheet1.Columns.Get(18).Width = 33F;
this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType52;
+ this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply";
this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체";
this.fpSpread1_Sheet1.Columns.Get(19).Width = 49F;
this.fpSpread1_Sheet1.Columns.Get(20).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(20).CellType = numberCellType14;
+ numberCellType4.DecimalPlaces = 0;
+ numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType4.MaximumValue = 2147483647D;
+ numberCellType4.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType4;
this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx";
this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(20).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(20).Width = 14F;
this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType53;
+ 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 = 45F;
this.fpSpread1_Sheet1.Columns.Get(22).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(22).CellType = numberCellType15;
+ numberCellType5.DecimalPlaces = 0;
+ numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType5.MaximumValue = 2147483647D;
+ numberCellType5.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType5;
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 = textCellType54;
+ this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
this.fpSpread1_Sheet1.Columns.Get(23).DataField = "edate";
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(24).CellType = textCellType55;
+ this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(24).DataField = "indate";
this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고일";
this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType56;
+ this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
this.fpSpread1_Sheet1.Columns.Get(25).DataField = "po";
this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(25).Label = "PO#";
this.fpSpread1_Sheet1.Columns.Get(25).Width = 32F;
- this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType57;
+ this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(26).DataField = "bigo";
this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(26).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(26).Width = 33F;
- this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType3;
+ this.fpSpread1_Sheet1.Columns.Get(27).CellType = checkBoxCellType1;
this.fpSpread1_Sheet1.Columns.Get(27).DataField = "isdel";
this.fpSpread1_Sheet1.Columns.Get(27).Label = "삭제됨";
this.fpSpread1_Sheet1.Columns.Get(27).Tag = "isdel";
@@ -945,14 +957,17 @@
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
- // toolStripButton3
+ // label1
//
- this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
- this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton3.Name = "toolStripButton3";
- this.toolStripButton3.Size = new System.Drawing.Size(87, 23);
- this.toolStripButton3.Text = "견적서폴더";
- this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
+ 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, 616);
+ this.label1.Name = "label1";
+ this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
+ this.label1.Size = new System.Drawing.Size(1184, 23);
+ this.label1.TabIndex = 6;
+ this.label1.Text = "--";
+ this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fPurchase
//
@@ -960,6 +975,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1184, 665);
this.Controls.Add(this.fpSpread1);
+ this.Controls.Add(this.label1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
this.DoubleBuffered = true;
@@ -1049,10 +1065,11 @@
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
private System.Windows.Forms.ToolStripComboBox cmbSort;
- private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem sC검색ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cRCF검색ToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton3;
+ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+ private System.Windows.Forms.Label label1;
}
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs
index 381b129..2e9f2c4 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -217,6 +217,7 @@ namespace FEQ0000
this.fpSpread1.SuspendLayout();
var delindex = this.fpSpread1.ActiveSheet.Columns["isdel"].Index;
var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index;
+ var crcfindex = this.fpSpread1.ActiveSheet.Columns["crcf"].Index;
for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
{
var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex);
@@ -224,6 +225,12 @@ namespace FEQ0000
if (state != null) stateStr = state.ToString();
var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
+ var crcf = this.fpSpread1.ActiveSheet.GetValue(i, crcfindex);
+
+ var str_crcf = string.Empty;
+ if (crcf != null) str_crcf = crcf.ToString();
+
+
if (value != null && (Boolean)value)
{
this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Red;
@@ -231,7 +238,13 @@ namespace FEQ0000
}
else
{
- this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White;
+ //crcf 에 따라서 배경색 변경
+ if (str_crcf != "")
+ this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.FromArgb(50, Color.PowderBlue);
+ else
+ this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White;
+
+
switch (stateStr.ToLower())
{
case "cancled":
@@ -872,5 +885,17 @@ namespace FEQ0000
string path = "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
FCOMMON.Util.RunExplorer(path);
}
+
+ private void bs_CurrentChanged(object sender, EventArgs e)
+ {
+ var drv = this.bs.Current as DataRowView;
+ if (drv == null)
+ {
+ this.label1.Text = "데이터가 선택되지 않았습니다";
+ return;
+ }
+ var dr = drv.Row as dsPurchase.PurchaseRow;
+ this.label1.Text = string.Format("{0}",dr.bigo.Replace("\r","").Replace("\n",""));
+ }
}
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx
index 71247f1..4523e3a 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase.resx
@@ -249,18 +249,18 @@
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
- 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
+ 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
diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
index 0a2e869..11b3197 100644
--- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -125,9 +125,7 @@
this.label11 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.bsHist = new System.Windows.Forms.BindingSource(this.components);
- this.textBox4 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
- this.textBox3 = new System.Windows.Forms.TextBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -147,6 +145,10 @@
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.panel3 = new System.Windows.Forms.Panel();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.sbCount = new System.Windows.Forms.ToolStripLabel();
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.richTextBox2 = new System.Windows.Forms.RichTextBox();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -190,7 +192,9 @@
this.toolStripSeparator5,
this.toolStripLabel1,
this.tbFind,
- this.btFind});
+ this.btFind,
+ this.toolStripSeparator6,
+ this.sbCount});
this.bn.Location = new System.Drawing.Point(0, 528);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -495,6 +499,7 @@
this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem";
this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
this.삭제ToolStripMenuItem.Text = "삭제";
+ this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
//
// 편집ToolStripMenuItem1
//
@@ -962,7 +967,6 @@
//
// label1
//
- this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true));
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, 287);
@@ -979,9 +983,9 @@
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Controls.Add(this.panel4, 1, 0);
- this.tableLayoutPanel1.Controls.Add(this.textBox4, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.textBox3, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.richTextBox2, 1, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 47);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@@ -1032,19 +1036,6 @@
this.bsHist.DataSource = this.dsMSSQL;
this.bsHist.Sort = "pdate desc";
//
- // textBox4
- //
- this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true));
- this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox4.Location = new System.Drawing.Point(692, 25);
- this.textBox4.Margin = new System.Windows.Forms.Padding(0);
- this.textBox4.Multiline = true;
- this.textBox4.Name = "textBox4";
- this.textBox4.ReadOnly = true;
- this.textBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.textBox4.Size = new System.Drawing.Size(692, 146);
- this.textBox4.TabIndex = 10;
- //
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1057,19 +1048,6 @@
this.label2.Text = "요청 사항";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // textBox3
- //
- this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
- this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox3.Location = new System.Drawing.Point(0, 25);
- this.textBox3.Margin = new System.Windows.Forms.Padding(0);
- this.textBox3.Multiline = true;
- this.textBox3.Name = "textBox3";
- this.textBox3.ReadOnly = true;
- this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.textBox3.Size = new System.Drawing.Size(692, 146);
- this.textBox3.TabIndex = 8;
- //
// tableLayoutPanel2
//
this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
@@ -1306,6 +1284,41 @@
this.panel3.Size = new System.Drawing.Size(1384, 218);
this.panel3.TabIndex = 7;
//
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
+ //
+ // sbCount
+ //
+ this.sbCount.Name = "sbCount";
+ this.sbCount.Size = new System.Drawing.Size(83, 22);
+ this.sbCount.Text = "프로젝트 수량";
+ //
+ // richTextBox1
+ //
+ this.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
+ this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBox1.Location = new System.Drawing.Point(3, 28);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.ReadOnly = true;
+ this.richTextBox1.Size = new System.Drawing.Size(686, 140);
+ this.richTextBox1.TabIndex = 1;
+ this.richTextBox1.Text = "";
+ //
+ // richTextBox2
+ //
+ this.richTextBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true));
+ this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBox2.Location = new System.Drawing.Point(695, 28);
+ this.richTextBox2.Name = "richTextBox2";
+ this.richTextBox2.ReadOnly = true;
+ this.richTextBox2.Size = new System.Drawing.Size(686, 140);
+ this.richTextBox2.TabIndex = 1;
+ this.richTextBox2.Text = "";
+ //
// fProjectList
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1330,7 +1343,6 @@
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
- this.tableLayoutPanel1.PerformLayout();
this.panel4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit();
this.tableLayoutPanel2.ResumeLayout(false);
@@ -1389,8 +1401,6 @@
private System.Windows.Forms.ToolStripButton btFind;
private System.Windows.Forms.ToolStripButton chk대기;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox textBox3;
- private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripComboBox cmbYearS;
@@ -1441,5 +1451,9 @@
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripLabel sbCount;
+ private System.Windows.Forms.RichTextBox richTextBox1;
+ private System.Windows.Forms.RichTextBox richTextBox2;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs
index 204a7ba..b9eb440 100644
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -477,8 +477,15 @@ namespace FPJ0000
{
//히스토리 데이터를 업데이트하고 첫번재 자료를 표시한다.
var drv = this.bs.Current as DataRowView;
- if (drv == null) return;
+ if (drv == null)
+ {
+ this.label1.Text = "프로젝트가 선택되지 않았습니다";
+ return;
+ }
var dr = drv.Row as dsPRJ.ProjectsRow;
+ this.label1.Text = string.Format("[{0}] {1}",dr.name,dr.memo);
+
+
try
{
taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx);
@@ -635,5 +642,10 @@ namespace FPJ0000
{
menu_iomap();
}
+
+ private void 삭제ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ funcDelete();
+ }
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx
index e42ba15..189b77b 100644
--- a/SubProject/FPJ0000/Project/fProjectList.resx
+++ b/SubProject/FPJ0000/Project/fProjectList.resx
@@ -211,35 +211,35 @@
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
- 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
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL/SURBVDhPvZLZTxNRGMXnETUan01QCJuALAHrWCgMLdzp
+ Qmdoy9CWdmhLacsmexRCAmgxQRpli0gRLbRlFVnKJghBILEkYiKGgMgiBfXJP+I6mBJMeDTxJL/Hc757
+ vu8i/6yKVSN6TMkKw2I2WjBHo8YpGs0eV6L0cDqqdJBo+ksRSloBKmpOQr22U5Wv5oK6d1of7d90n4D9
+ ATumDvPhPYoHXtupipdyQJmbOlfhzjUfU7ZiMBct6s35bzVmwxRt1o0qzfSgzCx3kGZxB95DduC1gtak
+ Wq8dQQoXdMA0YTpf5jY5ipeMrPxZXZxxJgszuJQ8zXA6ntmXJkq3E+K0TlzCa+RUC55wRbyGeJvXjiC5
+ 0zSg5+gLRUt6Z94bdUK527hd+j73a+lyzs6dee1u3px6zzCh3NeMyvczeyU/KYd4T/Ic/yVux9f4Ldw1
+ RDeiBPpx8mLBvNZpnFKlMDWgaVpdneNSWrQj8mdZr6h+1YB0IsNOLEis4DPZDtzgcdIB3oS5mJ1AhO6X
+ ArVTcMk4rXLqXstFJcsGaJxUvtCNKYboIWpG1S9douypq9IuwUdRa/IuvzlxndvAPuI2xE3G32dBhLIR
+ IK0bu6wbzehV9EpkzE6gflwxqxmiVpj+H6ge8TrZKdhIbeNugcYED9bA3mTXsY7YNTEuVlU0RIgOHAhb
+ eEDhJGaJp6DGNEND1aBsS24ndyRdgn2iA3jwZszDtXAOE+vRw/ga1hdWVeThzcrIsaiyMOhdJYLIukU2
+ wsqXZY8poKKP+ETZhBtiK9jkt3K3ki0J24kP0W12TexW7L2IzYiSEE9k8fXhsIKg0wBmko25r009IIVp
+ XcLvwraUHylNGNOVfcR5cOuQVRXlibkb4blRFHoQmhfwjaE/yOB/GnAiqlsMSSt/UtSWNAEsHBczeSyu
+ LnaUVRk1HF0aNhheFNwXYgp0BOZcs/trfc8GMD8NClu5MNnCgYn1tyHzbHizMgoe9w0vDIYhpgAYoPeD
+ fhpfeFV95WzAfxaC/Abj506SmlogQgAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- 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
+ 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
SUVORK5CYII=
diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs
index 85dbcce..2e05b05 100644
--- a/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs
+++ b/SubProject/FPJ0000/Project/fProjectPartToPurchase.cs
@@ -138,7 +138,7 @@ namespace FPJ0000
dtPdate.Value = DateTime.Now;
- cmbState.Text = "PO";
+ cmbState.Text = "PR"; //po에서 변경 200423 - JBS요청
this.Show();