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

NR파트 데이터 입력 창 및 업로드 완료

Browse Source 
추가 화면은 나중에 작업 예정
This commit is contained in:
chikyun.kim
2018-09-28 16:23:18 +09:00
parent 2e3cc8e270
commit fe8c05f63b
34 changed files with 1738 additions and 7382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Project/EETGW.csproj
View File

@@ -394,6 +394,10 @@
<Project>{58cfc90c-5068-46a2-a8de-0e92ee9e0990}</Project>
<Name>AmkorRestfulService</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\_Library\arControl\arControl\arControl.csproj">
<Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
<Name>arControl</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\FBS0000\FBS0000.csproj">
<Project>{f6f515c6-6628-47c4-8a94-683bdf9fbb9c}</Project>
<Name>FBS0000</Name>
@@ -414,10 +418,6 @@
<Project>{74836a5f-cb5b-449f-9210-99c9d1a23b97}</Project>
<Name>FPJ0000</Name>
</ProjectReference>
<ProjectReference Include="..\Sub\arControl\arControl.csproj">
<Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
<Name>arControl</Name>
</ProjectReference>
<ProjectReference Include="..\Sub\StaffLayoutCtl\StaffLayoutCtl.csproj">
<Project>{b832738c-74dd-4ce2-8a29-98d0bcbb9ea4}</Project>
<Name>StaffLayoutCtl</Name>

4
Project/Properties/AssemblyInfo.cs
View File

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

70
Project/fMain.Designer.cs generated
View File

@@ -68,6 +68,7 @@
this.dataMoldEOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.nRPurchaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.staffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.windowsMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -76,7 +77,11 @@
this.tileHorizontalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.closeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.arrangeIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btDev = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip = new System.Windows.Forms.ToolStrip();
this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.cmVision.SuspendLayout();
this.statusStrip1.SuspendLayout();
@@ -192,7 +197,8 @@
this.boardsToolStripMenuItem,
this.managementToolStripMenuItem,
this.infoToolStripMenuItem,
this.windowsMenu});
this.windowsMenu,
this.btDev});
this.menuStrip1.Location = new System.Drawing.Point(1, 1);
this.menuStrip1.MdiWindowListItem = this.windowsMenu;
this.menuStrip1.Name = "menuStrip1";
@@ -223,7 +229,8 @@
this.lineCodeToolStripMenuItem,
this.staffGridToolStripMenuItem,
this.userInfoToolStripMenuItem,
this.mailFormToolStripMenuItem});
this.mailFormToolStripMenuItem,
this.customerToolStripMenuItem});
this.commonToolStripMenuItem.Name = "commonToolStripMenuItem";
this.commonToolStripMenuItem.Size = new System.Drawing.Size(70, 20);
this.commonToolStripMenuItem.Text = "Common";
@@ -286,21 +293,21 @@
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.minutesToolStripMenuItem.Text = "Minutes";
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
//
// holidayToolStripMenuItem
//
this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.holidayToolStripMenuItem.Text = "holiday";
this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click);
//
// requestITemToolStripMenuItem
//
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.requestITemToolStripMenuItem.Text = "Request Item";
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
//
@@ -308,28 +315,29 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.freeBoardToolStripMenuItem.Text = "Free Board";
//
// bugReportToolStripMenuItem
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.bugReportToolStripMenuItem.Text = "Bug Report";
//
// todoListToolStripMenuItem
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.todoListToolStripMenuItem.Text = "Todo List";
//
// managementToolStripMenuItem
//
this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.equipmentToolStripMenuItem,
this.personalInventoryToolStripMenuItem});
this.personalInventoryToolStripMenuItem,
this.nRPurchaseToolStripMenuItem});
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(90, 20);
this.managementToolStripMenuItem.Text = "Management";
@@ -373,6 +381,13 @@
this.personalInventoryToolStripMenuItem.Text = "Personal Inventory";
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// nRPurchaseToolStripMenuItem
//
this.nRPurchaseToolStripMenuItem.Name = "nRPurchaseToolStripMenuItem";
this.nRPurchaseToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
this.nRPurchaseToolStripMenuItem.Text = "NR Purchase";
this.nRPurchaseToolStripMenuItem.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
// infoToolStripMenuItem
//
this.infoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -434,6 +449,31 @@
this.arrangeIconsToolStripMenuItem.Text = "아이콘 정렬(&A)";
this.arrangeIconsToolStripMenuItem.Click += new System.EventHandler(this.arrangeIconsToolStripMenuItem_Click);
//
// btDev
//
this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.purchaseImportToolStripMenuItem,
this.purchaseDataConvertToolStripMenuItem});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Name = "btDev";
this.btDev.Size = new System.Drawing.Size(73, 20);
this.btDev.Text = "Developer";
this.btDev.Visible = false;
//
// purchaseImportToolStripMenuItem
//
this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem";
this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.purchaseImportToolStripMenuItem.Text = "Purchase Import";
this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click);
//
// purchaseDataConvertToolStripMenuItem
//
this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem";
this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert";
this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click);
//
// toolStrip
//
this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -444,6 +484,13 @@
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
//
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
this.customerToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.customerToolStripMenuItem.Text = "Customer";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -534,6 +581,11 @@
private System.Windows.Forms.ToolStripMenuItem mailFormToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem requestITemToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripMenuItem nRPurchaseToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem btDev;
private System.Windows.Forms.ToolStripMenuItem purchaseImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem customerToolStripMenuItem;
}
}

33
Project/fMain.cs
View File

@@ -72,10 +72,12 @@ namespace Project
bw.RunWorkerAsync(); //background worker
Dialog.fLogin flog = new Dialog.fLogin();
if (flog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Dialog.fLogin flogIn = new Dialog.fLogin();
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
if (FCOMMON.info.Login.level >= 10) btDev.Visible = true;
sbLogin.Text = string.Format("{0} {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
Pub.log.Add("Program Start");
}
@@ -344,5 +346,32 @@ namespace Project
f.Show();
}
private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FEQ0000.fPurchase();
f.MdiParent = this;
f.Show();
}
private void purchaseImportToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FEQ0000.fPurchase_Import();
f.MdiParent = this;
f.Show();
}
private void purchaseDataConvertToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FEQ0000.fPurchase_Data();
f.MdiParent = this;
f.Show();
}
private void customerToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FCM0000.fCustoms();
f.MdiParent = this;
f.Show();
}
}
}