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

휴가신청화면 공정선택 클릭시 오류 수정

Browse Source
This commit is contained in:
chi
2022-08-24 08:46:59 +09:00
parent 08b11b3b69
commit 63dca8ecde
6 changed files with 1289 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

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

44
Project/fMain.Designer.cs generated
View File

@@ -125,6 +125,7 @@
this.메일자동발신테스트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator();
this.아이템비활성화하기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sPR설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.버젼확인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.설명서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -134,7 +135,6 @@
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.sPR설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -257,14 +257,14 @@
//
this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image")));
this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.codesToolStripMenuItem.Text = "공용코드";
this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
//
// itemsToolStripMenuItem
//
this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.itemsToolStripMenuItem.Text = "품목정보";
this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
//
@@ -275,7 +275,7 @@
this.myAccouserToolStripMenuItem,
this.권한설정ToolStripMenuItem});
this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.userInfoToolStripMenuItem.Text = "사용자";
//
// userAccountToolStripMenuItem
@@ -302,14 +302,14 @@
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// mn_kuntae
//
this.mn_kuntae.Name = "mn_kuntae";
this.mn_kuntae.Size = new System.Drawing.Size(180, 24);
this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
this.mn_kuntae.Text = "월별 근무표";
this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click);
//
@@ -317,7 +317,7 @@
//
this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image")));
this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem";
this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.메일양식ToolStripMenuItem.Text = "메일 양식";
this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click);
//
@@ -919,6 +919,13 @@
this.아이템비활성화하기ToolStripMenuItem.Text = "아이템 비활성화하기";
this.아이템비활성화하기ToolStripMenuItem.Click += new System.EventHandler(this.아이템비활성화하기ToolStripMenuItem_Click);
//
// sPR설정ToolStripMenuItem
//
this.sPR설정ToolStripMenuItem.Name = "sPR설정ToolStripMenuItem";
this.sPR설정ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.sPR설정ToolStripMenuItem.Text = "SPR 설정";
this.sPR설정ToolStripMenuItem.Click += new System.EventHandler(this.sPR설정ToolStripMenuItem_Click);
//
// 버젼확인ToolStripMenuItem
//
this.버젼확인ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("버젼확인ToolStripMenuItem.Image")));
@@ -945,7 +952,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1065, 594);
this.tabControl1.Size = new System.Drawing.Size(1062, 594);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -961,9 +968,9 @@
this.toolStripMenuItem6,
this.toolStripButton1,
this.toolStripButton2});
this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
this.toolStrip1.Location = new System.Drawing.Point(1063, 28);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(29, 594);
this.toolStrip1.Size = new System.Drawing.Size(32, 594);
this.toolStrip1.TabIndex = 35;
this.toolStrip1.Text = "toolStrip1";
//
@@ -972,7 +979,7 @@
this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem8.Text = "업무일지";
this.toolStripMenuItem8.ToolTipText = "업무일지";
this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@@ -982,7 +989,7 @@
this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem7.Text = "구매신청";
this.toolStripMenuItem7.ToolTipText = "구매신청";
this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
@@ -992,7 +999,7 @@
this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem6.Text = "프로젝트";
this.toolStripMenuItem6.ToolTipText = "프로젝트";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
@@ -1003,7 +1010,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(26, 20);
this.toolStripButton1.Size = new System.Drawing.Size(29, 20);
this.toolStripButton1.Text = "구매진행상황";
this.toolStripButton1.ToolTipText = "구매진행상황";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2);
@@ -1014,17 +1021,10 @@
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(26, 20);
this.toolStripButton2.Size = new System.Drawing.Size(29, 20);
this.toolStripButton2.Text = "품목정보";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
//
// sPR설정ToolStripMenuItem
//
this.sPR설정ToolStripMenuItem.Name = "sPR설정ToolStripMenuItem";
this.sPR설정ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.sPR설정ToolStripMenuItem.Text = "SPR 설정";
this.sPR설정ToolStripMenuItem.Click += new System.EventHandler(this.sPR설정ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

4
SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
View File

@@ -453,8 +453,8 @@ namespace FPJ0000
private void toolStripButton4_Click(object sender, EventArgs e)
{
var oldlist = (List<string>)tbProcess.Tag;
var f = new JobReport_.fSelectProcess(oldlist.ToArray());
var oldlist = (string[])tbProcess.Tag;
var f = new JobReport_.fSelectProcess(oldlist);
if (f.ShowDialog() == DialogResult.OK)
{
tbProcess.Tag = f.values;

2457
SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

7
SubProject/FPJ0000/Project/fPartBuyStatus.cs
View File

@@ -1093,5 +1093,10 @@ namespace FPJ0000
{
RefreshData();
}
}
private void button3_Click_2(object sender, EventArgs e)
{
this.Close();
}
}
}

37
SubProject/FPJ0000/Project/fPartBuyStatus.resx
View File

@@ -129,9 +129,6 @@
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>445, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="button1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -188,6 +185,9 @@
NoVte4KANyf7O3wwBsMSWLMGquu+ASE8PB8NwG11AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>445, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>135, 17</value>
</metadata>
@@ -331,20 +331,20 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY
zVTMdDqnaGqiC4NsMQ3NS2iiQoUoRS8qtItObeqcc27DLTKXqem8C16Wuss5c2f67TlnSw2EfvDhefGc
74fz+57DYyf0gSrpcrlOEVWh+x0m1VHkpDkq2VNPR5Vr6YgnGtM5ibraP/rtAS60d8If96uXrfSqyWRy
W+xOWGy7rFpZaPxctKLw0yziKkYdgiy5jzfqmchSzTIb1k67oJ9hoJ9loJtmoJnahOqXEx0jdjgZoHWU
QuGHGaQ8M1H/SMKkHdSGYxPGOTe+zjHkZDDISTbRN+HElxEHEWzBuOiGfsGFYvks+Pd73nDh2Mpg801p
9La47jpSam+gtrMJRc2V4EsDEEwQFJ9FqOwUqlqruFVsNIOlNQdCE/sYThBTzn/fM9yGtvGXqNXlc5LE
mgjkv05AdlMcRPVXkFyfjNahJbSZbPj8fQPrpKcwWT/NCQTVAh9/aY5bN9aLV8MylKmyOElSXSQJX0X6
8zSoJ+zcKt3jFBSkhzW7C2FFAx4BO+GlfXRugxCGCQ3q9fdQ0pWH2MqLSKqJhmHaAQMpli1YPenpxEIE
obI9gvMPpa7TBUeQUC2AcVKL4t4MyOS5iHsagibVR3ybZ2AgxWqnXBggLFtd4D/yCk5IfMVBksPIbozH
rbpwxFdd4iS58gRImtPIm4SAvTfOujHIfmKClRQZmKPxCIIkB+eDJIfIQ74IyvfFtbIQZL4QQj2iQLGi
ABnvhBDVxcBABHryb+iIgHZtEYFqd4ULOf304jqNoXk3R9/YAu42pCOVBMX1cchrvLNzx+LYdBNBy66A
tc1ZdgX/w86ukLZHcCZX6ZCWVG/v9/B+KJXKrWOJrTZvnBSZ3mWe2XBY2QvzCgXzMoUJLys2FwfbvI32
hCmKWve73f7DG+fxTqZ3ZgaKOrqOixWWQHELvUOqh4C/iFpoP1H72tHk9u4AoTyFx+Px/gDUAJ3OKTT2
RgAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s
Zipm3uYUTW3owiBbzFXmJTRxgwpRil5UaBed2rzNObfhjMxlavN+AS9L3eUctzP99pyzpQZCP/jwvHjO
98P5fc/hsRN2T518sUyvii7X/w6X6Cly0hwV7Gmgo8t0dOQTremMWFPlH/N2HxfaPREPezVLVnrFZDK5
LfYNWGw7rFhZaPxcsKLo0wziy0cc/ByljzfqmagS7RIb1k25YJhmYJhhoJ9ioJ10Qv1rA63DdmwwQNMI
haIP00h7ZqL+kYRLWql1hxMDs258nWXIyaCfkzjRY97Al2EHEWxiYMENw7wLMuUMQu52vuHCcRXBE9cl
MVtC+VWk1VxDTVs9ihsqECIJQDCBLzuNMOkJVDZVcqvYaAaLqw6EJfUwnCC2LOR951AzmsdeokZfwEmS
qiNR8DoRufXxECguIVWRiqbBRTSbbPj8fR1rpKdwaS/NCfhVfB9/SZ5bP9qNV0NSlKpzOEmyPIqELyPz
eQY0Zju3SscYBRXpYdXuQnhxn0fATkRJDy2qTYHRrIXCcAeP2/MRV3EeydUxME45YCTFsgVrxj2dWIgg
TLpLcPa+xHWy8BASq/gYGNdB1p0FqVKE+KehqFd/xLc5BkZSrG7ShT7CktWFkAdewTGxrzBIfBC5dQm4
IY9AQuUFTiJSJkLckEHeJBTs/cCMG/3sJyZYSZGBeVqPIEi8fy5IfIA85IugAl9cKQ1F9osUaIZVkKkK
kfUuBQJ5LIxEYCD/hp4IaNcmEah3VjiX10svrNEYnHNz9IzO43ZtJtJJUKiIR37dre07FofTTQSNOwLW
NmvZEfwPO7tCxi7BKVGXQ/Kocmuvh/eiq6tr80hSk80bJ0Vmtk9Mrzus7MXEMoWJJQpmL8s2FwfbvI32
hCmKWvO72fLDG+fxjme2ZQcKWtuPClWWQGEjvU26h4C/CBppP0HL6uHUlo6AFGUaj8fj/QHSj53MZJ8s
EQAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -383,6 +383,9 @@
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>542, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>445, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>63</value>
</metadata>