구매내역 색상 및 필터 정렬 기능 추가, 삭제시 데이터 숨김처리하게

2018-12-13 09:29:48 +09:00
parent 1c72ca913a
commit 9cf98cd0d4
21 changed files with 728 additions and 662 deletions
--- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
@@ -52,6 +52,7 @@
            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();
            this.dsPurchase = new FEQ0000.dsPurchase();
            this.bs = new System.Windows.Forms.BindingSource(this.components);
            this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -108,6 +109,8 @@
            this.금일입고품목ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.내가등록한자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.이번달자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.btViewDel = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
            this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
            ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
@@ -170,14 +173,14 @@
            this.toolStripLabel2,
            this.tbFind,
            this.btFind});
-            this.bn.Location = new System.Drawing.Point(0, 573);
+            this.bn.Location = new System.Drawing.Point(0, 634);
            this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
            this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
            this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
            this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
            this.bn.Name = "bn";
            this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(971, 31);
+            this.bn.Size = new System.Drawing.Size(1074, 31);
            this.bn.TabIndex = 0;
            this.bn.Text = "bindingNavigator1";
            // 
@@ -462,10 +465,12 @@
            this.tbRequest,
            this.btSearch,
            this.toolStripSeparator5,
-            this.toolStripDropDownButton1});
+            this.toolStripDropDownButton1,
+            this.btViewDel,
+            this.toolStripButton2});
            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
            this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(971, 31);
+            this.toolStrip1.Size = new System.Drawing.Size(1074, 31);
            this.toolStrip1.TabIndex = 3;
            this.toolStrip1.Text = "toolStrip1";
            // 
@@ -586,6 +591,26 @@
            this.이번달자료ToolStripMenuItem.Text = "이번달 자료";
            this.이번달자료ToolStripMenuItem.Click += new System.EventHandler(this.이번달자료ToolStripMenuItem_Click);
            // 
+            // btViewDel
+            // 
+            this.btViewDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.btViewDel.CheckOnClick = true;
+            this.btViewDel.Image = ((System.Drawing.Image)(resources.GetObject("btViewDel.Image")));
+            this.btViewDel.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btViewDel.Name = "btViewDel";
+            this.btViewDel.Size = new System.Drawing.Size(107, 28);
+            this.btViewDel.Text = "삭제자료표시";
+            this.btViewDel.Click += new System.EventHandler(this.btViewDel_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(56, 28);
+            this.toolStripButton2.Text = "Test";
+            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            // 
            // fpSpread1
            // 
            this.fpSpread1.AccessibleDescription = "";
@@ -597,7 +622,8 @@
            this.fpSpread1.Name = "fpSpread1";
            this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
            this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(971, 542);
+            this.fpSpread1.Size = new System.Drawing.Size(1074, 603);
+            this.fpSpread1.StatusBarVisible = true;
            this.fpSpread1.TabIndex = 4;
            // 
            // fpSpread1_Sheet1
@@ -606,66 +632,86 @@
            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 = 23;
+            this.fpSpread1_Sheet1.ColumnCount = 24;
            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "state";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "sc#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "sid#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Item";
+            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 = "SC#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "수령";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "SID#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "품명";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Model";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Qty";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Unit";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Price";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Amt";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Supply";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "모델";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "수량";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "단위";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "단가";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "합계금액";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "공급업체";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "관련프로젝트";
            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "*";
+            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 = "PO#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "삭제됨";
            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).DataField = "pdate";
            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "Date";
+            this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 34F;
+            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).DataField = "state";
            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
+            this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 34F;
+            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).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 = 49F;
+            this.fpSpread1_Sheet1.Columns.Get(2).Width = 67F;
            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType21;
            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).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).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).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).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).Label = "SID#";
            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 31F;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 55F;
            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType25;
            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 = "Item";
+            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;
@@ -680,7 +726,7 @@
            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType26;
            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 = "Model";
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "모델";
            this.fpSpread1_Sheet1.Columns.Get(9).Width = 43F;
            numberCellType7.DecimalPlaces = 0;
            numberCellType7.NegativeRed = true;
@@ -691,13 +737,13 @@
            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType7;
            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumqty";
            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "Qty";
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 28F;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "수량";
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 44F;
            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType27;
            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumunit";
            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "Unit";
-            this.fpSpread1_Sheet1.Columns.Get(11).Width = 31F;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "단위";
+            this.fpSpread1_Sheet1.Columns.Get(11).Width = 46F;
            numberCellType8.DecimalPlaces = 0;
            numberCellType8.NegativeRed = true;
            numberCellType8.NullDisplay = "--";
@@ -707,17 +753,18 @@
            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType8;
            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "pumprice";
            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "Price";
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "단가";
            this.fpSpread1_Sheet1.Columns.Get(12).Width = 35F;
            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType8;
            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumamt";
            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "Amt";
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "합계금액";
            this.fpSpread1_Sheet1.Columns.Get(13).Width = 32F;
+            this.fpSpread1_Sheet1.Columns.Get(14).AllowAutoFilter = true;
            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType28;
            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "supply";
            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "Supply";
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "공급업체";
            this.fpSpread1_Sheet1.Columns.Get(14).Width = 46F;
            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
            numberCellType9.DecimalPlaces = 0;
@@ -732,6 +779,7 @@
            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType29;
            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "project";
            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "관련프로젝트";
            this.fpSpread1_Sheet1.Columns.Get(16).Width = 46F;
            this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
            numberCellType10.DecimalPlaces = 0;
@@ -746,23 +794,32 @@
            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType30;
            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset";
            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(18).Label = "자산번호";
            this.fpSpread1_Sheet1.Columns.Get(18).Width = 35F;
            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType31;
            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "edate";
            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(19).Label = "입고예정";
            this.fpSpread1_Sheet1.Columns.Get(19).Width = 38F;
            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType32;
            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "indate";
            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 = 42F;
            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType33;
            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "po";
            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(21).Label = "PO#";
            this.fpSpread1_Sheet1.Columns.Get(21).Width = 23F;
            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType34;
            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "dept";
            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 = 33F;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "isdel";
+            this.fpSpread1_Sheet1.Columns.Get(23).Label = "삭제됨";
+            this.fpSpread1_Sheet1.Columns.Get(23).Tag = "isdel";
            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
            this.fpSpread1_Sheet1.DataSource = this.bs;
@@ -773,7 +830,7 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(971, 604);
+            this.ClientSize = new System.Drawing.Size(1074, 665);
            this.Controls.Add(this.fpSpread1);
            this.Controls.Add(this.toolStrip1);
            this.Controls.Add(this.bn);
@@ -854,7 +911,9 @@
        private System.Windows.Forms.ToolStripMenuItem 금일입고품목ToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem 내가등록한자료ToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem 이번달자료ToolStripMenuItem;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
        private System.Windows.Forms.ToolStripMenuItem deleteDataToolStripMenuItem;
+        private System.Windows.Forms.ToolStripButton btViewDel;
+        private System.Windows.Forms.ToolStripButton toolStripButton2;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
    }
 }
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -100,6 +100,7 @@ namespace FEQ0000
            }
            else
            {
+                btViewDel.Visible = false;
                fpSpread1.EditMode = false;
                fpSpread1.Sheets[0].SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row;
                fpSpread1.EditModePermanent = false;
@@ -108,6 +109,11 @@ namespace FEQ0000
                foreach (FarPoint.Win.Spread.Column col in fpSpread1.ActiveSheet.Columns)
                    col.Locked = true;
            }
+
+            if(curLevel < 9)
+            {
+                toolStripButton2.Visible = false;
+            }
            
            refreshData();
            FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
@@ -130,12 +136,17 @@ namespace FEQ0000
                System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
                cmd.CommandText = " select *" +
                                   " from purchase " +
-                                   " where isnull(" + dateField + ",'') between @sd and @ed " +
-                                   " and (isnull(request,'') like @req or isnull(receive,'') like @req)";
+                                   " where  isnull(" + dateField + ",'') between @sd and @ed ";
+
+                if (btViewDel.Checked == false)
+                    cmd.CommandText += " and isnull(isdel,0) = 0";
+                    
+                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";
-                else cmd.CommandText += " and (state < '04' or state > '07')";
-                cmd.CommandText += " ORDER BY pdate DESC, idx DESC";
+               // else cmd.CommandText += " and (state < '04' or state > '07')";
+                cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";

                cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text));
                cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@ed", dtED.Text));
@@ -154,6 +165,57 @@ namespace FEQ0000
            {
                System.Windows.Forms.MessageBox.Show(ex.Message);
            }
+
+            FormattingData();
+        }
+        void FormattingData()
+        {
+            //삭제컬럼인덱스
+            this.fpSpread1.SuspendLayout();
+            var delindex = this.fpSpread1.ActiveSheet.Columns["isdel"].Index;
+            var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index;
+            for(int i = 0; i< this.fpSpread1.ActiveSheet.Rows.Count;i++)
+            {
+                var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex);
+                string stateStr = string.Empty;
+                if (state != null) stateStr = state.ToString();
+
+                var value = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
+                if (value != null && (Boolean)value)
+                {
+                    this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Red;
+                    this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.White;
+                }
+                else
+                {
+                    this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White;
+                    switch (stateStr.ToLower())
+                    {
+                        case "cancled":
+                            this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Red;
+                            break;
+                        case "rejected":
+                            this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Tomato;
+                            break;
+                        case "spr":
+                            this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Magenta;
+                            break;
+                        case "---":
+                        case "----":
+                            this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue;
+                            break;
+                        case "received":
+                            this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray;
+                            break;
+                        default:
+                            this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black;
+                            break;
+                    }
+                    
+                }
+                    
+            }
+            this.fpSpread1.ResumeLayout();
        }

        private void saveData()
@@ -258,7 +320,15 @@ namespace FEQ0000
        private void toolStripLabel3_Click(object sender, EventArgs e)
        {
            //사용자목록처리
-            tbRequest.Text = string.Empty;
+            if(tbRequest.Text.Trim() == "")
+            {
+                tbRequest.Text = FCOMMON.info.Login.nameK;
+            }
+            else
+            {
+                tbRequest.Text = string.Empty;
+            }
+            
            refreshData();
        }

@@ -571,6 +641,7 @@ namespace FEQ0000
                    FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
                    | FarPoint.Excel.ExcelSaveFlags.NoFormulas
                    | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+                FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName);
            }
            
        }
@@ -607,5 +678,15 @@ namespace FEQ0000
            func_delete();
        }

+        private void toolStripButton2_Click_1(object sender, EventArgs e)
+        {
+            this.fpSpread1.ActiveSheet.Rows[0].BackColor = Color.Red;
+        }
+
+        private void btViewDel_Click(object sender, EventArgs e)
+        {
+            refreshData();
+        }
+
    }
 }
--- a/SubProject/FEQ0000/Purchase/fPurchase.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase.resx
@@ -299,6 +299,31 @@
        kBHypJw8OQKeD4C3u2Ww2XVDx9SAcJMmx1TKFMe7wNMOMNpSbkUO5MZbX9q5/LipXK0csMi3iphK+aH4
        o8xnlLJi3IJdbKvsSg4L/MrpG8SVSzGitkGSyfQYdtNMV6YkkU3sEna+obyrS3TQ/y/lIGqEYgSRGChT
        wdMZXkp4+r8UxSdk1wcO0mb/TQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btViewDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADuSURBVDhPY6AK+E8mgGqHGPB5/rz/X6ZP//+pq/P/5+pq
+        CM7N/f85Ofn/58jI/58DA/9HmknCMYYBIM1/X736//vBg/9/nj79//Py5f8/z50DGwzDJ4K8/28sc8Vu
+        AMhmkGawjbGxEFuhNoOxjw/cgARrGUwDQE4G2YqiOTQUxYDZriZ4DAD69+umTTg1EzYA5HSQX9E1YzEA
+        axiAnA4KSGwa0Q0IMZbAYgDQVlBAvgZ6BRfu1pfFbcBLU9P/95WV/9+Qlv5/ko8PjnewscExyOk4DSAG
+        4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton2.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="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">