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

smt 로그 기능 별도 프로젝트로 분리

Browse Source
This commit is contained in:
chikyun.kim
2019-10-02 11:21:14 +09:00
parent 80d00fd4b6
commit c9cda6251c
32 changed files with 33 additions and 7156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/EETGW.csproj
View File

@@ -459,10 +459,6 @@
<Project>{c2e0627d-0623-4b68-a558-37cbce6bdca6}</Project>
<Name>FEQ0000</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\FLG0000\FLG0000.csproj">
<Project>{0677fb12-d582-4a7a-b266-ef2477a89688}</Project>
<Name>FLG0000</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\FPJ0000\FPJ0000.csproj">
<Project>{74836a5f-cb5b-449f-9210-99c9d1a23b97}</Project>
<Name>FPJ0000</Name>

1
Project/Setting.cs
View File

@@ -14,7 +14,6 @@ namespace Project
업무일지,
재고관리,
재고현황,
운영기록
}
public class Setting : arUtil.Setting
{

29
Project/StateMachine/_BW.cs
View File

@@ -15,18 +15,19 @@ namespace Project
Boolean bBW = true;
private void bw_DoWork(object sender, DoWorkEventArgs e)
{
while(bBW)
while (bBW)
{
if(redisConnection == null)
if (redisConnection == null)
{
var ts = DateTime.Now - redisTryTime;
if(ts.TotalMinutes>5)
if (ts.TotalMinutes > 5)
{
Console.WriteLine("redis conn : 10.131.36.57:6379");
try
{
redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.57:6379");
}catch (Exception ex)
}
catch (Exception ex)
{
}
@@ -36,12 +37,20 @@ namespace Project
{
if (redisConnection.IsConnected)
{
if(this.db == null)
if (this.db == null)
{
Console.WriteLine("redis connected setting db");
this.db = redisConnection.GetDatabase();
var getStr = this.db.StringGet("test");
Console.WriteLine(getStr);
try
{
Console.WriteLine("redis connected setting db");
this.db = redisConnection.GetDatabase();
var getStr = this.db.StringGet("test");
Console.WriteLine(getStr);
}
catch (Exception ex)
{
Pub.log.AddE("REDIS " + ex.Message);
}
}
}
else
@@ -51,7 +60,7 @@ namespace Project
redisConnection = null;
}
}
System.Threading.Thread.Sleep(5000);
}

42
Project/fMain.Designer.cs generated
View File

@@ -53,8 +53,6 @@
this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_kuntae = new System.Windows.Forms.ToolStripMenuItem();
this.메일양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_logdata = new System.Windows.Forms.ToolStripMenuItem();
this.sMTRepairLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem();
this.mn_project = new System.Windows.Forms.ToolStripMenuItem();
@@ -170,7 +168,6 @@
this.btSetting,
this.로그인ToolStripMenuItem,
this.commonToolStripMenuItem,
this.mn_logdata,
this.managementToolStripMenuItem,
this.mn_docu,
this.즐겨찾기ToolStripMenuItem,
@@ -280,23 +277,6 @@
this.메일양식ToolStripMenuItem.Text = "메일 양식";
this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click);
//
// mn_logdata
//
this.mn_logdata.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.sMTRepairLogToolStripMenuItem});
this.mn_logdata.Image = ((System.Drawing.Image)(resources.GetObject("mn_logdata.Image")));
this.mn_logdata.Name = "mn_logdata";
this.mn_logdata.Size = new System.Drawing.Size(98, 23);
this.mn_logdata.Text = "운영 기록";
this.mn_logdata.Click += new System.EventHandler(this.mn_logdata_Click);
//
// sMTRepairLogToolStripMenuItem
//
this.sMTRepairLogToolStripMenuItem.Name = "sMTRepairLogToolStripMenuItem";
this.sMTRepairLogToolStripMenuItem.Size = new System.Drawing.Size(178, 24);
this.sMTRepairLogToolStripMenuItem.Text = "SMT Repair Log";
this.sMTRepairLogToolStripMenuItem.Click += new System.EventHandler(this.sMTRepairLogToolStripMenuItem_Click);
//
// managementToolStripMenuItem
//
this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -445,27 +425,27 @@
// 패치내역ToolStripMenuItem1
//
this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(152, 24);
this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 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(152, 24);
this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(149, 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(149, 6);
this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6);
//
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Visible = false;
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -474,7 +454,7 @@
//
this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.holidayToolStripMenuItem.Text = "휴가내역";
this.holidayToolStripMenuItem.Visible = false;
this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click);
@@ -483,7 +463,7 @@
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Visible = false;
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -492,7 +472,7 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
this.freeBoardToolStripMenuItem.Visible = false;
//
@@ -500,7 +480,7 @@
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
this.bugReportToolStripMenuItem.Visible = false;
//
@@ -508,7 +488,7 @@
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
this.todoListToolStripMenuItem.Visible = false;
this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -517,7 +497,7 @@
//
this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
this.메일전송ToolStripMenuItem.Text = "메일전송";
this.메일전송ToolStripMenuItem.Visible = false;
this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click);
@@ -747,9 +727,7 @@
private System.Windows.Forms.ToolStripMenuItem 관리ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 재고현황ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem mn_logdata;
private System.Windows.Forms.ToolStripMenuItem 임의테이블조작ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem sMTRepairLogToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 메일양식ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 메일내역ToolStripMenuItem;

18
Project/fMain.cs
View File

@@ -123,7 +123,7 @@ namespace Project
this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
this.mn_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu);
this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
//this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
if (FCOMMON.info.Login.level >= 10) btDev.Visible = true;
@@ -169,10 +169,7 @@ namespace Project
{
Menu_InventoryList();
}
else if (Pub.setting.startForm == eFormList.운영기록 && menu_logdata == true)
{
Menu_logData();
}
}
@@ -760,14 +757,7 @@ namespace Project
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fMailform());
}
void Menu_logData()
{
//운영기록
string formkey = "LOGDATA";
if (!ShowForm(formkey))
AddForm(formkey, new FLG0000.LogData.List());
}
private void mn_logdata_Click(object sender, EventArgs e)
{
@@ -863,7 +853,7 @@ namespace Project
private void sMTRepairLogToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_logData();
}
private void 메일양식ToolStripMenuItem_Click(object sender, EventArgs e)

11
Project/fMain.resx
View File

@@ -182,17 +182,6 @@
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
</value>
</data>
<data name="mn_logdata.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIUtAFNle4Gt2fX6/pu814yz2Xyet5vN/FpwiWag2eXw+6vU+6TR+1hpf3iatL7e/T6C
uWF8m8Df/Ze3y8Xi/uv1/m+PqrXa/Uhace72/rTZ/LHX/FSRueDp87XN4MDf/vn8/p/A23ygvHaZtnSU
r/D3/rfa/HmbtV13lejy/T13uer0/77a9f///////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAtACwAAAAAEAAQ
AAAIpABZCBxIcGCLgyw2PHiQoqHDhiwOtmAxQIXFixcDREQ4YIXHjx8JbJwoQQUCjBlHspAAsqVGiRRN
WuxQoICJBiNCbKT4EUQBAR8ECCCR4EREFgRk/qQwYUIEBw4wQBBI4GMDARFKZFCgYEGCAwIHEAgQoAIK
Dxq6GjCQAEBBgSJQyEVhwYBbiXhZQDhwAACKBRdG4p04EAAHBoIHwwSAWLFjgwEBADs=
</value>
</data>
<data name="mn_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">