..

SubProject/FEQ0000/Purchase/fPurchase.cs

@@ -20,9 +20,44 @@ namespace FEQ0000
             fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
             this.dsPurchase.Purchase.TableNewRow += Purchase_TableNewRow;
             this.FormClosed += __Closed;
+            dtSD.KeyDown += dtSD_KeyDown;
+            dtED.KeyDown += dtSD_KeyDown;
             //this.dv1.CellFormatting += dv1_CellFormatting;
         }
 
+        void dtSD_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+            var tb = sender as ToolStripTextBox;             
+            var input = tb.Text.Trim();
+            if (input == "") tb.Text = DateTime.Now.ToShortDateString();
+            else
+            {
+                string dt = string.Empty;
+                if (!util.MakeDateString(input, out dt))
+                {
+                    FCOMMON.Util.MsgE("입력값이 올바르지 않습니다.");
+                    tb.SelectAll();
+                    tb.Focus();
+                    return;
+                }
+                else
+                {
+                    tb.Text = dt;
+                }
+            }
+            if(tb == dtSD)
+            {
+                dtED.Focus();
+                dtED.SelectAll();
+            }
+            else
+            {
+                btSearch.PerformClick();
+                tb.SelectAll();
+            }
+        }
+
         void __Closed(object sender, FormClosedEventArgs e)
         {
 
@@ -44,7 +79,8 @@ namespace FEQ0000
 
         private void __Load(object sender, EventArgs e)
         {
-            this.tbRequest.Text = FCOMMON.info.Login.nameK;
+            this.cmDate.SelectedIndex = 0;
+            this.tbRequest.Text = string.Empty; //양진원 FCOMMON.info.Login.nameK;
             this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString();
             this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString();
 
@@ -55,7 +91,7 @@ namespace FEQ0000
             cmbState.Items.Add("-- incomplete --");
             foreach (var item in stList)
                 cmbState.Items.Add(item);
-            this.cmbState.SelectedIndex = 1;
+            this.cmbState.SelectedIndex = 0;    //all기본 - 양진원
 
             //일반사용자의경우에는 상태를 변경하지 못한다.
             int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth_Purchase());
@@ -85,12 +121,15 @@ namespace FEQ0000
                 if (cmbState.SelectedIndex > 1) state = cmbState.Text.Split(',')[0].Substring(1);
                 string request = "%";
                 if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%";
+                string dateField = "pdate";
+                if (cmDate.SelectedIndex == 1) dateField = "indate";
+                else if (cmDate.SelectedIndex == 2) dateField = "expdate";
 
                 System.Data.SqlClient.SqlDataAdapter da = new System.Data.SqlClient.SqlDataAdapter();
                 System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
                 cmd.CommandText = " select *, dbo.getCodeName('04', state) AS stateName" +
                                    " from purchase " +
-                                   " where pdate between @sd and @ed " +
+                                   " where isnull(" + dateField + ",'') between @sd and @ed " +
                                    " and (isnull(request,'') like @req or isnull(receive,'') like @req)";
 
                 if (cmbState.SelectedIndex != 1) cmd.CommandText += " and state like @st";
@@ -334,7 +373,9 @@ namespace FEQ0000
                 }
                 else
                 {
-                    string filter = "sid like ? or process like ? or sc like ? or pumname like ? or pumscale like ? or project like ?";
+                    search = search.Replace("'", "''");
+                   // search = search.Replace("*", "");
+                    string filter = "supply like ? or sid like ? or process like ? or sc like ? or pumname like ? or pumscale like ? or project like ?";
                     filter = filter.Replace("?", "'%" + search + "%'");
                     this.bs.Filter = filter;
                     tbFind.BackColor = Color.Lime; 
@@ -481,5 +522,20 @@ namespace FEQ0000
             }
         }
 
+        private void exportDataToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            SaveFileDialog sd = new SaveFileDialog();
+            sd.Filter = "excel|*.xls";
+            sd.FileName = "nrplist.xls";
+            if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                fpSpread1.SaveExcel(sd.FileName,
+                    FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+                    | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+                    | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+            }
+            
+        }
+
     }
 }