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

1. CR구매현황 화면에서 SID가 없는 데이터는 표시되지 않습니다.

Browse Source 
 현재조건 : 상태값(진행,완료,완료(보고)) AND SID AND 구매요청수량>0 AND CR값
2. 구매수량 -> 구매요청 으로 글자가 변경되었습니다. (CR구매현황,파트리스트)
3. 파트리스트 글자를 부품목록 으로 변경(프로젝트목록,파트리스트)
4. 부품목록 화면 SID 컬럼 정렬기능 추가
This commit is contained in:
chi
2021-10-12 11:16:32 +09:00
parent 218a1de954
commit 96d9219cde
14 changed files with 281 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("21.10.06.1750")]
[assembly: AssemblyFileVersion("21.10.06.1750")]
[assembly: AssemblyVersion("21.10.12.1100")]
[assembly: AssemblyFileVersion("21.10.12.1100")]

64
Project/fMain.Designer.cs generated
View File

@@ -242,14 +242,14 @@
//
this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image")));
this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.codesToolStripMenuItem.Text = "공용코드";
this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
//
// itemsToolStripMenuItem
//
this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.itemsToolStripMenuItem.Text = "품목정보";
this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
//
@@ -260,7 +260,7 @@
this.myAccouserToolStripMenuItem,
this.권한설정ToolStripMenuItem});
this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.userInfoToolStripMenuItem.Text = "사용자";
//
// userAccountToolStripMenuItem
@@ -287,14 +287,14 @@
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// mn_kuntae
//
this.mn_kuntae.Name = "mn_kuntae";
this.mn_kuntae.Size = new System.Drawing.Size(180, 24);
this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
this.mn_kuntae.Text = "월별 근무표";
this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click);
//
@@ -302,7 +302,7 @@
//
this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image")));
this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem";
this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.메일양식ToolStripMenuItem.Text = "메일 양식";
this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click);
//
@@ -382,21 +382,21 @@
// 목록ToolStripMenuItem1
//
this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.목록ToolStripMenuItem1.Text = "목록";
this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click);
//
// 자동입력ToolStripMenuItem
//
this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem";
this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.자동입력ToolStripMenuItem.Text = "자동입력";
this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click);
//
// 양식ToolStripMenuItem
//
this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem";
this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.양식ToolStripMenuItem.Text = "양식";
this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click);
//
@@ -445,14 +445,14 @@
// 관리ToolStripMenuItem
//
this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem";
this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.관리ToolStripMenuItem.Text = "재고 관리";
this.관리ToolStripMenuItem.Click += new System.EventHandler(this.관리ToolStripMenuItem_Click);
//
// 재고현황ToolStripMenuItem
//
this.재고현황ToolStripMenuItem.Name = "재고현황ToolStripMenuItem";
this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.재고현황ToolStripMenuItem.Text = "재고 현황";
this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click);
//
@@ -460,7 +460,7 @@
//
this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem";
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.pMP현황ToolStripMenuItem.Text = "PMP 현황";
this.pMP현황ToolStripMenuItem.Visible = false;
this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click);
@@ -563,39 +563,39 @@
// 메모장ToolStripMenuItem
//
this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.메모장ToolStripMenuItem.Text = "메모장";
this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6);
this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6);
//
// 패치내역ToolStripMenuItem1
//
this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24);
this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.패치내역ToolStripMenuItem1.Text = "패치 내역";
this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click);
//
// 메일내역ToolStripMenuItem
//
this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem";
this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.메일내역ToolStripMenuItem.Text = "메일 내역";
this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6);
this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
//
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Visible = false;
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -604,7 +604,7 @@
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Visible = false;
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -613,7 +613,7 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
this.freeBoardToolStripMenuItem.Visible = false;
//
@@ -621,7 +621,7 @@
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
this.bugReportToolStripMenuItem.Visible = false;
//
@@ -629,7 +629,7 @@
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
this.todoListToolStripMenuItem.Visible = false;
this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -638,7 +638,7 @@
//
this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.메일전송ToolStripMenuItem.Text = "메일전송";
this.메일전송ToolStripMenuItem.Visible = false;
this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click);
@@ -647,7 +647,7 @@
//
this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red;
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24);
this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24);
this.toolStripMenuItem5.Text = "(test)휴가등록";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
@@ -833,7 +833,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1065, 594);
this.tabControl1.Size = new System.Drawing.Size(1062, 594);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -849,9 +849,9 @@
this.toolStripMenuItem6,
this.toolStripButton1,
this.toolStripButton2});
this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
this.toolStrip1.Location = new System.Drawing.Point(1063, 28);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(29, 594);
this.toolStrip1.Size = new System.Drawing.Size(32, 594);
this.toolStrip1.TabIndex = 35;
this.toolStrip1.Text = "toolStrip1";
//
@@ -860,7 +860,7 @@
this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem8.Text = "업무일지";
this.toolStripMenuItem8.ToolTipText = "업무일지";
this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@@ -870,7 +870,7 @@
this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem7.Text = "구매신청";
this.toolStripMenuItem7.ToolTipText = "구매신청";
this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
@@ -880,7 +880,7 @@
this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem6.Text = "프로젝트";
this.toolStripMenuItem6.ToolTipText = "프로젝트";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
@@ -891,7 +891,7 @@
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(26, 20);
this.toolStripButton1.Size = new System.Drawing.Size(29, 20);
this.toolStripButton1.Text = "구매진행상황";
this.toolStripButton1.ToolTipText = "구매진행상황";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2);
@@ -902,7 +902,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(26, 20);
this.toolStripButton2.Size = new System.Drawing.Size(29, 20);
this.toolStripButton2.Text = "품목정보";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
//

28
Project/fMain.resx
View File

@@ -431,20 +431,20 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">