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
2018-12-22 20:54:23 +09:00
parent 560f7d78bf
commit 2344760210
19 changed files with 1291 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Project/History.txt
View File

@@ -1,4 +1,7 @@
181214 chi NR구매 메뉴 한글화
181222 chi NR구매 등록화면 데이터 불러오기시 금액에 천단위 기호 추가
Redis 오류 발생시 try catch 제거
NR구매등록시 적용장비/적용위치 항목 추가(공통코드 06,07)
181214 chi NR구매 메뉴 한글화
출력메뉴를 하단에서 상단으로 이동
웹캠기능 추가
unit 가 저장되지 않는현상제거(김효천c)

4
Project/Properties/AssemblyInfo.cs
View File

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

15
Project/StateMachine/_BW.cs
View File

@@ -11,6 +11,7 @@ namespace Project
{
public partial class fMain
{
DateTime redisTryTime = DateTime.Parse("1982-11-23");
Boolean bBW = true;
private void bw_DoWork(object sender, DoWorkEventArgs e)
{
@@ -18,8 +19,18 @@ namespace Project
{
if(redisConnection == null)
{
Console.WriteLine("redis conn : 10.131.36.205:6379");
redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379");
var ts = DateTime.Now - redisTryTime;
if(ts.TotalMinutes>5)
{
Console.WriteLine("redis conn : 10.131.36.205:6379");
try
{
redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379");
}catch (Exception ex)
{
}
}
}
else
{

79
Project/fMain.Designer.cs generated
View File

@@ -73,12 +73,6 @@
this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.nRPurchaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.windowsMenu = new System.Windows.Forms.ToolStripMenuItem();
this.cascadeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tileVerticalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
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();
@@ -92,6 +86,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.패치내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -190,10 +185,9 @@
this.commonToolStripMenuItem,
this.boardsToolStripMenuItem,
this.managementToolStripMenuItem,
this.windowsMenu,
this.패치내역ToolStripMenuItem,
this.btDev});
this.menuStrip1.Location = new System.Drawing.Point(1, 1);
this.menuStrip1.MdiWindowListItem = this.windowsMenu;
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1034, 27);
this.menuStrip1.TabIndex = 29;
@@ -439,53 +433,6 @@
this.nRPurchaseToolStripMenuItem.Text = "NR구매신청";
this.nRPurchaseToolStripMenuItem.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
// windowsMenu
//
this.windowsMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.cascadeToolStripMenuItem,
this.tileVerticalToolStripMenuItem,
this.tileHorizontalToolStripMenuItem,
this.closeAllToolStripMenuItem,
this.arrangeIconsToolStripMenuItem});
this.windowsMenu.Name = "windowsMenu";
this.windowsMenu.Size = new System.Drawing.Size(84, 23);
this.windowsMenu.Text = "윈도우(&W)";
//
// cascadeToolStripMenuItem
//
this.cascadeToolStripMenuItem.Name = "cascadeToolStripMenuItem";
this.cascadeToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.cascadeToolStripMenuItem.Text = "계단식 배열(&C)";
this.cascadeToolStripMenuItem.Click += new System.EventHandler(this.cascadeToolStripMenuItem_Click);
//
// tileVerticalToolStripMenuItem
//
this.tileVerticalToolStripMenuItem.Name = "tileVerticalToolStripMenuItem";
this.tileVerticalToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.tileVerticalToolStripMenuItem.Text = "세로 바둑판식 배열(&V)";
this.tileVerticalToolStripMenuItem.Click += new System.EventHandler(this.tileVerticalToolStripMenuItem_Click);
//
// tileHorizontalToolStripMenuItem
//
this.tileHorizontalToolStripMenuItem.Name = "tileHorizontalToolStripMenuItem";
this.tileHorizontalToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.tileHorizontalToolStripMenuItem.Text = "가로 바둑판식 배열(&H)";
this.tileHorizontalToolStripMenuItem.Click += new System.EventHandler(this.tileHorizontalToolStripMenuItem_Click);
//
// closeAllToolStripMenuItem
//
this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem";
this.closeAllToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.closeAllToolStripMenuItem.Text = "모두 닫기(&L)";
this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.closeAllToolStripMenuItem_Click);
//
// arrangeIconsToolStripMenuItem
//
this.arrangeIconsToolStripMenuItem.Name = "arrangeIconsToolStripMenuItem";
this.arrangeIconsToolStripMenuItem.Size = new System.Drawing.Size(218, 24);
this.arrangeIconsToolStripMenuItem.Text = "아이콘 정렬(&A)";
this.arrangeIconsToolStripMenuItem.Click += new System.EventHandler(this.arrangeIconsToolStripMenuItem_Click);
//
// btDev
//
this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -551,7 +498,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(30, 24);
this.toolStripButton2.Size = new System.Drawing.Size(23, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
@@ -562,7 +509,7 @@
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(30, 24);
this.toolStripButton3.Size = new System.Drawing.Size(23, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
@@ -572,7 +519,7 @@
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(30, 24);
this.toolStripButton4.Size = new System.Drawing.Size(23, 24);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -582,7 +529,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(30, 24);
this.toolStripButton5.Size = new System.Drawing.Size(23, 24);
this.toolStripButton5.Text = "toolStripButton5";
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
@@ -634,6 +581,13 @@
this.toolStripContainer1.TabIndex = 35;
this.toolStripContainer1.Text = "toolStripContainer1";
//
// 패치내역ToolStripMenuItem
//
this.패치내역ToolStripMenuItem.Name = "패치내역ToolStripMenuItem";
this.패치내역ToolStripMenuItem.Size = new System.Drawing.Size(77, 23);
this.패치내역ToolStripMenuItem.Text = "패치내역";
this.패치내역ToolStripMenuItem.Click += new System.EventHandler(this.패치내역ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -701,12 +655,6 @@
private System.Windows.Forms.ToolStripMenuItem dataMoldEOLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem personalInventoryToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem windowsMenu;
private System.Windows.Forms.ToolStripMenuItem cascadeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem tileVerticalToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem tileHorizontalToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem closeAllToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem arrangeIconsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem holidayToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mailFormToolStripMenuItem;
@@ -733,6 +681,7 @@
private System.Windows.Forms.ToolStripMenuItem 라인코드관리ToolStripMenuItem;
private System.Windows.Forms.ToolStripContainer toolStripContainer1;
private System.Windows.Forms.ToolStripButton toolStripButton5;
private System.Windows.Forms.ToolStripMenuItem 패치내역ToolStripMenuItem;
}
}

6
Project/fMain.cs
View File

@@ -490,5 +490,11 @@ namespace Project
Func_Login();
}
private void 패치내역ToolStripMenuItem_Click(object sender, EventArgs e)
{
FCM0000.fPatchList f = new FCM0000.fPatchList();
f.Show();
}
}
}

20
Project/fMain.resx
View File

@@ -153,16 +153,16 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/kzvz/tXX+/3bNrnw39dzrf/3
T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d
W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/7Ebe/7GzKt4C9UKAUnN
zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV
3//t93YTNKB+++QfcXNKW6BaEcAtpvfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j
51X+SJhZYQrVhgBJzR2nnLta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW
q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q
ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgC1jKF7RfhP4wAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIaSURBVDhPlY9daFJhGMdPdN1tV112G3QTRF0EQ2cX0d1u
0jx55jm6Flut6fnQ47tQmZme48dppjvqxmiQLWEDkZQaFRUtiBaDICqC7mIfRMTc/HjK+XpEksV+8Ofl
fZ7n9/I+BKU6PlJJNzBseNXGS2cJzBTSH016DKUpQXdau7t0JYXrP7430IbK8h8saWGV5sOXKE76TBBw
6C6vO6dwho0ldGE3wRq24ny/PuHp+/EYmWrqhO676jhzBOvd0C5Us94bWx9Hw7Xkg3EolRHEAiMNhC42
CrEbjd/v/LCs0DvT4vmXuYGBw1jrQN4K/vI9SkHqzX2QllPgLUSAXfCDbZYHUmVhZM4FEzkRxPT13bGo
9ZV5mjVhtQXju70mZhNQ+vbknxS/lCG3tgjpt/MQeZYG02KobspwG1htQXm9c2RYrral0NNkz7MZdWUe
BmeE91htQfn9tA2hWnvIrDp7ns00f0Fm2IdYbWENBI4xggTFr+X/PoCK8YpZdfiw2kFvDNdnX+f3hvZb
4ebC5M/LqpPGWgcLurMZzGe1wV5Z+lQEY4avXElyp7DWgfIGVvqCvjolj263Y8xyFWOW12JRru4Mzrhl
rHTDcJKd5qUCvh4c2hk+wbCTW1ZBPolLB8cuRl/YXagx5I4Bw8tdsbujQJLR6jWP0nuFJkYBVdT8c7CN
ytu4pLFfT2Po7+skGakOi/EQLml09wjiD5+5oXO84tdnAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">