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

서버 접속을 IT 로 변경

Browse Source 
로그 관련은 현재 수정중
This commit is contained in:
chikyun.kim
2019-08-28 09:38:03 +09:00
parent 6a90be2e6d
commit d762d3e623
39 changed files with 1639 additions and 4137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Project/History.txt
View File

@@ -1,4 +1,5 @@
* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인
* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인\
190827 chi 데이터베이스이동 (10.131.3.205->10.131.15.18)
190819 chi 업무일지 출력물 그룹 분리
190806 chi 품목정보에서 카테고리 없는 자료도 보이게 함
품목정보 정렬 기능 추가

4
Project/Properties/AssemblyInfo.cs
View File

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

4
Project/Properties/Settings.Designer.cs generated
View File

@@ -26,8 +26,8 @@ namespace Project.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;Us" +
"er ID=gw;Password=Amkor123!")]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
"user;Password=EEmicro123!")]
public string gwcs {
get {
return ((string)(this["gwcs"]));

4
Project/Properties/Settings.settings
View File

@@ -5,10 +5,10 @@
<Setting Name="gwcs" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!</Value>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!</Value>
</Setting>
<Setting Name="nilliila" Type="System.String" Scope="User">
<Value Profile="(Default)">using System;

4
Project/StateMachine/_BW.cs
View File

@@ -22,10 +22,10 @@ namespace Project
var ts = DateTime.Now - redisTryTime;
if(ts.TotalMinutes>5)
{
Console.WriteLine("redis conn : 10.131.36.205:6379");
Console.WriteLine("redis conn : 10.131.36.57:6379");
try
{
redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.205:6379");
redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.57:6379");
}catch (Exception ex)
{

3
Project/app.config
View File

@@ -6,7 +6,8 @@
</sectionGroup>
</configSections>
<connectionStrings>
<add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.36.205;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
<add name="Project.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=EEmicro123!"
providerName="System.Data.SqlClient" />
</connectionStrings>
<userSettings>
<Project.Properties.Settings>

57
Project/fMain.Designer.cs generated
View File

@@ -53,6 +53,7 @@
this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_kuntae = 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();
@@ -91,8 +92,8 @@
this.그룹정보ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -268,12 +269,21 @@
//
// 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(65, 23);
this.mn_logdata.Text = "기록";
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[] {
@@ -502,77 +512,77 @@
// purchaseImportToolStripMenuItem
//
this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem";
this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.purchaseImportToolStripMenuItem.Text = "Purchase Import";
this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click);
//
// purchaseOrderImportToolStripMenuItem
//
this.purchaseOrderImportToolStripMenuItem.Name = "purchaseOrderImportToolStripMenuItem";
this.purchaseOrderImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.purchaseOrderImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.purchaseOrderImportToolStripMenuItem.Text = "Purchase(Order) Import";
this.purchaseOrderImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseOrderImportToolStripMenuItem_Click);
//
// materialImportToolStripMenuItem
//
this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem";
this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.materialImportToolStripMenuItem.Text = "Material Import";
this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click);
//
// purchaseDataConvertToolStripMenuItem
//
this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem";
this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert";
this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click);
//
// customerImportToolStripMenuItem
//
this.customerImportToolStripMenuItem.Name = "customerImportToolStripMenuItem";
this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.customerImportToolStripMenuItem.Text = "Customer Import";
this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click);
//
// projectImportToolStripMenuItem
//
this.projectImportToolStripMenuItem.Name = "projectImportToolStripMenuItem";
this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.projectImportToolStripMenuItem.Text = "Project Import";
this.projectImportToolStripMenuItem.Click += new System.EventHandler(this.projectImportToolStripMenuItem_Click);
//
// projectImportCompleteToolStripMenuItem
//
this.projectImportCompleteToolStripMenuItem.Name = "projectImportCompleteToolStripMenuItem";
this.projectImportCompleteToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.projectImportCompleteToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.projectImportCompleteToolStripMenuItem.Text = "Project Import(Complete)";
this.projectImportCompleteToolStripMenuItem.Click += new System.EventHandler(this.projectImportCompleteToolStripMenuItem_Click);
//
// workReportImportToolStripMenuItem
//
this.workReportImportToolStripMenuItem.Name = "workReportImportToolStripMenuItem";
this.workReportImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.workReportImportToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.workReportImportToolStripMenuItem.Text = "WorkReport Import";
this.workReportImportToolStripMenuItem.Click += new System.EventHandler(this.workReportImportToolStripMenuItem_Click);
//
// addSIdDataToolStripMenuItem
//
this.addSIdDataToolStripMenuItem.Name = "addSIdDataToolStripMenuItem";
this.addSIdDataToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.addSIdDataToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.addSIdDataToolStripMenuItem.Text = "Make Sid Data";
this.addSIdDataToolStripMenuItem.Click += new System.EventHandler(this.addSIdDataToolStripMenuItem_Click);
//
// 계정목록ToolStripMenuItem
//
this.계정목록ToolStripMenuItem.Name = "계정목록ToolStripMenuItem";
this.계정목록ToolStripMenuItem.Size = new System.Drawing.Size(235, 24);
this.계정목록ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.계정목록ToolStripMenuItem.Text = "계정목록(AD)";
this.계정목록ToolStripMenuItem.Click += new System.EventHandler(this.계정목록ToolStripMenuItem_Click);
//
// 그룹정보ToolStripMenuItem1
//
this.그룹정보ToolStripMenuItem1.Name = "그룹정보ToolStripMenuItem1";
this.그룹정보ToolStripMenuItem1.Size = new System.Drawing.Size(235, 24);
this.그룹정보ToolStripMenuItem1.Size = new System.Drawing.Size(278, 24);
this.그룹정보ToolStripMenuItem1.Text = "그룹정보";
this.그룹정보ToolStripMenuItem1.Click += new System.EventHandler(this.그룹정보ToolStripMenuItem1_Click);
//
@@ -580,7 +590,7 @@
//
this.toolStripMenuItem1.ForeColor = System.Drawing.Color.HotPink;
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(235, 24);
this.toolStripMenuItem1.Size = new System.Drawing.Size(278, 24);
this.toolStripMenuItem1.Text = "Staff Grid";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
@@ -588,10 +598,17 @@
//
this.toolStripMenuItem3.ForeColor = System.Drawing.Color.HotPink;
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(235, 24);
this.toolStripMenuItem3.Size = new System.Drawing.Size(278, 24);
this.toolStripMenuItem3.Text = "메일 양식";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// 임의테이블조작ToolStripMenuItem
//
this.임의테이블조작ToolStripMenuItem.Name = "임의테이블조작ToolStripMenuItem";
this.임의테이블조작ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.임의테이블조작ToolStripMenuItem.Text = "구매내역 suuply 다시 설정 하기";
this.임의테이블조작ToolStripMenuItem.Click += new System.EventHandler(this.임의테이블조작ToolStripMenuItem_Click);
//
// tabControl1
//
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -607,13 +624,6 @@
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
// 임의테이블조작ToolStripMenuItem
//
this.임의테이블조작ToolStripMenuItem.Name = "임의테이블조작ToolStripMenuItem";
this.임의테이블조작ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.임의테이블조작ToolStripMenuItem.Text = "구매내역 suuply 다시 설정 하기";
this.임의테이블조작ToolStripMenuItem.Click += new System.EventHandler(this.임의테이블조작ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -706,6 +716,7 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem mn_logdata;
private System.Windows.Forms.ToolStripMenuItem 임의테이블조작ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem sMTRepairLogToolStripMenuItem;
}
}

7
Project/fMain.cs
View File

@@ -770,7 +770,7 @@ namespace Project
private void mn_logdata_Click(object sender, EventArgs e)
{
Menu_logData();
}
private void 임의테이블조작ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -860,5 +860,10 @@ namespace Project
FCOMMON.Util.MsgI("complete");
}
private void sMTRepairLogToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_logData();
}
}
}

56
Project/fMain.resx
View File

@@ -173,34 +173,6 @@
AAAIpABZCBxIcGCLgyw2PHiQoqHDhiwOtmAxQIXFixcDREQ4YIXHjx8JbJwoQQUCjBlHspAAsqVGiRRN
WuxQoICJBiNCbKT4EUQBAR8ECCCR4EREFgRk/qQwYUIEBw4wQBBI4GMDARFKZFCgYEGCAwIHEAgQoAIK
Dxq6GjCQAEBBgSJQyEVhwYBbiXhZQDhwAACKBRdG4p04EAAHBoIHwwSAWLFjgwEBADs=
</value>
</data>
<data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
OoWKdGiDBgEBADs=
</value>
</data>
<data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
</value>
</data>
<data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
/yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
Ow==
</value>
</data>
<data name="mn_purchase.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -263,6 +235,34 @@
AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v
LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL
hQnTql2rNiAAOw==
</value>
</data>
<data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA
AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4
QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl
OoWKdGiDBgEBADs=
</value>
</data>
<data name="mn_docu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh
e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI
oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
</value>
</data>
<data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP//////
/yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY
JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
Ow==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">