This commit is contained in:
chikyun.kim
2019-01-15 11:40:59 +09:00
parent e2f859f3f9
commit a45bf77419
9 changed files with 385 additions and 169 deletions

View File

@@ -1,4 +1,5 @@
190110 chi NR구매 화면 모델 -> 규격명칭 변경
190115 chi 프로젝트 목록 색상 및 정렬 방식 변경 - 필터 적용
190110 chi NR구매 화면 모델 -> 규격명칭 변경
장비기술 공정이 공용코드 09번에 연결됨
기존 장비기술 공정코드 일괄 추가(공용코드 09번)
공정,제조사,모델 항목 알파벳 정렬

View File

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

View File

@@ -76,6 +76,7 @@
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btDev = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip = new System.Windows.Forms.ToolStrip();
@@ -87,7 +88,6 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -461,6 +461,13 @@
this.purchaseImportToolStripMenuItem.Text = "Purchase Import";
this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click);
//
// materialImportToolStripMenuItem
//
this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem";
this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24);
this.materialImportToolStripMenuItem.Text = "Material Import";
this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click);
//
// purchaseDataConvertToolStripMenuItem
//
this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem";
@@ -487,9 +494,10 @@
this.toolStripButton5});
this.toolStrip.Location = new System.Drawing.Point(0, 4);
this.toolStrip.Name = "toolStrip";
this.toolStrip.Size = new System.Drawing.Size(25, 146);
this.toolStrip.Size = new System.Drawing.Size(32, 165);
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
this.toolTip1.SetToolTip(this.toolStrip, "NR파트 구매");
//
// toolStripButton1
//
@@ -497,7 +505,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(23, 24);
this.toolStripButton1.Size = new System.Drawing.Size(30, 24);
this.toolStripButton1.Text = "메일전송";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
@@ -507,7 +515,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(23, 24);
this.toolStripButton2.Size = new System.Drawing.Size(30, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
@@ -518,8 +526,9 @@
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(23, 24);
this.toolStripButton3.Size = new System.Drawing.Size(30, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.ToolTipText = "프로젝트";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStripButton4
@@ -528,8 +537,8 @@
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(23, 24);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(30, 24);
this.toolStripButton4.Text = "개인 인벤토리";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripButton5
@@ -538,7 +547,7 @@
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(23, 24);
this.toolStripButton5.Size = new System.Drawing.Size(30, 24);
this.toolStripButton5.Text = "toolStripButton5";
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
@@ -554,7 +563,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1009, 569);
this.tabControl1.Size = new System.Drawing.Size(1002, 569);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -567,7 +576,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(10);
this.tabPage1.Size = new System.Drawing.Size(1001, 536);
this.tabPage1.Size = new System.Drawing.Size(994, 536);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "요약";
//
@@ -577,7 +586,7 @@
// toolStripContainer1.ContentPanel
//
this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1002, 569);
this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load);
this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
//
@@ -590,13 +599,6 @@
this.toolStripContainer1.TabIndex = 35;
this.toolStripContainer1.Text = "toolStripContainer1";
//
// materialImportToolStripMenuItem
//
this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem";
this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24);
this.materialImportToolStripMenuItem.Text = "Material Import";
this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

View File

@@ -155,14 +155,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/E9vz/tXX+/3bMrHw39dzrf/3
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/E9ry/tXX+/3bPKHw39dzrf/3
T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d
W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/9Ebe/7GzKt4C9UKAUnN
W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/1Ebe/7GzKt4C9UKAUnN
zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV
3//t93YTNKB+++QfcXNKW6BaEcAlqvfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j
51X+SJhZYQrVhgBJzR2nHLta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW
3//t93YTNKB+++QfcXNKW6BaEcA5svfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j
51X+SJhZYQrVhgBJzR2nHLpa/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW
q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q
ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgCJ5qFro7SHLQAAAABJRU5ErkJggg==
ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgB0E6FjQKK3FgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">