구매 목록의 상태 핕터에 <=Received 항목 추가

2019-04-04 14:43:47 +09:00
parent 417e02a171
commit 1c40de0c12
6 changed files with 135 additions and 87 deletions
--- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
@@ -30,29 +30,29 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
-            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.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            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.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            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.CheckBoxCellType checkBoxCellType2 = 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            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.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();
@@ -93,6 +93,7 @@
            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
            this.ㅕCustomDataCopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
            this.cmDate = new System.Windows.Forms.ToolStripComboBox();
            this.dtSD = new System.Windows.Forms.ToolStripTextBox();
@@ -117,7 +118,7 @@
            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
            this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
-            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
            ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -175,7 +176,8 @@
            this.toolStripLabel5,
            this.toolStripLabel2,
            this.tbFind,
-            this.btFind});
+            this.btFind,
+            this.toolStripButton1});
            this.bn.Location = new System.Drawing.Point(0, 634);
            this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
            this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -349,7 +351,7 @@
            this.ㅕCustomDataCopyToolStripMenuItem,
            this.toolStripMenuItem4});
            this.cm1.Name = "contextMenuStrip1";
-            this.cm1.Size = new System.Drawing.Size(337, 344);
+            this.cm1.Size = new System.Drawing.Size(337, 322);
            // 
            // columnSizeToolStripMenuItem
            // 
@@ -459,6 +461,11 @@
            this.copyToolStripMenuItem.Text = "Copy";
            this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
            // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(333, 6);
+            // 
            // toolStrip1
            // 
            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
@@ -700,7 +707,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 = textCellType18;
+            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 = "등록일";
@@ -708,7 +715,7 @@
            this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F;
            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 = textCellType19;
+            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 = "상태";
@@ -716,149 +723,149 @@
            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(1).Width = 66F;
            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process";
            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(2).Label = "공정";
            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(2).Width = 67F;
            this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request";
            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).Width = 48F;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc";
            this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#";
            this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "receive";
            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).Width = 46F;
            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoSort = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "sid";
            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(6).Label = "SID#";
            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(6).Width = 55F;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "pumname";
            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).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(8).CellType = numberCellType6;
+            numberCellType1.DecimalPlaces = 0;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType1.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType1;
            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumidx";
            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(8).Label = "*";
            this.fpSpread1_Sheet1.Columns.Get(8).Width = 14F;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9;
            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumscale";
            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 = 43F;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType27;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10;
            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "dept";
            this.fpSpread1_Sheet1.Columns.Get(10).Label = "장비\r\n제조사";
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType27;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10;
            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "manuproc";
            this.fpSpread1_Sheet1.Columns.Get(11).Label = "제조\r\n공정";
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType27;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10;
            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "asset";
            this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n모델";
-            numberCellType7.DecimalPlaces = 0;
-            numberCellType7.NegativeRed = true;
-            numberCellType7.NullDisplay = "--";
-            numberCellType7.Separator = ",";
-            numberCellType7.ShowSeparator = true;
-            numberCellType7.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType7;
+            numberCellType2.DecimalPlaces = 0;
+            numberCellType2.NegativeRed = true;
+            numberCellType2.NullDisplay = "--";
+            numberCellType2.Separator = ",";
+            numberCellType2.ShowSeparator = true;
+            numberCellType2.ShrinkToFit = true;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType2;
            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumqty";
            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).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType28;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumunit";
            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(14).Label = "단위";
            this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F;
-            numberCellType8.DecimalPlaces = 0;
-            numberCellType8.NegativeRed = true;
-            numberCellType8.NullDisplay = "--";
-            numberCellType8.Separator = ",";
-            numberCellType8.ShowSeparator = true;
-            numberCellType8.ShrinkToFit = true;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType8;
+            numberCellType3.DecimalPlaces = 0;
+            numberCellType3.NegativeRed = true;
+            numberCellType3.NullDisplay = "--";
+            numberCellType3.Separator = ",";
+            numberCellType3.ShowSeparator = true;
+            numberCellType3.ShrinkToFit = true;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3;
            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumprice";
            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
            this.fpSpread1_Sheet1.Columns.Get(15).Label = "단가";
            this.fpSpread1_Sheet1.Columns.Get(15).Width = 35F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType3;
            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumamt";
            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
            this.fpSpread1_Sheet1.Columns.Get(16).Label = "합계금액";
            this.fpSpread1_Sheet1.Columns.Get(16).Width = 32F;
            this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType29;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12;
            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "supply";
            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
            this.fpSpread1_Sheet1.Columns.Get(17).Label = "공급업체";
            this.fpSpread1_Sheet1.Columns.Get(17).Width = 46F;
            this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType9.DecimalPlaces = 0;
-            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType9.MaximumValue = 2147483647D;
-            numberCellType9.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType9;
+            numberCellType4.DecimalPlaces = 0;
+            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType4.MaximumValue = 2147483647D;
+            numberCellType4.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4;
            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "supplyidx";
            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(18).Label = "*";
            this.fpSpread1_Sheet1.Columns.Get(18).Width = 14F;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType30;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType13;
            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "project";
            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 = 46F;
            this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType10.DecimalPlaces = 0;
-            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType10.MaximumValue = 2147483647D;
-            numberCellType10.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType10;
+            numberCellType5.DecimalPlaces = 0;
+            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType5.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5;
            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "projectidx";
            this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(20).Label = "*";
            this.fpSpread1_Sheet1.Columns.Get(20).Width = 14F;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType31;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14;
            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "edate";
            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).Width = 38F;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType32;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15;
            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "indate";
            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 = 42F;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType33;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "po";
            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
            this.fpSpread1_Sheet1.Columns.Get(23).Label = "PO#";
            this.fpSpread1_Sheet1.Columns.Get(23).Width = 41F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType34;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo";
            this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
            this.fpSpread1_Sheet1.Columns.Get(24).Label = "비고";
            this.fpSpread1_Sheet1.Columns.Get(24).Width = 33F;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = checkBoxCellType1;
            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "isdel";
            this.fpSpread1_Sheet1.Columns.Get(25).Label = "삭제됨";
            this.fpSpread1_Sheet1.Columns.Get(25).Tag = "isdel";
@@ -868,10 +875,15 @@
            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
            // 
-            // toolStripMenuItem4
+            // toolStripButton1
            // 
-            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(333, 6);
+            this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            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(28, 28);
+            this.toolStripButton1.Text = "toolStripButton1";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
            // 
            // fPurchase
            // 
@@ -967,5 +979,6 @@
        private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
    }
 }
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -90,8 +90,10 @@ namespace FEQ0000
            cmbState.Items.Add("-- 전체 --");
            foreach (var item in stList)
                cmbState.Items.Add(item.Value);
+            cmbState.Items.Add("<=Received");
            this.cmbState.SelectedIndex = 0;    //all기본 - 양진원

+
            //일반사용자의경우에는 상태를 변경하지 못한다.
            int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.purchase));
            if (curLevel >= 5)
@@ -146,7 +148,17 @@ namespace FEQ0000
                if(tbRequest.Text.Trim() != "")
                    cmd.CommandText += " and (isnull(request,'') like @req or isnull(receive,'') like @req)";

-                if (cmbState.SelectedIndex != 0) cmd.CommandText += " and isnull([state],'') like @st";
+                if (cmbState.SelectedIndex != 0)
+                {
+                    if(cmbState.Text.ToUpper() == "<=RECEIVED")
+                    {
+                        cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
+                    }
+                    else
+                    {
+                        cmd.CommandText += " and isnull([state],'') like @st";
+                    }
+                }
               // else cmd.CommandText += " and (state < '04' or state > '07')";
                cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";

@@ -718,5 +730,11 @@ namespace FEQ0000
           
        }

+        private void toolStripButton1_Click(object sender, EventArgs e)
+        {
+           
+
+        }
+
    }
 }
--- a/SubProject/FEQ0000/Purchase/fPurchase.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase.resx
@@ -217,6 +217,21 @@
        hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1
        9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon
        GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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==
 </value>
  </data>
  <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">