Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

구매 복사시 요청자 선택안되는 현상 수정

Browse Source
This commit is contained in:
chikyun.kim
2019-09-06 17:32:11 +09:00
parent 509046bbc0
commit 45611d308a
12 changed files with 170 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
SubProject/FPJ0000/Project/fProjectList.Designer.cs generated
View File

@@ -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;
}
}

16
SubProject/FPJ0000/Project/fProjectList.cs
View File

@@ -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' " +