diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 245fcd0..3c1310b 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("19.08.29.1500")]
-[assembly: AssemblyFileVersion("19.08.29.1500")]
+[assembly: AssemblyVersion("19.09.05.1450")]
+[assembly: AssemblyFileVersion("19.09.05.1450")]
diff --git a/SubProject/FCM0000/Item/fItems.cs b/SubProject/FCM0000/Item/fItems.cs
index 0bb59ab..ca26ea9 100644
--- a/SubProject/FCM0000/Item/fItems.cs
+++ b/SubProject/FCM0000/Item/fItems.cs
@@ -125,8 +125,8 @@ namespace FCM0000
}
else
{
- string filter = "isnull(namem,'') like '' or isnull(sid,'') like '' or isnull(model,'') like '' or isnull(supply,'') like ''";
- filter = filter.Replace("''", "'%" + search.Replace("'","''") + "%'");
+ string filter = "isnull(name,'') like '%{0}%' or isnull(sid,'') like '%{0}%' or isnull(model,'') like '%{0}%' or isnull(supply,'') like '%{0}%'";
+ filter = string.Format(filter, search);
try
{
bs.Filter = filter;
diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs
index e915e94..2100325 100644
--- a/SubProject/FCOMMON/DataBaseManager.cs
+++ b/SubProject/FCOMMON/DataBaseManager.cs
@@ -261,6 +261,35 @@ namespace FCOMMON
return cnt == 1;
}
+ ///
+ /// 프로젝트 주간내역을 추가합니다
+ ///
+ ///
+ ///
+ ///
+ public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message)
+ {
+
+ var cn = getCn();
+ cn.Open();
+
+ string sql =
+ "insert into ProjectsHistory(pidx,pdate,remark,wuid,wdate)" +
+ " values(@pidx,@pdate,@remark,@wuid,@wdate)";
+
+ var cmd = new SqlCommand(sql, cn);
+ cmd.Parameters.Add(new SqlParameter("pidx", ProjectIdx));
+ cmd.Parameters.Add(new SqlParameter("pdate", pdate));
+ cmd.Parameters.Add(new SqlParameter("remark", Message));
+ cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
+ cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now));
+ var cnt = cmd.ExecuteNonQuery();
+
+ cmd.Dispose();
+ cn.Close();
+ cn.Dispose();
+ return cnt == 1;
+ }
public static sItemInfo getItemInfo(int idx)
{
@@ -794,9 +823,9 @@ namespace FCOMMON
cmd2.Parameters.Clear();
cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
cmd2.Parameters.Add(new SqlParameter("cate", "--"));
- cmd2.Parameters.Add(new SqlParameter("name", pumname));
- cmd2.Parameters.Add(new SqlParameter("sid", sid));
- cmd2.Parameters.Add(new SqlParameter("model", model));
+ cmd2.Parameters.Add(new SqlParameter("name", pumname.Trim()));
+ cmd2.Parameters.Add(new SqlParameter("sid", sid.Trim()));
+ cmd2.Parameters.Add(new SqlParameter("model", model.Trim()));
cmd2.Parameters.Add(new SqlParameter("scale", 1.0));
cmd2.Parameters.Add(new SqlParameter("unit", "EA"));
cmd2.Parameters.Add(new SqlParameter("supply", supply));
@@ -807,18 +836,28 @@ namespace FCOMMON
cmd2.Parameters.Add(new SqlParameter("wdate", wdate));
retval += cmd2.ExecuteNonQuery();
- if (retval == 0)
- {
- cmd2.CommandText = "select idx from Items where gcode=@gcode and name = @name and sid = @sid and model = @model and wuid = @wuid and wdate = @wdate";
- retval = int.Parse(cmd2.ExecuteScalar().ToString());
- }
- else retval = -1;
+ //추가된 데이터를 찾아서 다시 검색한다.
+ //if (retval == 0)
+ //{
+ // cmd2.CommandText = "select idx from Items where gcode=@gcode and name = @name and sid = @sid and model = @model and wuid = @wuid and wdate = @wdate";
+ // retval = int.Parse(cmd2.ExecuteScalar().ToString());
+ //}
+ //else retval = -1;
}
- else
+
+ //{
+ cmd2.CommandText = string.Format("select min(idx) from Items where gcode='" + FCOMMON.info.Login.gcode +"' and ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ","").Replace("'", "''"));
+ var itemdata = cmd2.ExecuteScalar();
+ if(itemdata == DBNull.Value || itemdata == null)
{
- cmd2.CommandText = string.Format("select min(idx) from Items where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ","").Replace("'", "''"));
- retval = int.Parse(cmd2.ExecuteScalar().ToString());
+ retval = -1;
+ } else {
+ var strItem = itemdata.ToString();
+ if (strItem == "") retval = -1;
+ else retval = int.Parse(strItem);
}
+
+ //}
cmd2.Dispose();
cn.Close();
cn.Dispose();
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
index 8f45c93..f037d64 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
@@ -186,7 +186,7 @@
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
- this.bn.Size = new System.Drawing.Size(1074, 26);
+ this.bn.Size = new System.Drawing.Size(1028, 26);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -508,7 +508,7 @@
this.btViewDel});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1074, 37);
+ this.toolStrip1.Size = new System.Drawing.Size(1028, 37);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
@@ -666,7 +666,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(1074, 602);
+ this.fpSpread1.Size = new System.Drawing.Size(1028, 602);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
//
@@ -888,7 +888,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1074, 665);
+ this.ClientSize = new System.Drawing.Size(1028, 665);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs
index d194313..e7f48fa 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -114,7 +114,7 @@ namespace FEQ0000
col.Locked = true;
}
- if(curLevel < 9)
+ if(curLevel < 5)
{
집계표ToolStripMenuItem.Visible = false;
}
@@ -699,7 +699,7 @@ namespace FEQ0000
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.state = "---";
- newdr.request = FCOMMON.info.Login.nameK;
+ newdr.request = FCOMMON.info.Login.no;
newdr.receive = "";// FCOMMON.info.Login.nameK;
newdr.sc = string.Empty;
newdr.po = string.Empty;
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx
index c7465e1..9eb1a99 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase.resx
@@ -336,4 +336,7 @@
579, 23
+
+ 63
+
\ No newline at end of file
diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs
index bc3b183..4c582be 100644
--- a/SubProject/FEQ0000/dsPurchase.Designer.cs
+++ b/SubProject/FEQ0000/dsPurchase.Designer.cs
@@ -2270,8 +2270,8 @@ ORDER BY pdate DESC, idx DESC";
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
- this._commandCollection[2].CommandText = @"SELECT asset, bigo, dept, edate, idx, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive,
- request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName
+ this._commandCollection[2].CommandText = @"SELECT idx, asset, bigo, dept, edate, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive,
+ request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode
FROM Purchase
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY pdate DESC, idx DESC";
diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd
index fb6a50a..a64a776 100644
--- a/SubProject/FEQ0000/dsPurchase.xsd
+++ b/SubProject/FEQ0000/dsPurchase.xsd
@@ -181,15 +181,15 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
- SELECT asset, bigo, dept, edate, idx, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive,
- request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName
+ SELECT idx, asset, bigo, dept, edate, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive,
+ request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName, gcode
FROM Purchase
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)
ORDER BY pdate DESC, idx DESC
-
-
-
+
+
+
@@ -204,7 +204,7 @@ ORDER BY pdate DESC, idx DESC
-
+
diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs
index 8e4ccb3..8367f7e 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs
@@ -59,6 +59,7 @@
this.cmbRequest = new System.Windows.Forms.ComboBox();
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
+ this.chkAutoAdd = new System.Windows.Forms.CheckBox();
hrsLabel = new System.Windows.Forms.Label();
typeLabel = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label();
@@ -184,7 +185,7 @@
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1,
this.lbIndex});
- this.statusStrip1.Location = new System.Drawing.Point(0, 351);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 443);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(538, 22);
this.statusStrip1.TabIndex = 28;
@@ -214,7 +215,7 @@
//
// btSave
//
- this.btSave.Location = new System.Drawing.Point(141, 300);
+ this.btSave.Location = new System.Drawing.Point(141, 376);
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(381, 43);
this.btSave.TabIndex = 20;
@@ -230,7 +231,7 @@
this.tbDescription.Multiline = true;
this.tbDescription.Name = "tbDescription";
this.tbDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.tbDescription.Size = new System.Drawing.Size(381, 101);
+ this.tbDescription.Size = new System.Drawing.Size(381, 181);
this.tbDescription.TabIndex = 19;
//
// dtPdate
@@ -352,11 +353,22 @@
this.tam.ProjectsTableAdapter = null;
this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
+ // chkAutoAdd
+ //
+ this.chkAutoAdd.AutoSize = true;
+ this.chkAutoAdd.Location = new System.Drawing.Point(141, 424);
+ this.chkAutoAdd.Name = "chkAutoAdd";
+ this.chkAutoAdd.Size = new System.Drawing.Size(176, 16);
+ this.chkAutoAdd.TabIndex = 54;
+ this.chkAutoAdd.Text = "프로젝트 주간내역으로 등록";
+ this.chkAutoAdd.UseVisualStyleBackColor = true;
+ //
// fJobReport_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(538, 373);
+ this.ClientSize = new System.Drawing.Size(538, 465);
+ this.Controls.Add(this.chkAutoAdd);
this.Controls.Add(label5);
this.Controls.Add(this.lbSummary);
this.Controls.Add(this.cmbPackage);
@@ -420,5 +432,6 @@
private System.Windows.Forms.ComboBox cmbPackage;
private System.Windows.Forms.ComboBox cmbRequest;
private System.Windows.Forms.Label lbSummary;
+ private System.Windows.Forms.CheckBox chkAutoAdd;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
index 77b49d4..e590c38 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
@@ -100,6 +100,10 @@ namespace FPJ0000.JobReport
tbProjectIndex.Text = dr.pidx.ToString();
}
+ //신규일때만 사용가능 함
+ if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) chkAutoAdd.Enabled = true;
+ else chkAutoAdd.Enabled = false;
+
this.Show();
Application.DoEvents();
@@ -259,6 +263,22 @@ namespace FPJ0000.JobReport
}
}
+ if(chkAutoAdd.Checked && (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added))
+ {
+ if(tbProjectIndex.Text == "" || tbProjectIndex.Text == "-1")
+ {
+ FCOMMON.Util.MsgE("프로젝트 주간내역을 등록하려면 프로젝트가 지정되어야 합니다");
+ tbProject.Focus();
+ tbProject.SelectAll();
+ return;
+ }
+ else
+ {
+ //190906
+ FCOMMON.DBM.addProjectHistory(int.Parse(tbProjectIndex.Text), dtPdate.Value.ToShortDateString(), tbDescription.Text.Trim());
+ }
+ }
+
this.dr.uid = this.cmbUser.SelectedValue.ToString();
this.dr.pdate = dtPdate.Value.ToShortDateString();
this.dr.status = cmbState.Text;
diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
index b73bb93..ba96644 100644
--- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -139,6 +139,8 @@
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.panel3 = new System.Windows.Forms.Panel();
+ this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
+ this.cmbCate = new System.Windows.Forms.ToolStripComboBox();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
@@ -506,22 +508,24 @@
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.EditModeReplace = true;
this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F);
- this.fpSpread1.Location = new System.Drawing.Point(0, 37);
+ this.fpSpread1.Location = new System.Drawing.Point(0, 27);
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(1384, 250);
+ this.fpSpread1.Size = new System.Drawing.Size(1384, 260);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 2;
//
// toolStrip1
//
- this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
+ this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel2,
this.cmbYearS,
this.toolStripLabel4,
this.cmbYearE,
+ this.toolStripLabel6,
+ this.cmbCate,
this.toolStripSeparator2,
this.chk검토,
this.chk대기,
@@ -540,38 +544,38 @@
this.cmbSort});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1384, 37);
+ this.toolStrip1.Size = new System.Drawing.Size(1384, 27);
this.toolStrip1.TabIndex = 4;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
- this.toolStripLabel2.Size = new System.Drawing.Size(95, 34);
+ this.toolStripLabel2.Size = new System.Drawing.Size(95, 24);
this.toolStripLabel2.Text = "프로젝트 시작일";
//
// cmbYearS
//
this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbYearS.Name = "cmbYearS";
- this.cmbYearS.Size = new System.Drawing.Size(75, 37);
+ this.cmbYearS.Size = new System.Drawing.Size(75, 27);
//
// toolStripLabel4
//
this.toolStripLabel4.Name = "toolStripLabel4";
- this.toolStripLabel4.Size = new System.Drawing.Size(15, 34);
+ this.toolStripLabel4.Size = new System.Drawing.Size(15, 24);
this.toolStripLabel4.Text = "~";
//
// cmbYearE
//
this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbYearE.Name = "cmbYearE";
- this.cmbYearE.Size = new System.Drawing.Size(75, 37);
+ this.cmbYearE.Size = new System.Drawing.Size(75, 27);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27);
//
// chk검토
//
@@ -581,7 +585,7 @@
this.chk검토.Image = ((System.Drawing.Image)(resources.GetObject("chk검토.Image")));
this.chk검토.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chk검토.Name = "chk검토";
- this.chk검토.Size = new System.Drawing.Size(65, 34);
+ this.chk검토.Size = new System.Drawing.Size(55, 24);
this.chk검토.Text = "검토";
//
// chk대기
@@ -592,7 +596,7 @@
this.chk대기.Image = ((System.Drawing.Image)(resources.GetObject("chk대기.Image")));
this.chk대기.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chk대기.Name = "chk대기";
- this.chk대기.Size = new System.Drawing.Size(65, 34);
+ this.chk대기.Size = new System.Drawing.Size(55, 24);
this.chk대기.Text = "대기";
//
// chk진행
@@ -603,7 +607,7 @@
this.chk진행.Image = ((System.Drawing.Image)(resources.GetObject("chk진행.Image")));
this.chk진행.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chk진행.Name = "chk진행";
- this.chk진행.Size = new System.Drawing.Size(65, 34);
+ this.chk진행.Size = new System.Drawing.Size(55, 24);
this.chk진행.Text = "진행";
//
// chk보류
@@ -614,7 +618,7 @@
this.chk보류.Image = ((System.Drawing.Image)(resources.GetObject("chk보류.Image")));
this.chk보류.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chk보류.Name = "chk보류";
- this.chk보류.Size = new System.Drawing.Size(65, 34);
+ this.chk보류.Size = new System.Drawing.Size(55, 24);
this.chk보류.Text = "보류";
//
// chk취소
@@ -623,7 +627,7 @@
this.chk취소.Image = ((System.Drawing.Image)(resources.GetObject("chk취소.Image")));
this.chk취소.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chk취소.Name = "chk취소";
- this.chk취소.Size = new System.Drawing.Size(65, 34);
+ this.chk취소.Size = new System.Drawing.Size(55, 24);
this.chk취소.Text = "취소";
//
// chk완료
@@ -632,18 +636,18 @@
this.chk완료.Image = ((System.Drawing.Image)(resources.GetObject("chk완료.Image")));
this.chk완료.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chk완료.Name = "chk완료";
- this.chk완료.Size = new System.Drawing.Size(65, 34);
+ this.chk완료.Size = new System.Drawing.Size(55, 24);
this.chk완료.Text = "완료";
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
- this.toolStripLabel3.Size = new System.Drawing.Size(55, 34);
+ this.toolStripLabel3.Size = new System.Drawing.Size(55, 24);
this.toolStripLabel3.Text = "담당자명";
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
@@ -651,7 +655,7 @@
//
this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbRequest.Name = "tbRequest";
- this.tbRequest.Size = new System.Drawing.Size(70, 37);
+ this.tbRequest.Size = new System.Drawing.Size(70, 27);
this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown);
//
@@ -660,7 +664,7 @@
this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btSearch.Name = "btSearch";
- this.btSearch.Size = new System.Drawing.Size(104, 34);
+ this.btSearch.Size = new System.Drawing.Size(94, 24);
this.btSearch.Text = "새로고침(&R)";
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
//
@@ -670,7 +674,7 @@
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(65, 34);
+ this.toolStripButton2.Size = new System.Drawing.Size(55, 24);
this.toolStripButton2.Text = "닫기";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
@@ -681,18 +685,18 @@
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(113, 34);
+ this.btViewDel.Size = new System.Drawing.Size(103, 24);
this.btViewDel.Text = "삭제자료표시";
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 37);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27);
//
// toolStripLabel5
//
this.toolStripLabel5.Name = "toolStripLabel5";
- this.toolStripLabel5.Size = new System.Drawing.Size(31, 34);
+ this.toolStripLabel5.Size = new System.Drawing.Size(31, 24);
this.toolStripLabel5.Text = "정렬";
//
// cmbSort
@@ -709,7 +713,7 @@
"Requestor",
"Process"});
this.cmbSort.Name = "cmbSort";
- this.cmbSort.Size = new System.Drawing.Size(100, 37);
+ this.cmbSort.Size = new System.Drawing.Size(100, 27);
this.cmbSort.SelectedIndexChanged += new System.EventHandler(this.toolStripComboBox1_SelectedIndexChanged);
//
// label1
@@ -1058,6 +1062,28 @@
this.panel3.Size = new System.Drawing.Size(1384, 218);
this.panel3.TabIndex = 7;
//
+ // toolStripLabel6
+ //
+ this.toolStripLabel6.Name = "toolStripLabel6";
+ this.toolStripLabel6.Size = new System.Drawing.Size(31, 24);
+ this.toolStripLabel6.Text = "분류";
+ //
+ // cmbCate
+ //
+ this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbCate.Items.AddRange(new object[] {
+ "---",
+ "Origin Cost",
+ "Input Cost",
+ "Effect Cost",
+ "Asset No",
+ "Project",
+ "Champion",
+ "Requestor",
+ "Process"});
+ this.cmbCate.Name = "cmbCate";
+ this.cmbCate.Size = new System.Drawing.Size(100, 27);
+ //
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -1126,6 +1152,7 @@
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 = 78F;
+ this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "category";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -1349,6 +1376,8 @@
private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel6;
+ private System.Windows.Forms.ToolStripComboBox cmbCate;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs
index 77e9912..26d8a35 100644
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -32,14 +32,13 @@ namespace FPJ0000
//프로젝트 목록을 처리함
//this.tbRequest.Text = FCOMMON.info.Login.nameK;
- //state list
- // var stList = FCOMMON.DBM.getCodeList("01");
- // this.cmbState.Items.Clear();
- // cmbState.Items.Add("-- All --");
- //// cmbState.Items.Add("-- incomplete --");
- // foreach (var item in stList)
- // cmbState.Items.Add(item.Value);
- // this.cmbState.SelectedIndex = 0;
+ //분류 - 190905
+ var dt_cate = FCOMMON.DBM.getCodeTable("20");
+ cmbCate.Items.Clear();
+ cmbCate.Items.Add("--전체--");
+ foreach (DataRow dr in dt_cate.Rows)
+ cmbCate.Items.Add(dr["Value"].ToString());
+ cmbCate.SelectedIndex = 0;
this.cmbSort.SelectedIndex = 0;
this.cmbYearS.Items.Clear();
@@ -141,6 +140,7 @@ namespace FPJ0000
"ISNULL(reqstaff, '') LIKE @username OR " +
"ISNULL(usersub, '') LIKE @username) ";
if (state != "") State_where += " AND " + state;
+ if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
string State_order = "ORDER BY (CASE " +
" WHEN ([status] = '진행') THEN '0' " +
" WHEN ([status] = '검토') THEN '1' " +