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

...

Browse Source
This commit is contained in:
chi
2021-12-21 09:52:32 +09:00
parent 4cf24cedaf
commit 7e6f9e4bcb
36 changed files with 5115 additions and 773 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("21.12.20.1230")]
[assembly: AssemblyFileVersion("21.12.20.1230")]
[assembly: AssemblyVersion("21.12.21.0850")]
[assembly: AssemblyFileVersion("21.12.21.0850")]

5
Project/_Common/fUserList.cs
View File

@@ -81,7 +81,10 @@ namespace Project._Common
fpSpread1.EditMode = false;
//화면좌표문제 복구 - 211221
if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal;
if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0)
this.Location = new Point(0, 0);
}

106
Project/fMain.Designer.cs generated
View File

@@ -76,10 +76,12 @@
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.휴가관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.휴일연장근무승인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.휴일연장근무집계표출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator();
this.근태입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.근로명부ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.mn_docu = new System.Windows.Forms.ToolStripMenuItem();
this.메모장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
@@ -113,6 +115,7 @@
this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.accessDBToolStripMenuItem = 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();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -121,8 +124,7 @@
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator();
this.휴일연장근무승인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -321,8 +323,7 @@
this.mn_jago,
this.mn_eq,
this.휴가관리ToolStripMenuItem,
this.personalInventoryToolStripMenuItem,
this.메일전송ToolStripMenuItem1});
this.personalInventoryToolStripMenuItem});
this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image")));
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
@@ -332,7 +333,7 @@
//
this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image")));
this.mn_purchase.Name = "mn_purchase";
this.mn_purchase.Size = new System.Drawing.Size(208, 24);
this.mn_purchase.Size = new System.Drawing.Size(203, 24);
this.mn_purchase.Text = "구매신청";
this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
@@ -344,7 +345,7 @@
this.layoutToolStripMenuItem});
this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image")));
this.mn_project.Name = "mn_project";
this.mn_project.Size = new System.Drawing.Size(208, 24);
this.mn_project.Size = new System.Drawing.Size(203, 24);
this.mn_project.Text = "프로젝트";
this.mn_project.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click);
//
@@ -377,7 +378,7 @@
this.양식ToolStripMenuItem});
this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image")));
this.mn_dailyhistory.Name = "mn_dailyhistory";
this.mn_dailyhistory.Size = new System.Drawing.Size(208, 24);
this.mn_dailyhistory.Size = new System.Drawing.Size(203, 24);
this.mn_dailyhistory.Text = "업무일지";
this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click);
//
@@ -405,14 +406,14 @@
// 업무현황전자실ToolStripMenuItem
//
this.업무현황전자실ToolStripMenuItem.Name = "업무현황전자실ToolStripMenuItem";
this.업무현황전자실ToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
this.업무현황전자실ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.업무현황전자실ToolStripMenuItem.Text = "업무현황(전자실)";
this.업무현황전자실ToolStripMenuItem.Click += new System.EventHandler(this.업무현황전자실ToolStripMenuItem_Click);
//
// 교육목록ToolStripMenuItem
//
this.교육목록ToolStripMenuItem.Name = "교육목록ToolStripMenuItem";
this.교육목록ToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
this.교육목록ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.교육목록ToolStripMenuItem.Text = "교육목록";
this.교육목록ToolStripMenuItem.Click += new System.EventHandler(this.교육목록ToolStripMenuItem_Click);
//
@@ -421,7 +422,7 @@
this.비용절감ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
this.비용절감ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("비용절감ToolStripMenuItem.Image")));
this.비용절감ToolStripMenuItem.Name = "비용절감ToolStripMenuItem";
this.비용절감ToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
this.비용절감ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.비용절감ToolStripMenuItem.Text = "비용절감";
this.비용절감ToolStripMenuItem.Click += new System.EventHandler(this.비용절감ToolStripMenuItem_Click);
//
@@ -429,7 +430,7 @@
//
this.라이선스ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("라이선스ToolStripMenuItem.Image")));
this.라이선스ToolStripMenuItem.Name = "라이선스ToolStripMenuItem";
this.라이선스ToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
this.라이선스ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.라이선스ToolStripMenuItem.Text = "라이선스";
this.라이선스ToolStripMenuItem.Click += new System.EventHandler(this.라이선스ToolStripMenuItem_Click);
//
@@ -441,7 +442,7 @@
this.pMP현황ToolStripMenuItem});
this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image")));
this.mn_jago.Name = "mn_jago";
this.mn_jago.Size = new System.Drawing.Size(208, 24);
this.mn_jago.Size = new System.Drawing.Size(203, 24);
this.mn_jago.Text = "품목재고";
//
// 관리ToolStripMenuItem
@@ -475,7 +476,7 @@
this.라인코드관리ToolStripMenuItem});
this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
this.mn_eq.Name = "mn_eq";
this.mn_eq.Size = new System.Drawing.Size(208, 24);
this.mn_eq.Size = new System.Drawing.Size(203, 24);
this.mn_eq.Text = "장비 목록";
//
// aLLToolStripMenuItem
@@ -501,27 +502,50 @@
//
this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.휴일연장근무승인ToolStripMenuItem,
this.휴일연장근무집계표출력ToolStripMenuItem,
this.toolStripMenuItem9,
this.근태입력ToolStripMenuItem,
this.출근부출력ToolStripMenuItem,
this.근로명부ToolStripMenuItem});
this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
this.휴가관리ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("휴가관리ToolStripMenuItem.Image")));
this.휴가관리ToolStripMenuItem.Name = "휴가관리ToolStripMenuItem";
this.휴가관리ToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
this.휴가관리ToolStripMenuItem.Text = "근태관리(테스트)";
this.휴가관리ToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.휴가관리ToolStripMenuItem.Text = "근태관리";
this.휴가관리ToolStripMenuItem.Click += new System.EventHandler(this.휴가관리ToolStripMenuItem_Click);
//
// 휴일연장근무승인ToolStripMenuItem
//
this.휴일연장근무승인ToolStripMenuItem.Name = "휴일연장근무승인ToolStripMenuItem";
this.휴일연장근무승인ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
this.휴일연장근무승인ToolStripMenuItem.Text = "휴일/연장근무 승인";
this.휴일연장근무승인ToolStripMenuItem.Click += new System.EventHandler(this.휴일연장근무승인ToolStripMenuItem_Click);
//
// 휴일연장근무집계표출력ToolStripMenuItem
//
this.휴일연장근무집계표출력ToolStripMenuItem.Name = "휴일연장근무집계표출력ToolStripMenuItem";
this.휴일연장근무집계표출력ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
this.휴일연장근무집계표출력ToolStripMenuItem.Text = "휴일/연장근무 집계표 출력";
this.휴일연장근무집계표출력ToolStripMenuItem.Click += new System.EventHandler(this.휴일연장근무집계표출력ToolStripMenuItem_Click);
//
// toolStripMenuItem9
//
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
this.toolStripMenuItem9.Size = new System.Drawing.Size(245, 6);
//
// 근태입력ToolStripMenuItem
//
this.근태입력ToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
this.근태입력ToolStripMenuItem.Name = "근태입력ToolStripMenuItem";
this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
this.근태입력ToolStripMenuItem.Text = "근태입력";
this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
this.근태입력ToolStripMenuItem.Text = "연차 관리";
this.근태입력ToolStripMenuItem.Click += new System.EventHandler(this.근태입력ToolStripMenuItem_Click);
//
// 근로명부ToolStripMenuItem
//
this.근로명부ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
this.근로명부ToolStripMenuItem.Name = "근로명부ToolStripMenuItem";
this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
this.근로명부ToolStripMenuItem.Text = "근로자명부";
this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click);
//
@@ -530,20 +554,11 @@
this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
this.personalInventoryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("personalInventoryToolStripMenuItem.Image")));
this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem";
this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(208, 24);
this.personalInventoryToolStripMenuItem.Text = "개인별 물품(테스트";
this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(203, 24);
this.personalInventoryToolStripMenuItem.Text = "개인별 물품(테스트)";
this.personalInventoryToolStripMenuItem.Visible = false;
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// 메일전송ToolStripMenuItem1
//
this.메일전송ToolStripMenuItem1.ForeColor = System.Drawing.Color.Tomato;
this.메일전송ToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem1.Image")));
this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1";
this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(208, 24);
this.메일전송ToolStripMenuItem1.Text = "메일자동발신(테스트";
this.메일전송ToolStripMenuItem1.Click += new System.EventHandler(this.메일전송ToolStripMenuItem1_Click);
//
// mn_docu
//
this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -696,7 +711,8 @@
this.임의테이블조작ToolStripMenuItem,
this.pMP데이터베이스업데이트ToolStripMenuItem,
this.mailBackupToolStripMenuItem,
this.accessDBToolStripMenuItem});
this.accessDBToolStripMenuItem,
this.메일자동발신테스트ToolStripMenuItem});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Image = ((System.Drawing.Image)(resources.GetObject("btDev.Image")));
this.btDev.Name = "btDev";
@@ -819,6 +835,13 @@
this.accessDBToolStripMenuItem.Text = "Access DB";
this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click);
//
// 메일자동발신테스트ToolStripMenuItem
//
this.메일자동발신테스트ToolStripMenuItem.Name = "메일자동발신테스트ToolStripMenuItem";
this.메일자동발신테스트ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.메일자동발신테스트ToolStripMenuItem.Text = "메일자동발신(테스트)";
this.메일자동발신테스트ToolStripMenuItem.Click += new System.EventHandler(this.메일자동발신테스트ToolStripMenuItem_Click);
//
// 설명서ToolStripMenuItem
//
this.설명서ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("설명서ToolStripMenuItem.Image")));
@@ -910,17 +933,12 @@
this.toolStripButton2.Text = "품목정보";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
//
// toolStripMenuItem9
// 출근부출력ToolStripMenuItem
//
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
this.toolStripMenuItem9.Size = new System.Drawing.Size(198, 6);
//
// 휴일연장근무승인ToolStripMenuItem
//
this.휴일연장근무승인ToolStripMenuItem.Name = "휴일연장근무승인ToolStripMenuItem";
this.휴일연장근무승인ToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
this.휴일연장근무승인ToolStripMenuItem.Text = "휴일/연장근무 승인";
this.휴일연장근무승인ToolStripMenuItem.Click += new System.EventHandler(this.휴일연장근무승인ToolStripMenuItem_Click);
this.출근부출력ToolStripMenuItem.Name = "출근부출력ToolStripMenuItem";
this.출근부출력ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
this.출근부출력ToolStripMenuItem.Text = "출근부 출력";
this.출근부출력ToolStripMenuItem.Click += new System.EventHandler(this.출근부출력ToolStripMenuItem_Click);
//
// fMain
//
@@ -1010,7 +1028,6 @@
private System.Windows.Forms.ToolStripMenuItem 재고현황ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 임의테이블조작ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 메일양식ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 메일내역ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
@@ -1047,6 +1064,9 @@
private System.Windows.Forms.ToolStripMenuItem 라이선스ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 휴일연장근무승인ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem9;
private System.Windows.Forms.ToolStripMenuItem 휴일연장근무집계표출력ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 메일자동발신테스트ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 출근부출력ToolStripMenuItem;
}
}

23
Project/fMain.cs
View File

@@ -865,9 +865,7 @@ namespace Project
private void 메일전송ToolStripMenuItem1_Click(object sender, EventArgs e)
{
string formkey = "AUTOMAIL";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.Mail.fAutoSendSetting());
}
private void 메일내역ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1070,5 +1068,24 @@ namespace Project
if (!ShowForm(formkey))
AddForm(formkey, new FPJ0000.fOTConfirm());
}
private void 휴일연장근무집계표출력ToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FPJ0000.JobReport_.rJobReportOT();
f.Show();
}
private void 메일자동발신테스트ToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "AUTOMAIL";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.Mail.fAutoSendSetting());
}
private void 출근부출력ToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FBS0000.WorkTable();
f.Show();
}
}
}

78
Project/fMain.resx
View File

@@ -153,26 +153,6 @@
Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA
kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV
Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw==
</value>
</data>
<data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL
XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo
oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE
TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh
AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw==
</value>
</data>
<data name="메일양식ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
/lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
CyQdKlaIsLHjggEBADs=
</value>
</data>
<data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -297,16 +277,6 @@
h58L4755nzwWACmRSEixWEynl0gQtXWDq9efcWesTLPb7RZmkg1AikQiUigU0uklEoREZl63mEkW430F
g0EHv2mdHpgsyzvNJMvHQ/n9fofX69XJ7HK5bGaSrfBQPNXBzU92nQFgfwCJli/+LKS33wAAAABJRU5E
rkJggg==
</value>
</data>
<data name="메일전송ToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
/lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
CyQdKlaIsLHjggEBADs=
</value>
</data>
<data name="managementToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -365,6 +335,26 @@
oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG
IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB
D4UNMwz8ISAAOw==
</value>
</data>
<data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL
XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo
oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE
TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh
AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw==
</value>
</data>
<data name="메일양식ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
/lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
CyQdKlaIsLHjggEBADs=
</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -431,20 +421,20 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7amI8wLCKoz/bPEBQ46JL0GiM
LmMkwjZmh/yMbh8MSsuPbt3oWJFRR0tbaIHyU6C4DC1FtrJGJ6NTHJLNmOiWuIXZLdW5LmxaDMYzEjK9
LO+6ZCPGO7lPnjz39T3v876fbKBCzWp7y9X0SSp69irp1irpLFPgKk3HWbwWe9FarIVP86EmjZadTyEA
f3zr/m9f6GBhtp34eSe/f2nn7lkbd84cYz5k4fapZpoL5AIwHzl9kPisldh44X2P7eKW/x1unijgF982
on1vc6Mrl4hzC9da3+S6S8OvfjNNL8rvJQCqkknbVvHFcOMmJg+/jCkvleD+jYzVb2TE8AJDVc+Lmlub
ib04gyu+BoINORzZtqZftiKvpL50eaSKuZOHmKh7RjR/rFvPcMU6+veo6dqtErVWjZJPLLu56NybCKcs
7M95IkUAeiXFa2OmbO5+1Uao8RXRPFi+jp4yFR3FKmyFSlFr0aznh74DfKTPpiHvyRIRfqBurWL0vGsX
3/kMzAzUMeUx8HmXnpBbz6n2aj516Jh01fBZYx6m/NRvkrH76jVkPt4vKUNHyxT3Ot5I/3v1Va1su2m7
fOXMHM5P/ceyM82djMpkvor0lAFJ/Wew6S1mvbpHPNOvY7pPx7meKs52V3Kms5IJp0Rv7au0FMiPCcDA
HlV0onkLF4ZqCB7cxHj9c4zVZeGvzeKEIYthXSbefc/ikTJwaTMYMm5l1CbRWZ2dmEgeknWVpf01FzQR
NL7EaPUGsaz/c9N2BW7DZk6214gjCcDtGTuxLxq5OfE+P4/XEg3ouDGyj5+Gtcx5S7jqKeRH1w4u2/O5
1JrL95bEgxo2rewjCfi6LREqJXJ8B8d7bHg8HuFpx7tctORw9AMzRqMRvV7PQrRU+JrPJCYSgFvnrMxP
O4iF2wj4OonFYkQiEfx+Pw6Hg3A4zNLSEpUV5VwdbBDhRwAP/3Gu+lympqaIx+MsLy8LLy4uEggE0Gle
F2M/vBNxE6tltVrfM5vN0QdjS5L0W1FR0aBGo3ks2ZKUTPYvXgs1Psouy34AAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7amI8wLCKoz+bHiA4k0WXoNEY
XcZIhG3MDvkZ3T4YlJYfN7vRYZFRR0tbaIHyU6C4DC1FtrJGJ6NTHJLNmLgtmQtbt3TOdcFpMRjPSMj0
srzrko0Y7+Q+efLc1/e8z/t+soEKNavtLVfTJ6no2aukW6uks0yBqzQdZ/Fa7EVrsRY+y8eaNFp2PoMA
/PG9+799voOF2Xbi55z8/rWde2ds/Hr6KPMhC3dPNtNcIBeA+cipg8RnrcTGCx94bBd3/O9y+3gBP/u2
Ee17h5tduUScW7jW+hY3XBp+8Ztp2iC/nwCoSiZtW8UXw42bmDz8Cqa8VIIHNjJWv5ERw0sMVW0QNbc2
E3txBj/5Ggg25PDhtjX9shV5JfWlyyNVzJ04xETd86L5U916hivW0b9HTddulai1apR8ZtnNBefeRDhl
4UDOUykC0CspXh8zZXPvmzZCja+K5sHydfSUqegoVmErVIpai2Y9F/s+4BN9Ng15T5eI8EN1axWj51y7
+MFnYGagjimPgS+79ITcek62V/O5Q8ekq4YvGvMw5ad+l4w9UK8h88l+SRk6Uqa43/Fm+t+rr2pl203b
5Stn5nB+6j+WnWnuZFQm81WkpwxI6j+DTW8z69U95pl+HdN9Os72VHGmu5LTnZVMOCV6a1+jpUB+VAAG
9qiiE81bOD9UQ/DgJsbrX2SsLgt/bRbHDVkM6zLx7nsBj5SBS5vBkHErozaJzursxETykKyrLO2vuaCJ
oPFlRqufE8v6PzdtV+A2bOZEe404kgDcnbET+6qR2xP7uTVeSzSg4+bIPq4Pa5nzlnDVU8gV1w4u2/O5
1JrLj5bEgxo2rewjCfi2LREqJXJsB8d6bHg8HuFpx3tcsORw5CMzRqMRvV7PQrRU+JrPJCYSgDtnrcxP
O4iF2wj4OonFYkQiEfx+Pw6Hg3A4zNLSEpUV5VwdbBDhxwCP/nGu+lympqaIx+MsLy8LLy4uEggE0Gne
EGM/uhNxE6tltVrfN5vN0YdjS5L0W1FR0aBGo3ki2ZKUTPYvVBs1OyeHDDkAAAAASUVORK5CYII=
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

53
SubProject/FBS0000/Holiday/WorkTable.Designer.cs generated
View File

@@ -51,7 +51,9 @@
this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel();
this.sbJan = new System.Windows.Forms.ToolStripLabel();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.tbSD = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.tbED = new System.Windows.Forms.ToolStripTextBox();
@@ -59,8 +61,6 @@
this.tbGrp = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
@@ -139,6 +139,7 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -220,8 +221,20 @@
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(79, 24);
this.toolStripButton2.Text = "내보내기";
this.toolStripButton2.Visible = false;
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton3
//
this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(79, 24);
this.toolStripButton3.Text = "메일전송";
this.toolStripButton3.Visible = false;
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
@@ -239,9 +252,19 @@
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
// lbStt
//
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbStt.ForeColor = System.Drawing.Color.Blue;
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(31, 28);
this.lbStt.Text = "기간";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// tbSD
//
this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSD.Name = "tbSD";
this.tbSD.Size = new System.Drawing.Size(100, 31);
this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -256,6 +279,7 @@
// tbED
//
this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbED.Name = "tbED";
this.tbED.Size = new System.Drawing.Size(100, 31);
this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -269,6 +293,7 @@
//
// tbGrp
//
this.tbGrp.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbGrp.Name = "tbGrp";
this.tbGrp.Size = new System.Drawing.Size(200, 31);
//
@@ -295,25 +320,6 @@
this.fpSpread1.SetViewportLeftColumn(0, 0, 4);
this.fpSpread1.SetActiveViewport(0, 0, -1);
//
// lbStt
//
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbStt.ForeColor = System.Drawing.Color.Blue;
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(31, 28);
this.lbStt.Text = "기간";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// toolStripButton3
//
this.toolStripButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(79, 24);
this.toolStripButton3.Text = "메일전송";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -514,7 +520,7 @@
this.fpSpread1_Sheet1.Cells.Get(0, 47).Border = complexBorder1;
this.fpSpread1_Sheet1.Cells.Get(0, 48).Border = complexBorder1;
this.fpSpread1_Sheet1.Cells.Get(0, 49).Border = complexBorder1;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "번호";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "분류";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사번";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "직급";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "성명";
@@ -526,10 +532,11 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "발생년차";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "사용휴가";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "잔여휴가";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(0).Border = complexBorder1;
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "번호";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "분류";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 69F;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));

123
SubProject/FBS0000/Holiday/WorkTable.cs
View File

@@ -14,12 +14,16 @@ namespace FBS0000
{
public partial class WorkTable : FCOMMON.fBase
{
public WorkTable(string sd, string ed, string grp)
public WorkTable()
{
InitializeComponent();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
tbSD.Text = sd;
tbED.Text = ed;
tbGrp.Text = grp;
tbGrp.Text = string.Empty;
//this.dv1.CellFormatting += dv1_CellFormatting;
}
@@ -40,8 +44,6 @@ namespace FBS0000
RefreshData();
}
void RefreshData()
{
fpSpread1_Sheet1.Rows.Count = 0;
@@ -49,7 +51,7 @@ namespace FBS0000
//열제목
var cols = new List<string>();
cols.AddRange(new string[] { "번호", "사번", "직급", "성명" });
cols.AddRange(new string[] { "분류", "사번", "직급", "성명" });
var sd = DateTime.Parse(tbSD.Text);
var ed = DateTime.Parse(tbED.Text);
@@ -57,7 +59,7 @@ namespace FBS0000
while (true)
{
var curDate = sd.AddDays(idx++);
cols.Add(curDate.Day.ToString("00"));
cols.Add(curDate.Day.ToString("00") + "\r\n" + curDate.DayOfWeek.ToString().Substring(0, 3));
if (curDate.ToShortDateString() == ed.ToShortDateString()) break;
}
cols.AddRange(new string[] { "발생", "사용", "잔여" });
@@ -71,24 +73,34 @@ namespace FBS0000
else if (c > cols.Count - 4) fpSpread1_Sheet1.Columns[c].BackColor = Color.WhiteSmoke;
else fpSpread1_Sheet1.Columns[c].BackColor = Color.White;
}
//fpSpread1_Sheet1.Cells[0, c].Value = cols[c];
//업무일지 데이터
var taJR = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();
var JobReport = taJR.GetData(FCOMMON.info.Login.gcode, tbSD.Text, tbED.Text);
var taHolyList = new dsMSSQLTableAdapters.HolidayLIstTableAdapter();
var HolyList = taHolyList.GetData(tbSD.Text, tbED.Text);
//해당 기간내의 사용
var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
var dtUser = taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text);
//var taUser = new dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
var dtUser = JobReport.OrderBy(t => t.userProcess+ t.name).GroupBy(t => t.id);// taUser.GetData(FCOMMON.info.Login.gcode, tbGrp.Text);
var users = new List<userinfo>();
var seq = 0;
foreach (var item in dtUser)
{
if (string.IsNullOrEmpty(item.indate))
var dr = item.First();
if (string.IsNullOrEmpty(dr.indate) == false)
{
//입사일자를 체크해서. 이 날짜가 입사일 이전이면 넘어간다
}
users.Add(new userinfo { grade = item.grade, name = item.name, empno = item.empno, seq = item.seq.ToString() });
users.Add(new userinfo { grade = dr.grade, name = dr.name, empno = dr.id, seq = dr.userProcess, indate = dr.indate, outdate = dr.outdate });
seq += 1;
}
//휴가테이블에서 데이터를 가져온다
var taHoly = new dsMSSQLTableAdapters.HolydayTableAdapter();
var dtHoly = taHoly.GetByGrp(tbSD.Text, tbED.Text, FCOMMON.info.Login.gcode, this.tbGrp.Text);
var dtHoly = taHoly.GetByDate(FCOMMON.info.Login.gcode, tbSD.Text, tbED.Text);
var qta = new dsMSSQLTableAdapters.QueriesTableAdapter();
@@ -104,21 +116,53 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, 2].Value = item.grade;
fpSpread1_Sheet1.Cells[rowindex, 3].Value = item.name;
//이월잔액
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno,sd.ToString("yyyy-01-01"), sd.ToShortDateString(),"999999");
var jand = qta.WorkUserJan_Yesterday_Day(FCOMMON.info.Login.gcode, item.empno, sd.ToString("yyyy-01-01"), sd.ToShortDateString(), "999999");
var used = 0.0;
fpSpread1_Sheet1.Rows[rowindex].ResetBorder();
fpSpread1_Sheet1.Rows[rowindex].Border = new FarPoint.Win.LineBorder(Color.Gainsboro, 1,false, false,true, true);
fpSpread1_Sheet1.Rows[rowindex].Border = new FarPoint.Win.LineBorder(Color.Gainsboro, 1, false, false, true, true);
//각 일자별로 특이사항을 찾는다
int c = 0;
for (c = 4; c < cols.Count - 3; c++)
{
var curDate = sd.AddDays(c - 4);
var bholy = false;
//이날짜가 휴일인지 체크한다.
var drHoly = HolyList.Where(t => t.pdate == curDate.ToShortDateString()).FirstOrDefault();
if (drHoly != null && drHoly.free)
{
bholy = true;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.LightPink;
if (drHoly.memo == "토요일" || drHoly.memo == "일요일")
{
fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
else
{
fpSpread1_Sheet1.Cells[rowindex, c].Note = drHoly.memo;
}
}
else
{
fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.FromArgb(240, 240, 240); ;
}
//입사일이면 메세지 추가
if (item.indate == curDate.ToShortDateString())
fpSpread1_Sheet1.Cells[rowindex, c].Note += "입사";
if (item.outdate == curDate.ToShortDateString())
fpSpread1_Sheet1.Cells[rowindex, c].Note += "퇴사";
var dr = dtHoly.Where(t => t.uid == item.empno && t.sdate.ToShortDateString() == curDate.ToShortDateString()).FirstOrDefault();
if (dr != null)
{
//휴가내역이 있다.
if (dr.term > 0)
used += dr.term;
@@ -137,14 +181,54 @@ namespace FBS0000
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.DeepSkyBlue;
}
if (string.IsNullOrEmpty(dr.contents) == false) fpSpread1_Sheet1.Cells[rowindex, c].Note = dr.contents;
else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
if (string.IsNullOrEmpty(dr.contents) == false) fpSpread1_Sheet1.Cells[rowindex, c].Note += $"({dr.cate}){dr.contents}";
//else fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
else
{
var JRUser = JobReport.Where(t => t.id == item.empno && t.pdate == curDate.ToShortDateString());
var sum_hrs = JRUser.Sum(t => t.hrs);
var sum_ot = JRUser.Sum(t => t.ot);
var sum_ot2 = JRUser.Sum(t => t.ot2);
if (bholy) //주말이다
{
//주말이다.
if (sum_ot > 0 || sum_ot2 > 0)
{
if (sum_ot2 == 0)
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"휴일근무(미승인:{sum_ot}h)";
else
fpSpread1_Sheet1.Cells[rowindex, c].Note += $"휴일근무({sum_ot2}h)";
}
else
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
}
else
{
//평일인데 근무시간이 있다
if (sum_hrs > 0)
{
if (sum_ot > 0 || sum_ot2 > 0)
{
//연장근무를 했다
if (sum_ot2 == 0) fpSpread1_Sheet1.Cells[rowindex, c].Note += $"연장근무(미승인:{sum_ot}h)";
else fpSpread1_Sheet1.Cells[rowindex, c].Note += $"연장근무({sum_ot2}h)";
}
else
{
//평일근무
}
}
else
{
//근무를 안했다
fpSpread1_Sheet1.Cells[rowindex, c].Value = string.Empty;
fpSpread1_Sheet1.Cells[rowindex, c].BackColor = Color.White;
fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
//fpSpread1_Sheet1.Cells[rowindex, c].Note = string.Empty;
}
}
}
@@ -184,6 +268,9 @@ namespace FBS0000
public string empno { get; set; }
public string name { get; set; }
public string grade { get; set; }
public string indate { get; set; }
public string outdate { get; set; }
public userinfo()
{
@@ -248,7 +335,7 @@ namespace FBS0000
Outlook.Application outlookApplication = new Outlook.Application();
Outlook.MailItem newTask = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
newTask.Subject = tbSD.Text.Substring(0,7) +"월 출근부";
newTask.Subject = tbSD.Text.Substring(0, 7) + "월 출근부";
//newTask.To = "Chikyun.Kim@amkor.co.kr";
//newTask.HTMLBody = "<i><b>this is test mail</b></i>";
newTask.BodyFormat = OlBodyFormat.olFormatHTML;

137
SubProject/FBS0000/Holiday/fHolyday.Designer.cs generated
View File

@@ -30,19 +30,19 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyday));
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -86,18 +86,18 @@
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.현재사원원장보기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FBS0000.dsMSSQLTableAdapters.HolydayTableAdapter();
this.taUser = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
this.cmO.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -174,7 +174,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -340,7 +339,6 @@
// tbSD
//
this.tbSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSD.Name = "tbSD";
this.tbSD.Size = new System.Drawing.Size(100, 31);
this.tbSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -355,7 +353,6 @@
// tbED
//
this.tbED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbED.Name = "tbED";
this.tbED.Size = new System.Drawing.Size(100, 31);
this.tbED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -424,7 +421,7 @@
this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
this.fpSpread1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.fpSpread1_KeyDown);
this.fpSpread1.SetViewportLeftColumn(0, 0, 1);
this.fpSpread1.SetActiveViewport(0, 0, -1);
this.fpSpread1.SetActiveViewport(0, -1, -1);
//
// cmO
//
@@ -491,19 +488,6 @@
this.현재사원원장보기ToolStripMenuItem.Text = "현재 사원 원장 보기";
this.현재사원원장보기ToolStripMenuItem.Click += new System.EventHandler(this.현재사원원장보기ToolStripMenuItem_Click);
//
// bs
//
this.bs.DataMember = "Holyday";
this.bs.DataSource = this.dsMSSQL;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// taUser
//
this.taUser.ClearBeforeFill = true;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -530,27 +514,27 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "전일(일)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "전일(H)";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "cate";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "구분";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType2.TimeDefault = new System.DateTime(2021, 9, 7, 9, 38, 59, 393);
this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType2;
dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 20, 18, 33, 49, 994);
this.fpSpread1_Sheet1.Columns.Get(1).CellType = dateTimeCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "sdate";
this.fpSpread1_Sheet1.Columns.Get(1).Label = "일자";
this.fpSpread1_Sheet1.Columns.Get(1).Tag = "pdate";
this.fpSpread1_Sheet1.Columns.Get(1).Width = 71F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(2).Formula = "CHOOSE(WEEKDAY(RC[-1]),\"일\",\"월\",\"화\",\"수\",\"목\",\"금\",\"토\")";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "요일";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "uid";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "사번";
@@ -558,90 +542,90 @@
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
textCellType10.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType10;
textCellType4.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "성명";
this.fpSpread1_Sheet1.Columns.Get(4).Tag = "name";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
numberCellType7.MaximumValue = 999999999999999D;
numberCellType7.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType7;
numberCellType1.MaximumValue = 999999999999999D;
numberCellType1.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "term";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "사용(일)";
this.fpSpread1_Sheet1.Columns.Get(5).Tag = "dr";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
numberCellType8.MaximumValue = 999999999999999D;
numberCellType8.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType8;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "CrTime";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "사용(H)";
this.fpSpread1_Sheet1.Columns.Get(6).Tag = "drh";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "contents";
this.fpSpread1_Sheet1.Columns.Get(7).Label = "내용";
this.fpSpread1_Sheet1.Columns.Get(7).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 40F;
this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
numberCellType9.MaximumValue = 999999999999999D;
numberCellType9.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType9;
numberCellType3.MaximumValue = 999999999999999D;
numberCellType3.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "termDr";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "발생(일)";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "cr";
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
numberCellType10.MaximumValue = 999999999999999D;
numberCellType10.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType10;
numberCellType4.MaximumValue = 999999999999999D;
numberCellType4.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "DrTime";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "발생(H)";
this.fpSpread1_Sheet1.Columns.Get(10).Tag = "crh";
this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType11.DecimalPlaces = 1;
numberCellType11.MaximumValue = 999999999999999D;
numberCellType11.MinimumValue = -999999999999999D;
numberCellType11.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType11;
numberCellType5.DecimalPlaces = 1;
numberCellType5.MaximumValue = 999999999999999D;
numberCellType5.MinimumValue = -999999999999999D;
numberCellType5.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[2]+RC[-2]-RC[-6]";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "잔량(일)";
this.fpSpread1_Sheet1.Columns.Get(11).Tag = "jand";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType11;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[2]+RC[-2]-RC[-6]";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "잔량(H)";
this.fpSpread1_Sheet1.Columns.Get(12).Tag = "janh";
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
numberCellType12.DecimalPlaces = 1;
numberCellType12.MaximumValue = 999999999999999D;
numberCellType12.MinimumValue = -999999999999999D;
numberCellType12.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType12;
numberCellType6.DecimalPlaces = 1;
numberCellType6.MaximumValue = 999999999999999D;
numberCellType6.MinimumValue = -999999999999999D;
numberCellType6.ReadOnly = true;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType6;
this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.Gray;
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "전일(일)";
this.fpSpread1_Sheet1.Columns.Get(13).Tag = "yjand";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType12;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType6;
this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.Gray;
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Label = "전일(H)";
@@ -656,6 +640,19 @@
this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// bs
//
this.bs.DataMember = "Holyday";
this.bs.DataSource = this.dsMSSQL;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// taUser
//
this.taUser.ClearBeforeFill = true;
//
// fHolyday
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -665,7 +662,7 @@
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
this.Name = "fHolyday";
this.Text = "출근부";
this.Text = "연차관리";
this.Load += new System.EventHandler(this.@__Load);
this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.fHolyday_KeyPress);
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
@@ -676,8 +673,8 @@
this.toolStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
this.cmO.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

8
SubProject/FBS0000/Holiday/fHolyday.cs
View File

@@ -79,7 +79,7 @@ namespace FBS0000
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
curLevel = 5;
//curLevel = 5;
if (curLevel >= 5)
{
//권한이 잇으므로 모든 사용자로 한다.
@@ -386,9 +386,9 @@ namespace FBS0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var f = new WorkTable(sd, ed, this.cmbGrp.Text);
//var sd = DateTime.Now.ToString("yyyy-MM-01");
//var ed = DateTime.Parse(DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")).AddDays(-1).ToShortDateString();
var f = new WorkTable();
f.Show();
}

66
SubProject/FBS0000/Holiday/fHolyday.resx
View File

@@ -197,23 +197,6 @@
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7GF3XVVdRS51dRBBRdBcUhKJE
HxRE9CHOja6iJmYZjewiqItAonKKrC3J0hzbdJuGutk+cHqifWBLj7rlXDqXwnZOO9ONp/ec5bHhLnzh
x+E98H/e33nOOTv4RVFUxehzOYYbKzFYcxDk1vFtsp8fPuxyuRivxwnK44DtRjmy2ey2EELUavVOo9F4
c+CpEi6NErbr5Uin0wWwLAuGYUSSySTW19fzAYUGdlivyrYEbIRskEqlsLa2VmhgfaKEs1UB6xUZOI4T
eNAZQaM+gnuEBl0YDdow6gm8hRggGrjzBv2XZchkMgL8sN4eh47wdiQO7XAcdzrmhADeqsCgv1mBL6/q
0HepTEjn+f9UFRm8207jdhstdBCNRnNFDUwXyoSC+ACOS8Phj6DHPQXtSATvnQuwUPNY/b2ElZUVhgQc
3TRQ12H0pRym86X/hjnohqbRRy1h+heLuQSHsZkkbN+WMeCdRSKRKNKB2w7j2RIhgO/gozuGyWgK3vAf
uGdZuAiBGIeu0TB8Ph8kEskJ0cD8UA5HSy0MVSViiR1DYdBxDu4ZBk6awVAoBeonh3eOKBYXF7caTBCD
3soDYold5JknF1g4pvLDPBPzHDSWH1u/RPP9Woy8qEHvmc0Auy+GMTqJr2TIE05jnJxu9qXQqjdhnrIW
N+g5LUUulxPexPIqC8/3OLpJFx9cMbQPzuG13oKArR3jGgUaqvc1CQYqlUraWXUIhmvH0H1KCpqmEQqF
EAwG4ff7hcICgYBwdXx6g7G2W5gdaIGhuSJNLPKrpnTXyUdH9jyule2Wk22xX1ekvnpv02f1RW7w2Tn8
BU0oyCcGs6xoAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
@@ -228,6 +211,23 @@
btB3WoJcLie8ieVVFt7vcfSSLj64Y1Bb5/Baa0TArMa4qgFNNftaBAOFQiHprj4E3bVj6D0lAU3TCIVC
CAaD8Pv9QmGBQEC4Oj+9wWjHLcxa2qBrrUwTi/yqLdt18tGRPY/rpLtlZFvs1xVprNnb8ll5kbM+O4e/
RjjIJC1kw30AAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqacoU2cPEUQUvQUFoSjR
hYKILuJ09BQ1MUtpZA9BPQQSlXOIbUmWpszLbqG7tAteTrQLtvSo29Q155qwndPOdOPb/5zlseEe/MOH
w//A7/v/nO85Zxe/KIqqsL2QYqypEqaawyC3Tu6Qg/zwUYfDwUy47KBcVhhulSOTyewIIUShUOzWarW3
jc9kcChlMNwsRyqVyoNlWTAMI5JIJLCxsZELyDewQH9dsi1gM2STZDKJ9fX1fAP9Uxns7fXQX5OA4ziB
R91BNGmCeEBoVAfQ2BVAA4G3EANEA2fOYOSqBOl0WoAf1liiUBPemaPoGoviXueCEMBb5RmMtNbj6+s6
DF8pE9J5/j9VTgbvq2jc7aCFDkKhULagweClMqEgPoDjUrB6guhzzqDLHMQH+zJ01CLWfq8gHo8zJOD4
loGiDrZXUgxeLP03zEE9OothagWzv1gsxDiMzyVg+L4K48Q8YrFYgQ6cFmjPlwgBfAefnGFMLyUxEfgD
5zwLB8Eb5tBjC8DtdqOoqOiUaDDUIoW1rRYDVSViiZ2jAdBRDs45Bnaawag/CSrE4b11CZFIZLvBFDHo
rzwklthDnnl6mYV1JjfMM7XIQan7uf1LHHpYC/PLGvSf2wqwuMMYpxP4RoZcgRQmyelD7iTaNYNYpPSF
DfrOFiObzQpvYnWNhetHFL2ki4+OMFSmBbzR6OA1qDCprEdj9YFmwUAulxd3Vx3BwI0T6D1TDJqm4ff7
4fP54PF4hMK8Xq9wtX5+i/GOO5g3tmGgtSJFLHKrpnTP6cfH9j2pleyVkm2hX1ekoXp/8xfFZc70/AL+
Aj9IyCGwUBkWAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -254,22 +254,6 @@
<metadata name="cmO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>659, 17</value>
</metadata>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>737, 17</value>
</metadata>
<data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
AAD/////AQgAAP////8AAQgAAAs=
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>294, 17</value>
</metadata>
<data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
@@ -309,6 +293,22 @@
vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
</value>
</data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>737, 17</value>
</metadata>
<data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
AAD/////AQgAAP////8AAQgAAAs=
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>294, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>358, 17</value>
</metadata>

16
SubProject/FBS0000/Holiday/fWorkTableUser.Designer.cs generated
View File

@@ -66,6 +66,7 @@
this.ta = new FBS0000.dsMSSQLTableAdapters.EETGW_WorkTableUserTableAdapter();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
@@ -144,6 +145,7 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -267,7 +269,8 @@
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel3,
this.cmbGrp,
this.toolStripButton1});
this.toolStripButton1,
this.toolStripButton5});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(984, 31);
@@ -349,6 +352,16 @@
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// toolStripButton5
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(59, 28);
this.toolStripButton5.Text = "닫기";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
// fWorkTableUser
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -406,5 +419,6 @@
private FarPoint.Win.Spread.FpSpread fpSpread1;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripButton toolStripButton5;
}
}

5
SubProject/FBS0000/Holiday/fWorkTableUser.cs
View File

@@ -173,5 +173,10 @@ namespace FBS0000
//리스트업데이트
UpdateGrpList();
}
private void toolStripButton5_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

15
SubProject/FBS0000/Holiday/fWorkTableUser.resx
View File

@@ -229,6 +229,21 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>188, 17</value>
</metadata>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>369, 17</value>
</metadata>

2734
SubProject/FBS0000/dsMSSQL.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

312
SubProject/FBS0000/dsMSSQL.xsd
View File

@@ -382,6 +382,21 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
<Mapping SourceColumn="tag" DataSetColumn="tag" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByDate" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByDate" GeneratorSourceName="FillByDate" GetMethodModifier="Public" GetMethodName="GetByDate" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByDate" UserSourceName="FillByDate">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail, mailsend, reason, wuid, wdate, termDr, gcode, DrTime, CrTime, dbo.getUserName(uid) AS UserName, tag
FROM Holyday
WHERE (gcode = @gcode) AND (sdate BETWEEN @sd AND @ed)
ORDER BY sdate, edate, uid</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Holyday" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByGrp" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByGrp" GeneratorSourceName="FillByGrp" GetMethodModifier="Public" GetMethodName="GetByGrp" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByGrp" UserSourceName="FillByGrp">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
@@ -605,6 +620,131 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM
</DbSource>
</Sources>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vJobReportForUserTableAdapter" GeneratorDataComponentClassName="vJobReportForUserTableAdapter" Name="vJobReportForUser" UserDataComponentName="vJobReportForUserTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate
FROM vJobReportForUser
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
ORDER BY pdate</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="pdate" DataSetColumn="pdate" />
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="id" DataSetColumn="id" />
<Mapping SourceColumn="name" DataSetColumn="name" />
<Mapping SourceColumn="process" DataSetColumn="process" />
<Mapping SourceColumn="type" DataSetColumn="type" />
<Mapping SourceColumn="svalue" DataSetColumn="svalue" />
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="requestpart" DataSetColumn="requestpart" />
<Mapping SourceColumn="package" DataSetColumn="package" />
<Mapping SourceColumn="userProcess" DataSetColumn="userProcess" />
<Mapping SourceColumn="status" DataSetColumn="status" />
<Mapping SourceColumn="projectName" DataSetColumn="projectName" />
<Mapping SourceColumn="description" DataSetColumn="description" />
<Mapping SourceColumn="ww" DataSetColumn="ww" />
<Mapping SourceColumn="otStart" DataSetColumn="otStart" />
<Mapping SourceColumn="otEnd" DataSetColumn="otEnd" />
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
<Mapping SourceColumn="grade" DataSetColumn="grade" />
<Mapping SourceColumn="indate" DataSetColumn="indate" />
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="HolidayLIstTableAdapter" GeneratorDataComponentClassName="HolidayLIstTableAdapter" Name="HolidayLIst" UserDataComponentName="HolidayLIstTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.HolidayLIst" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [HolidayLIst] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_free = 1 AND [free] IS NULL) OR ([free] = @Original_free)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_free" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="free" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_free" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="free" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [HolidayLIst] ([pdate], [free], [memo], [wuid], [wdate]) VALUES (@pdate, @free, @memo, @wuid, @wdate);
SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@free" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="free" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, pdate, free, memo, wuid, wdate
FROM HolidayLIst
WHERE (pdate BETWEEN @sd AND @ed)
ORDER BY pdate</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.HolidayLIst" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.HolidayLIst" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [HolidayLIst] SET [pdate] = @pdate, [free] = @free, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_free = 1 AND [free] IS NULL) OR ([free] = @Original_free)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) ORDER BY pdate</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@free" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="free" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_free" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="free" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_free" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="free" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.HolidayLIst" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="pdate" DataSetColumn="pdate" />
<Mapping SourceColumn="free" DataSetColumn="free" />
<Mapping SourceColumn="memo" DataSetColumn="memo" />
<Mapping SourceColumn="wuid" DataSetColumn="wuid" />
<Mapping SourceColumn="wdate" DataSetColumn="wdate" />
</Mappings>
<Sources />
</TableAdapter>
</Tables>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="GetGrpName" MethodsParameterType="CLR" Modifier="Public" Name="GetGrpName" QueryType="Scalar" ScalarCallRetval="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="GetGrpName">
@@ -987,6 +1127,174 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="pdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="id" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="process" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="process" msprop:Generator_ColumnVarNameInTable="columnprocess" msprop:Generator_ColumnPropNameInTable="processColumn" msprop:Generator_UserColumnName="process" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="type" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="type" msprop:Generator_ColumnVarNameInTable="columntype" msprop:Generator_ColumnPropNameInTable="typeColumn" msprop:Generator_UserColumnName="type" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="svalue" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue" msprop:Generator_ColumnVarNameInTable="columnsvalue" msprop:Generator_ColumnPropNameInTable="svalueColumn" msprop:Generator_UserColumnName="svalue" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="hrs" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
<xs:element name="ot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
<xs:element name="requestpart" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="requestpart" msprop:Generator_ColumnVarNameInTable="columnrequestpart" msprop:Generator_ColumnPropNameInTable="requestpartColumn" msprop:Generator_UserColumnName="requestpart" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="package" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="package" msprop:Generator_ColumnVarNameInTable="columnpackage" msprop:Generator_ColumnPropNameInTable="packageColumn" msprop:Generator_UserColumnName="package" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="userProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="userProcess" msprop:Generator_ColumnVarNameInTable="columnuserProcess" msprop:Generator_ColumnPropNameInTable="userProcessColumn" msprop:Generator_UserColumnName="userProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="status" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="status" msprop:Generator_ColumnVarNameInTable="columnstatus" msprop:Generator_ColumnPropNameInTable="statusColumn" msprop:Generator_UserColumnName="status" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="projectName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="projectName" msprop:Generator_ColumnVarNameInTable="columnprojectName" msprop:Generator_ColumnPropNameInTable="projectNameColumn" msprop:Generator_UserColumnName="projectName" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="description" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" msprop:Generator_UserColumnName="description" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="ww" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_UserColumnName="ww" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="6" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
<xs:element name="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
<xs:element name="otReason" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:Generator_UserColumnName="otReason" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="grade" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="grade" msprop:Generator_ColumnVarNameInTable="columngrade" msprop:Generator_ColumnPropNameInTable="gradeColumn" msprop:Generator_UserColumnName="grade" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="free" msprop:Generator_ColumnVarNameInTable="columnfree" msprop:Generator_ColumnPropNameInRow="free" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="freeColumn" msprop:Generator_UserColumnName="free" type="xs:boolean" minOccurs="0" />
<xs:element name="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInRow="memo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -1013,5 +1321,9 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
<xs:selector xpath=".//mstns:EETGW_WorkTableUser" />
<xs:field xpath="mstns:idx" />
</xs:unique>
<xs:unique name="HolidayLIst_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:HolidayLIst" />
<xs:field xpath="mstns:idx" />
</xs:unique>
</xs:element>
</xs:schema>

16
SubProject/FBS0000/dsMSSQL.xss
View File

@@ -6,13 +6,15 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:minutes" ZOrder="7" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Board" ZOrder="6" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Holyday" ZOrder="5" X="581" Y="70" Height="402" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="313" />
<Shape ID="DesignTable:vHoliday_uselist" ZOrder="4" X="865" Y="70" Height="248" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:WorkTableGrp" ZOrder="3" X="257" Y="433" Height="133" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:EETGW_WorkTableUser" ZOrder="2" X="600" Y="549" Height="270" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="200" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="250" Y="606" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
<Shape ID="DesignTable:minutes" ZOrder="9" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Board" ZOrder="8" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Holyday" ZOrder="3" X="581" Y="70" Height="421" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="313" />
<Shape ID="DesignTable:vHoliday_uselist" ZOrder="2" X="916" Y="68" Height="248" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:WorkTableGrp" ZOrder="7" X="257" Y="433" Height="133" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:EETGW_WorkTableUser" ZOrder="6" X="600" Y="549" Height="270" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="200" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="963" Y="373" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="5" X="250" Y="606" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="1" X="1300" Y="157" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
</Shapes>
<Connectors />
</DiagramLayout>

219
SubProject/FCM0000/DSUser.Designer.cs generated
View File

@@ -1224,6 +1224,8 @@ namespace FCM0000 {
private global::System.Data.DataColumn columnotconfirm;
private global::System.Data.DataColumn columnkuntae;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public AuthDataTable() {
@@ -1353,6 +1355,14 @@ namespace FCM0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn kuntaeColumn {
get {
return this.columnkuntae;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1390,7 +1400,7 @@ namespace FCM0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport, int savecost, int scheapp, int equipment, int kusul, int otconfirm) {
public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport, int savecost, int scheapp, int equipment, int kusul, int otconfirm, int kuntae) {
AuthRow rowAuthRow = ((AuthRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1404,7 +1414,8 @@ namespace FCM0000 {
scheapp,
equipment,
kusul,
otconfirm};
otconfirm,
kuntae};
rowAuthRow.ItemArray = columnValuesArray;
this.Rows.Add(rowAuthRow);
return rowAuthRow;
@@ -1446,6 +1457,7 @@ namespace FCM0000 {
this.columnequipment = base.Columns["equipment"];
this.columnkusul = base.Columns["kusul"];
this.columnotconfirm = base.Columns["otconfirm"];
this.columnkuntae = base.Columns["kuntae"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1475,6 +1487,8 @@ namespace FCM0000 {
base.Columns.Add(this.columnkusul);
this.columnotconfirm = new global::System.Data.DataColumn("otconfirm", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotconfirm);
this.columnkuntae = new global::System.Data.DataColumn("kuntae", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnkuntae);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -2370,11 +2384,11 @@ namespace FCM0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int equipment {
get {
try {
return ((int)(this[this.tableAuth.equipmentColumn]));
if (this.IsequipmentNull()) {
return 0;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Auth\' 테이블의 \'equipment\' 열의 값이 DBNull입니다.", e);
else {
return ((int)(this[this.tableAuth.equipmentColumn]));
}
}
set {
@@ -2386,11 +2400,11 @@ namespace FCM0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int kusul {
get {
try {
return ((int)(this[this.tableAuth.kusulColumn]));
if (this.IskusulNull()) {
return 0;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Auth\' 테이블의 \'kusul\' 열의 값이 DBNull입니다.", e);
else {
return ((int)(this[this.tableAuth.kusulColumn]));
}
}
set {
@@ -2402,11 +2416,11 @@ namespace FCM0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int otconfirm {
get {
try {
return ((int)(this[this.tableAuth.otconfirmColumn]));
if (this.IsotconfirmNull()) {
return 0;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'Auth\' 테이블의 \'otconfirm\' 열의 값이 DBNull입니다.", e);
else {
return ((int)(this[this.tableAuth.otconfirmColumn]));
}
}
set {
@@ -2414,6 +2428,22 @@ namespace FCM0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public int kuntae {
get {
if (this.IskuntaeNull()) {
return 0;
}
else {
return ((int)(this[this.tableAuth.kuntaeColumn]));
}
}
set {
this[this.tableAuth.kuntaeColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsuserNull() {
@@ -2533,6 +2563,18 @@ namespace FCM0000 {
public void SetotconfirmNull() {
this[this.tableAuth.otconfirmColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IskuntaeNull() {
return this.IsNull(this.tableAuth.kuntaeColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetkuntaeNull() {
this[this.tableAuth.kuntaeColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -4273,10 +4315,11 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
tableMapping.ColumnMappings.Add("equipment", "equipment");
tableMapping.ColumnMappings.Add("kusul", "kusul");
tableMapping.ColumnMappings.Add("otconfirm", "otconfirm");
tableMapping.ColumnMappings.Add("kuntae", "kuntae");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)))";
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)) AND ((@IsNull_kuntae = 1 AND [kuntae] IS NULL) OR ([kuntae] = @Original_kuntae)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -4300,10 +4343,12 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kuntae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kuntae", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kuntae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kuntae", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp], [equipment], [kusul], [otconfirm]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp, @equipment, @kusul, @otconfirm);
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]";
this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp], [equipment], [kusul], [otconfirm], [kuntae]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp, @equipment, @kusul, @otconfirm, @kuntae);
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, kuntae FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -4316,10 +4361,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kuntae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kuntae", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp, [equipment] = @equipment, [kusul] = @kusul, [otconfirm] = @otconfirm WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)));
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = @idx) ORDER BY [user]";
this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp, [equipment] = @equipment, [kusul] = @kusul, [otconfirm] = @otconfirm, [kuntae] = @kuntae WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)) AND ((@IsNull_kuntae = 1 AND [kuntae] IS NULL) OR ([kuntae] = @Original_kuntae)));
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, kuntae FROM Auth WHERE (idx = @idx) ORDER BY [user]";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -4332,6 +4378,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kuntae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kuntae", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -4354,6 +4401,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kuntae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kuntae", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kuntae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kuntae", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -4371,8 +4420,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche" +
"app, equipment, kusul, otconfirm\r\nFROM Auth\r\nWHERE (gcode = @gcode)\r\nORDER " +
"BY [user]";
"app, equipment, kusul, otconfirm, kuntae\r\nFROM Auth\r\nWHERE (gcode = @gcode)" +
"\r\nORDER BY [user]";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
@@ -4446,7 +4495,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable<int> Original_purchase, global::System.Nullable<int> Original_holyday, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_jobreport, global::System.Nullable<int> Original_savecost, global::System.Nullable<int> Original_scheapp, global::System.Nullable<int> Original_equipment, global::System.Nullable<int> Original_kusul, global::System.Nullable<int> Original_otconfirm) {
public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable<int> Original_purchase, global::System.Nullable<int> Original_holyday, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_jobreport, global::System.Nullable<int> Original_savecost, global::System.Nullable<int> Original_scheapp, global::System.Nullable<int> Original_equipment, global::System.Nullable<int> Original_kusul, global::System.Nullable<int> Original_otconfirm, global::System.Nullable<int> Original_kuntae) {
this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
if ((Original_user == null)) {
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -4534,6 +4583,14 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[21].Value = global::System.DBNull.Value;
}
if ((Original_kuntae.HasValue == true)) {
this.Adapter.DeleteCommand.Parameters[22].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[23].Value = ((int)(Original_kuntae.Value));
}
else {
this.Adapter.DeleteCommand.Parameters[22].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[23].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -4554,7 +4611,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
public virtual int Insert(string user, string gcode, global::System.Nullable<int> purchase, global::System.Nullable<int> holyday, global::System.Nullable<int> project, global::System.Nullable<int> jobreport, global::System.Nullable<int> savecost, global::System.Nullable<int> scheapp, global::System.Nullable<int> equipment, global::System.Nullable<int> kusul, global::System.Nullable<int> otconfirm) {
public virtual int Insert(string user, string gcode, global::System.Nullable<int> purchase, global::System.Nullable<int> holyday, global::System.Nullable<int> project, global::System.Nullable<int> jobreport, global::System.Nullable<int> savecost, global::System.Nullable<int> scheapp, global::System.Nullable<int> equipment, global::System.Nullable<int> kusul, global::System.Nullable<int> otconfirm, global::System.Nullable<int> kuntae) {
if ((user == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -4621,6 +4678,12 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
else {
this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value;
}
if ((kuntae.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[11].Value = ((int)(kuntae.Value));
}
else {
this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -4653,6 +4716,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
global::System.Nullable<int> equipment,
global::System.Nullable<int> kusul,
global::System.Nullable<int> otconfirm,
global::System.Nullable<int> kuntae,
int Original_idx,
string Original_user,
string Original_gcode,
@@ -4665,6 +4729,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
global::System.Nullable<int> Original_equipment,
global::System.Nullable<int> Original_kusul,
global::System.Nullable<int> Original_otconfirm,
global::System.Nullable<int> Original_kuntae,
int idx) {
if ((user == null)) {
this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -4732,94 +4797,108 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
else {
this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_idx));
if ((Original_user == null)) {
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
if ((kuntae.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(kuntae.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_user));
this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_idx));
if ((Original_user == null)) {
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_user));
}
if ((Original_gcode == null)) {
throw new global::System.ArgumentNullException("Original_gcode");
}
else {
this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_gcode));
this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_gcode));
}
if ((Original_purchase.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_purchase.Value));
this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_purchase.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
}
if ((Original_holyday.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_holyday.Value));
this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_holyday.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
}
if ((Original_project.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_project.Value));
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_project.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
}
if ((Original_jobreport.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_jobreport.Value));
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_jobreport.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
}
if ((Original_savecost.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_savecost.Value));
this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_savecost.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
}
if ((Original_scheapp.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_scheapp.Value));
this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_scheapp.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
}
if ((Original_equipment.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_equipment.Value));
this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_equipment.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
}
if ((Original_kusul.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_kusul.Value));
this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_kusul.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
}
if ((Original_otconfirm.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_otconfirm.Value));
this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_otconfirm.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(idx));
if ((Original_kuntae.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(Original_kuntae.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[36].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -4852,6 +4931,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
global::System.Nullable<int> equipment,
global::System.Nullable<int> kusul,
global::System.Nullable<int> otconfirm,
global::System.Nullable<int> kuntae,
int Original_idx,
string Original_user,
string Original_gcode,
@@ -4863,8 +4943,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
global::System.Nullable<int> Original_scheapp,
global::System.Nullable<int> Original_equipment,
global::System.Nullable<int> Original_kusul,
global::System.Nullable<int> Original_otconfirm) {
return this.Update(user, gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_savecost, Original_scheapp, Original_equipment, Original_kusul, Original_otconfirm, Original_idx);
global::System.Nullable<int> Original_otconfirm,
global::System.Nullable<int> Original_kuntae) {
return this.Update(user, gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, kuntae, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_savecost, Original_scheapp, Original_equipment, Original_kusul, Original_otconfirm, Original_kuntae, Original_idx);
}
}

32
SubProject/FCM0000/DSUser.xsd
View File

@@ -254,7 +254,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Auth" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)))</CommandText>
<CommandText>DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)) AND ((@IsNull_kuntae = 1 AND [kuntae] IS NULL) OR ([kuntae] = @Original_kuntae)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_user" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -278,13 +278,15 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_kusul" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kusul" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otconfirm" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otconfirm" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_otconfirm" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otconfirm" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kuntae" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kuntae" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_kuntae" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kuntae" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp], [equipment], [kusul], [otconfirm]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp, @equipment, @kusul, @otconfirm);
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]</CommandText>
<CommandText>INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp], [equipment], [kusul], [otconfirm], [kuntae]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp, @equipment, @kusul, @otconfirm, @kuntae);
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, kuntae FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -297,12 +299,13 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@equipment" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="equipment" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@kusul" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kusul" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@otconfirm" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otconfirm" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@kuntae" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kuntae" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm
<CommandText>SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, kuntae
FROM Auth
WHERE (gcode = @gcode)
ORDER BY [user]</CommandText>
@@ -313,8 +316,8 @@ ORDER BY [user]</CommandText>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp, [equipment] = @equipment, [kusul] = @kusul, [otconfirm] = @otconfirm WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)));
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = @idx) ORDER BY [user]</CommandText>
<CommandText>UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp, [equipment] = @equipment, [kusul] = @kusul, [otconfirm] = @otconfirm, [kuntae] = @kuntae WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)) AND ((@IsNull_kuntae = 1 AND [kuntae] IS NULL) OR ([kuntae] = @Original_kuntae)));
SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, kuntae FROM Auth WHERE (idx = @idx) ORDER BY [user]</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -327,6 +330,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@equipment" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="equipment" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@kusul" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kusul" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@otconfirm" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otconfirm" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@kuntae" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kuntae" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_user" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_user" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -349,6 +353,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_kusul" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kusul" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otconfirm" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otconfirm" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_otconfirm" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otconfirm" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kuntae" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kuntae" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_kuntae" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kuntae" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Auth" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
@@ -368,6 +374,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<Mapping SourceColumn="equipment" DataSetColumn="equipment" />
<Mapping SourceColumn="kusul" DataSetColumn="kusul" />
<Mapping SourceColumn="otconfirm" DataSetColumn="otconfirm" />
<Mapping SourceColumn="kuntae" DataSetColumn="kuntae" />
</Mappings>
<Sources />
</TableAdapter>
@@ -379,7 +386,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<xs:element name="DSUser" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSUser" msprop:Generator_UserDSName="DSUser">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent" msprop:Generator_RowClassName="UserGroupRow">
<xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_RowClassName="UserGroupRow" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept">
@@ -407,7 +414,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_RowClassName="UsersRow">
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowClassName="UsersRow" msprop:Generator_UserTableName="Users" msprop:Generator_RowEvArgName="UsersRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -534,7 +541,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Auth" msprop:Generator_TableClassName="AuthDataTable" msprop:Generator_TableVarName="tableAuth" msprop:Generator_TablePropName="Auth" msprop:Generator_RowDeletingName="AuthRowDeleting" msprop:Generator_RowChangingName="AuthRowChanging" msprop:Generator_RowEvHandlerName="AuthRowChangeEventHandler" msprop:Generator_RowDeletedName="AuthRowDeleted" msprop:Generator_UserTableName="Auth" msprop:Generator_RowChangedName="AuthRowChanged" msprop:Generator_RowEvArgName="AuthRowChangeEvent" msprop:Generator_RowClassName="AuthRow">
<xs:element name="Auth" msprop:Generator_TableClassName="AuthDataTable" msprop:Generator_TableVarName="tableAuth" msprop:Generator_RowChangedName="AuthRowChanged" msprop:Generator_TablePropName="Auth" msprop:Generator_RowDeletingName="AuthRowDeleting" msprop:Generator_RowChangingName="AuthRowChanging" msprop:Generator_RowEvHandlerName="AuthRowChangeEventHandler" msprop:Generator_RowDeletedName="AuthRowDeleted" msprop:Generator_RowClassName="AuthRow" msprop:Generator_UserTableName="Auth" msprop:Generator_RowEvArgName="AuthRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -558,9 +565,10 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<xs:element name="jobreport" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jobreport" msprop:Generator_ColumnVarNameInTable="columnjobreport" msprop:Generator_ColumnPropNameInTable="jobreportColumn" msprop:Generator_UserColumnName="jobreport" type="xs:int" minOccurs="0" />
<xs:element name="savecost" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="savecost" msprop:Generator_ColumnVarNameInTable="columnsavecost" msprop:Generator_ColumnPropNameInTable="savecostColumn" msprop:Generator_UserColumnName="savecost" type="xs:int" minOccurs="0" />
<xs:element name="scheapp" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="scheapp" msprop:Generator_ColumnVarNameInTable="columnscheapp" msprop:Generator_ColumnPropNameInTable="scheappColumn" msprop:Generator_UserColumnName="scheapp" type="xs:int" minOccurs="0" />
<xs:element name="equipment" msprop:Generator_ColumnVarNameInTable="columnequipment" msprop:Generator_ColumnPropNameInRow="equipment" msprop:Generator_ColumnPropNameInTable="equipmentColumn" msprop:Generator_UserColumnName="equipment" type="xs:int" minOccurs="0" />
<xs:element name="kusul" msprop:Generator_ColumnVarNameInTable="columnkusul" msprop:Generator_ColumnPropNameInRow="kusul" msprop:Generator_ColumnPropNameInTable="kusulColumn" msprop:Generator_UserColumnName="kusul" type="xs:int" minOccurs="0" />
<xs:element name="otconfirm" msprop:Generator_ColumnVarNameInTable="columnotconfirm" msprop:Generator_ColumnPropNameInRow="otconfirm" msprop:Generator_ColumnPropNameInTable="otconfirmColumn" msprop:Generator_UserColumnName="otconfirm" type="xs:int" minOccurs="0" />
<xs:element name="equipment" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="equipment" msprop:Generator_ColumnVarNameInTable="columnequipment" msprop:Generator_ColumnPropNameInTable="equipmentColumn" msprop:Generator_UserColumnName="equipment" type="xs:int" minOccurs="0" />
<xs:element name="kusul" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="kusul" msprop:Generator_ColumnVarNameInTable="columnkusul" msprop:Generator_ColumnPropNameInTable="kusulColumn" msprop:Generator_UserColumnName="kusul" type="xs:int" minOccurs="0" />
<xs:element name="otconfirm" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="otconfirm" msprop:Generator_ColumnVarNameInTable="columnotconfirm" msprop:Generator_ColumnPropNameInTable="otconfirmColumn" msprop:Generator_UserColumnName="otconfirm" type="xs:int" minOccurs="0" />
<xs:element name="kuntae" msprop:Generator_ColumnVarNameInTable="columnkuntae" msprop:Generator_ColumnPropNameInRow="kuntae" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="kuntaeColumn" msprop:Generator_UserColumnName="kuntae" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

23
SubProject/FCM0000/User/fUserAuth.Designer.cs generated
View File

@@ -42,6 +42,7 @@
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.dSUser = new FCM0000.DSUser();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
@@ -66,8 +67,8 @@
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.ta = new FCM0000.DSUserTableAdapters.AuthTableAdapter();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
@@ -289,13 +290,17 @@
this.fpSpread1.Size = new System.Drawing.Size(954, 573);
this.fpSpread1.TabIndex = 2;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 12;
this.fpSpread1_Sheet1.ColumnCount = 13;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사용자 번호";
@@ -303,6 +308,8 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "근태관리";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "프로젝트";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무일지";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "연장근무";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "근태관리";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 33F;
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
@@ -394,15 +401,19 @@
numberCellType10.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType10;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "otconfirm";
this.fpSpread1_Sheet1.Columns.Get(11).Label = "연장근무";
numberCellType11.DecimalPlaces = 0;
numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType11.MaximumValue = 2147483647D;
numberCellType11.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType11;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kuntae";
this.fpSpread1_Sheet1.Columns.Get(12).Label = "근태관리";
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// fUserAuth
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

1
SubProject/FCOMMON/Auth.cs
View File

@@ -17,6 +17,7 @@ namespace FCOMMON
savecost,
equipment,
otconfirm,
kuntae,
}
public static int getAuth(eAuthType type, string uid)
{

9
SubProject/FPJ0000/FPJ0000.csproj
View File

@@ -265,6 +265,12 @@
<Compile Include="JobReport_\fJobChartMenu.Designer.cs">
<DependentUpon>fJobChartMenu.cs</DependentUpon>
</Compile>
<Compile Include="JobReport_\rJobReportOT.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="JobReport_\rJobReportOT.Designer.cs">
<DependentUpon>rJobReportOT.cs</DependentUpon>
</Compile>
<Compile Include="OtConfirm\fOTConfirm.cs">
<SubType>Form</SubType>
</Compile>
@@ -593,6 +599,9 @@
<EmbeddedResource Include="JobReport_\fJobChartMenu.resx">
<DependentUpon>fJobChartMenu.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="JobReport_\rJobReportOT.resx">
<DependentUpon>rJobReportOT.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OtConfirm\fOTConfirm.resx">
<DependentUpon>fOTConfirm.cs</DependentUpon>
</EmbeddedResource>

394
SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs generated
View File

@@ -96,6 +96,7 @@
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.lbStt = new System.Windows.Forms.ToolStripLabel();
this.dtSD = new System.Windows.Forms.ToolStripTextBox();
@@ -115,19 +116,19 @@
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.cm.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -264,10 +265,9 @@
//
// btCopy
//
this.btCopy.Image = global::FPJ0000.Properties.Resources.copy;
this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btCopy.Name = "btCopy";
this.btCopy.Size = new System.Drawing.Size(67, 22);
this.btCopy.Size = new System.Drawing.Size(51, 22);
this.btCopy.Text = "복사(&C)";
this.btCopy.Click += new System.EventHandler(this.btCopy_Click);
//
@@ -291,9 +291,8 @@
//
// btSave
//
this.btSave.Image = global::FPJ0000.Properties.Resources.action_save;
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(66, 22);
this.btSave.Size = new System.Drawing.Size(50, 22);
this.btSave.Text = "저장(&S)";
this.btSave.Click += new System.EventHandler(this.projectsBindingNavigatorSaveItem_Click);
//
@@ -553,191 +552,6 @@
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 2;
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lbStt,
this.dtSD,
this.lbEnd,
this.toolStripLabel4,
this.dtED,
this.lbTime,
this.toolStripSeparator2,
this.toolStripLabel1,
this.tbProcess,
this.toolStripButton4,
this.toolStripLabel3,
this.cmbUser,
this.btSearch,
this.toolStripButton2,
this.toolStripButton6});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1364, 37);
this.toolStrip1.TabIndex = 4;
this.toolStrip1.Text = "toolStrip1";
//
// lbStt
//
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbStt.ForeColor = System.Drawing.Color.Blue;
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(43, 34);
this.lbStt.Text = "시작일";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(90, 37);
this.dtSD.Text = "1982-11-23";
this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// lbEnd
//
this.lbEnd.Name = "lbEnd";
this.lbEnd.Size = new System.Drawing.Size(15, 34);
this.lbEnd.Text = "~";
//
// toolStripLabel4
//
this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
this.toolStripLabel4.Name = "toolStripLabel4";
this.toolStripLabel4.Size = new System.Drawing.Size(43, 34);
this.toolStripLabel4.Text = "종료일";
this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
//
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(90, 37);
this.dtED.Text = "1982-11-23";
this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// lbTime
//
this.lbTime.Name = "lbTime";
this.lbTime.Size = new System.Drawing.Size(29, 34);
this.lbTime.Text = "{0}h";
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(31, 34);
this.toolStripLabel1.Text = "공정";
//
// tbProcess
//
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(200, 37);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.accept;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
this.toolStripLabel3.Text = "사용자";
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
// cmbUser
//
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(200, 37);
this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click);
//
// btSearch
//
this.btSearch.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.태그자료만조회ToolStripMenuItem});
this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btSearch.Name = "btSearch";
this.btSearch.Size = new System.Drawing.Size(92, 34);
this.btSearch.Text = "조회(&R)";
this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick);
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
//
// 태그자료만조회ToolStripMenuItem
//
this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
//
// toolStripButton2
//
this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(65, 34);
this.toolStripButton2.Text = "닫기";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton6
//
this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton6.Name = "toolStripButton6";
this.toolStripButton6.Size = new System.Drawing.Size(101, 34);
this.toolStripButton6.Text = "미리보기창";
this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro;
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(1364, 91);
this.richTextBox1.TabIndex = 5;
this.richTextBox1.Text = "";
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 37);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.fpSpread1);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
this.splitContainer1.Size = new System.Drawing.Size(1364, 693);
this.splitContainer1.SplitterDistance = 592;
this.splitContainer1.SplitterWidth = 10;
this.splitContainer1.TabIndex = 6;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -857,7 +671,7 @@
dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType1.TimeDefault = new System.DateTime(2021, 10, 13, 22, 53, 4, 0);
dateTimeCellType1.TimeDefault = new System.DateTime(2021, 12, 20, 22, 53, 4, 0);
this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart";
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -868,7 +682,7 @@
dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType2.TimeDefault = new System.DateTime(2021, 10, 13, 22, 53, 4, 0);
dateTimeCellType2.TimeDefault = new System.DateTime(2021, 12, 20, 22, 53, 4, 0);
this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -905,6 +719,197 @@
this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lbStt,
this.dtSD,
this.lbEnd,
this.toolStripLabel4,
this.dtED,
this.lbTime,
this.toolStripSeparator2,
this.toolStripLabel1,
this.tbProcess,
this.toolStripButton4,
this.toolStripSeparator3,
this.toolStripLabel3,
this.cmbUser,
this.btSearch,
this.toolStripButton2,
this.toolStripButton6});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1364, 37);
this.toolStrip1.TabIndex = 4;
this.toolStrip1.Text = "toolStrip1";
//
// lbStt
//
this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.lbStt.ForeColor = System.Drawing.Color.Blue;
this.lbStt.Name = "lbStt";
this.lbStt.Size = new System.Drawing.Size(43, 34);
this.lbStt.Text = "시작일";
this.lbStt.Click += new System.EventHandler(this.lbStt_Click);
//
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(90, 37);
this.dtSD.Text = "1982-11-23";
this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// lbEnd
//
this.lbEnd.Name = "lbEnd";
this.lbEnd.Size = new System.Drawing.Size(15, 34);
this.lbEnd.Text = "~";
//
// toolStripLabel4
//
this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue;
this.toolStripLabel4.Name = "toolStripLabel4";
this.toolStripLabel4.Size = new System.Drawing.Size(43, 34);
this.toolStripLabel4.Text = "종료일";
this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click);
//
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(90, 37);
this.dtED.Text = "1982-11-23";
this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// lbTime
//
this.lbTime.Name = "lbTime";
this.lbTime.Size = new System.Drawing.Size(29, 34);
this.lbTime.Text = "{0}h";
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(31, 34);
this.toolStripLabel1.Text = "공정";
//
// tbProcess
//
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(200, 37);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
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(34, 34);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(43, 34);
this.toolStripLabel3.Text = "사용자";
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
// cmbUser
//
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(200, 37);
this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click);
//
// btSearch
//
this.btSearch.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.태그자료만조회ToolStripMenuItem});
this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btSearch.Name = "btSearch";
this.btSearch.Size = new System.Drawing.Size(92, 34);
this.btSearch.Text = "조회(&R)";
this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick);
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
//
// 태그자료만조회ToolStripMenuItem
//
this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
//
// toolStripButton2
//
this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
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(65, 34);
this.toolStripButton2.Text = "닫기";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton6
//
this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton6.Name = "toolStripButton6";
this.toolStripButton6.Size = new System.Drawing.Size(101, 34);
this.toolStripButton6.Text = "미리보기창";
this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro;
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(1364, 91);
this.richTextBox1.TabIndex = 5;
this.richTextBox1.Text = "";
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.Location = new System.Drawing.Point(0, 37);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.fpSpread1);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
this.splitContainer1.Size = new System.Drawing.Size(1364, 693);
this.splitContainer1.SplitterDistance = 592;
this.splitContainer1.SplitterWidth = 10;
this.splitContainer1.TabIndex = 6;
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
//
// fJobReport
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -924,13 +929,13 @@
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
this.cm.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1004,5 +1009,6 @@
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.ToolStripButton toolStripButton6;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
}
}

20
SubProject/FPJ0000/JobReport_/fJobReport.cs
View File

@@ -46,6 +46,11 @@ namespace FPJ0000
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
if (dr.outdate.isEmpty() == false)
{
var odt = DateTime.Parse(dr.outdate);
if(odt <= DateTime.Now) continue; //퇴사자제외 211221
}
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
}
@@ -58,6 +63,11 @@ namespace FPJ0000
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
if (dr.outdate.isEmpty() == false)
{
var odt = DateTime.Parse(dr.outdate);
if (odt <= DateTime.Now) continue; //퇴사자제외 211221
}
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
}
@@ -496,7 +506,7 @@ namespace FPJ0000
//FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
//return;
}
else if(dr.ot > 0 && dr.ot2 > 0)
else if (dr.ot > 0 && dr.ot2 > 0)
{
//util.MsgE("연장/휴일 근무가 관리자에의해 확정된 상태이므로 값을 변경할 수 없습니다");
//ReadMod = true;
@@ -504,7 +514,7 @@ namespace FPJ0000
//ot데이터가잇고 관리자 확정되엇다면 처리하지 못한다
var f = new JobReport_.fJobReport_Add(dr,false,ReadMod);
var f = new JobReport_.fJobReport_Add(dr, false, ReadMod);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
if (dr.RowState != DataRowState.Unchanged && ReadMod == false)
@@ -583,7 +593,11 @@ namespace FPJ0000
FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다.");
return;
}
if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0)
{
FCOMMON.Util.MsgE("연장/휴일 근무 시간이 승인된 자료이므로 삭제할 수 없습니다");
return;
}
var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;

41
SubProject/FPJ0000/JobReport_/fJobReport.resx
View File

@@ -260,20 +260,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqioF6WpTQ3s
Zipm3uYUr4kuDLLFNDIvoYkKFaIUvajQLjq1qbnN6YZbZJqpzdvUkdOl7nKO7pz57TlnSw2EfvDhefGc
74fz+54j4CbkrjLxYrlWEVmh/R0q1VLkpHkquVNHR5YP0OGPNCNnJOrqQ1Gv9/ChnRP2oE9tsdHLRpOZ
tTrWYbVvs2zjoPHDbEPRBxNiK8acwmz5Xm/UMxGlGsvM/C92YMYF3SwDnYmBdoaBZnoDyp/r6Bh1YJ0B
WscoFL2bRcqTEeofSai0g1pzbsAwx+LLHENOBoO8ZAMq4zo+jTqJwA2DmYVuwYUSuQlBd3pe8eGYysCp
69KoTXHdVaTUXkNtZxOKmysRJPVDIEFYchohshOoaq3iV7HTDBZXnAjJUjG8ILo86G3PcBvaJp6jVlvA
SxJqwlHwMh45TbEQ1V9Ccn0yWocW0TZix8dva1glPYXK+mheIKwW7g2U5rLa8V68GJahTJnNSxLrIkj4
MtKfpkFtdPCrdE9QUJAeVhwuhBb3ewTchJWq6LyGJOiNGtTrbuNhVz5iKs8jsSYK+hkn9KRYrmD1pKcT
KxGEyHYIzt6Tuk4WHkR8tRCGyQGU9GZAJs9D7ONgNCnf4+s8Az0pdmDahX6CxeZC0H2v4JjERxwgOYCc
xjjcqAtDXNUFXpInj4ekOY28STC4e4OJxSD3iQk2UqR/rsYjCJDsmw+Q7CcP+SCgwAdXyoKR+SwJ6lEF
ShSFyHiTBFFdNPREoCP/hpYIaJebCJTbK5zL7aPNqzSG5lke1fgCbjWkI5UExfWxyG/M2rrjcG6wRNCy
LeBsc9Ztwf9wcCuk7RCcyvvsNIzPbe728G6YF5fcRxJa7d44KTK9a2p2zWkzTCy4p5YoTFkoGL0s2V08
XPN2moXJbHFTFLXqe7P9uzcuEBxP78z0F3V0HRUrrP7iFnqLVA9+fxG10L6i9pXDye3dfknyFIFAIPgD
rY6gfdVzOrEAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRL1JTmxrY
zVTMvM0pmprowiBbTCPzEpqoUCFK0YsK7aJTm5pzTjeckWnmXTed5XSpu5yjO2d+e87ZUgOhH3x4Xjzn
++H8vucIuAm6q4q/UKJVhpdqfwfLtBQ5aZ4y7tTR4SV9dOgjzfAZqbriUMTrPXxo54Q86FGbrfTyhMHE
WuzrsNi2WbZy0PixYEX+ByOiS0cdogzFXk/UPWFFGvPM3E+2b9YJnYGBzshAO8tAM7MB1cQ6WkfsWGeA
plEK+e8MSHoyTP0jCZa1UmuODQzMsfgyx5CTQT8v2UD35Do+jTiIwIWBBRY6kxOFCiMC7nS+4sNRZf7T
12QRm5LqK0iquoqqtnoUNJQhQOYDf4Ko8DSC5CdQ3lTOr2KjGSyuOBCU3s3wgsiSgLedQ81oHn+OKm0u
L4mrDEXuy1hk1kdDXHMRiTWJaBpcRPOwDR+/rWGV9BQs76F5gahCtNdPlsVqx7rwYkiOYlUGL4mvDiPh
S0h9mgL1pJ1fpWOcgpL0sGJ3Irig1y3gJqSom86uTYB+UoMa3W08bM9BVNk5xFdGQD/rgJ4UyxWsnnJ3
YiGCIPkOwdl7MufJvIOIrRBhYKoPhV1pkCuyEf04EPWq9/g6z0BPiu2bcaKXYLY6EXDfIzgm9ZIIpQeQ
WReD69UhiCk/z0uyFbGQNqSQNwkEdz9gZNHPfWKClRTpm6VxC4TSffNC6X7ykBeEuV64XByI9GcJUI8o
UajMQ9qbBIirI6EnAh35N7REQDtdRKDaXsEvq4deWKUxOM/ydI+ZcKs2FckkKKmJRk7dza07DscGSwSN
2wLONmfZFvwPO7dCyg7BqezPDv2ocXO3h3fD9MvsOhLXZPPESZGp7dOGNYdVPzbvml6iMG2mMOlhyebk
4Zq30SwMpkUXRVGr3jdavnviAsHx1LZ0X3Fr+1GJ0uIraaS3SHbj8xdxI+0tblk5nNjS4ZOgSBIIBII/
jEqgaRqp4qMAAAAASUVORK5CYII=
</value>
</data>
<data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -377,6 +377,19 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>393, 17</value>
</metadata>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGJSURBVEhL7ZS9TsQwEITzeoBo4Dko6eiRDpAQ4i0oqWg5
aICXoKKjpTQMmgkTs+tLQuhupJHXPzuffYqu22qszta7BeZ0eUXhgsLnD3u/9lf3O3+/kENghPocYKyt
uKc52+fLIZF72FctaPQrTBJCIpjbYT7CjJkmNUcwt8Nmw3EwCm+5BUU9+hJReMsOw3jxuF9u347L9fPh
YJ3xuaLwlv1FgN69n5SXclnWH6fl6umg32d8rii8ZX+poDBqrP3rizMo9ka9OAre5NZLZcBxlpih/ICM
NYToY/E9OIWyV69VLmrifqTDHowGBeNjcXjrpehzqI/EDfUNJ1CHb16P+nDBM2gG00hMrKiphi/2Ulfd
pNrhGRRj3a+R8bnqJq8d7j+v93itfpxjfC5vwugfGwy4oJhHoKif8bFwsA5So4w1QTX3nqwfNTFt4aA3
Zq5BGmXGTRMaI5jbYfXImHmqA2sw1qJ9ts+XQhGGUbWstfqfj+3zFYUoHMbFuNwLF2C5vATmdKsN6rpP
fZjWUaDH7j0AAAAASUVORK5CYII=
</value>
</data>
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

190
SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs generated Normal file
View File

@@ -0,0 +1,190 @@
namespace FPJ0000.JobReport_
{
partial class rJobReportOT
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport();
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
this.dataGridView1 = new arCtl.arDatagridView();
this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btRefresh = new System.Windows.Forms.Button();
this.tbMon = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// bs
//
this.bs.DataMember = "jobreport";
this.bs.DataSource = this.dsReport;
//
// dsReport
//
this.dsReport.DataSetName = "dsReport";
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// dataGridView1
//
this.dataGridView1.A_DelCurrentCell = true;
this.dataGridView1.A_EnterToTab = true;
this.dataGridView1.A_KoreanField = null;
this.dataGridView1.A_UpperField = null;
this.dataGridView1.A_ViewRownumOnHeader = true;
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 42);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1348, 657);
this.dataGridView1.TabIndex = 2;
//
// panel1
//
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.btRefresh);
this.panel1.Controls.Add(this.tbMon);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.panel1.Size = new System.Drawing.Size(1348, 42);
this.panel1.TabIndex = 3;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(1193, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 32);
this.button1.TabIndex = 8;
this.button1.Text = "내보내기";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tbProcess
//
this.tbProcess.FormattingEnabled = true;
this.tbProcess.Location = new System.Drawing.Point(222, 10);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(158, 20);
this.tbProcess.TabIndex = 7;
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(187, 15);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 6;
this.label1.Text = "공정";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(13, 15);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(45, 12);
this.linkLabel1.TabIndex = 0;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "조회 년";
//
// btRefresh
//
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.btRefresh.Location = new System.Drawing.Point(1268, 5);
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(75, 32);
this.btRefresh.TabIndex = 2;
this.btRefresh.Text = "새로고침";
this.btRefresh.UseVisualStyleBackColor = true;
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
//
// tbMon
//
this.tbMon.Location = new System.Drawing.Point(66, 10);
this.tbMon.Name = "tbMon";
this.tbMon.Size = new System.Drawing.Size(115, 21);
this.tbMon.TabIndex = 1;
this.tbMon.Text = "2020";
this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// rJobReportOT
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1348, 699);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.panel1);
this.Name = "rJobReportOT";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "휴일/연장근무 집계표";
this.Load += new System.EventHandler(this.rJobReport_Load);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.BindingSource bs;
private dsReport dsReport;
private dsReportTableAdapters.jobReportTableAdapter ta;
private arCtl.arDatagridView dataGridView1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Button btRefresh;
private System.Windows.Forms.TextBox tbMon;
private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button1;
}
}

148
SubProject/FPJ0000/JobReport_/rJobReportOT.cs Normal file
View File

@@ -0,0 +1,148 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace FPJ0000.JobReport_
{
public partial class rJobReportOT : Form
{
public rJobReportOT()
{
InitializeComponent();
//this.WindowState = FormWindowState.Maximized;
}
private void rJobReport_Load(object sender, EventArgs e)
{
this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
//this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
this.tbMon.Text = DateTime.Now.Year.ToString();
this.Show();
Application.DoEvents();
refrehData();
}
void refrehData()
{
////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.FillByOt2(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
//그리드뷰 생성
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.Rows.Clear();
this.dataGridView1.Columns.Clear();
this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
this.dataGridView1.ColumnHeadersHeight = 35;
this.dataGridView1.Columns.Add("공정", "공정");
this.dataGridView1.Columns.Add("이름", "이름");
//이름/년도데이터추가
var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm);
foreach (var ym in ymlist)
{
var drYm = ym.FirstOrDefault();
var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", ""));
this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\r\n(" + basehr.ToString() + ")");
}
//이름으로 정렬해서 데이터를 가져온다
var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname);
foreach (var uname in namelist)
{
var drName = uname.FirstOrDefault();
List<string> rowdata = new List<string>();
rowdata.Add(drName.UserProcess);
rowdata.Add(drName.uname + "(" + drName.uid + ")");
List<Boolean> high = new List<bool>();
List<Boolean> low = new List<bool>();
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
{
var coltitle = dataGridView1.Columns[i].HeaderText;
var basehr = int.Parse(coltitle.Split('\n')[1].Replace("(", "").Replace(")", ""));
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == dataGridView1.Columns[i].Name);
if (userDatas == null || userDatas.Count() == 0)
{
//이달에는 데이터가없다
rowdata.Add("--");
high.Add(false);
low.Add(false);
}
else
{
////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
//var sumhr = 0f;
//var sumot = 0f;
//var sumholy = 0f;
//foreach(dsReport.jobReportRow item in userDatas)
//{
// dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
//}
var sumhr = userDatas.Sum(t => t.hrs);
var sumot = userDatas.Sum(t => t.ot2);
var sumhl = userDatas.Sum(t => t.holyot2);
rowdata.Add($"휴일({sumhl})\r\n연장({sumot})");
if (sumhr > basehr) high.Add(true);
else high.Add(false);
if (sumhr < basehr) low.Add(true);
else low.Add(false);
}
}
dataGridView1.Rows.Add(rowdata.ToArray());
//이번에 추가한 줄의 셀 컬러를 지정한다
var currentrow = dataGridView1.Rows.Count - 1;
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
{
if (high[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue;
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
}
}
this.dataGridView1.AutoResizeColumns();
}
private void btRefresh_Click(object sender, EventArgs e)
{
refrehData();
}
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
}

129
SubProject/FPJ0000/JobReport_/rJobReportOT.resx Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>181, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>79, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

102
SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs generated
View File

@@ -30,14 +30,14 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -91,6 +91,7 @@
this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -183,7 +184,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -226,7 +226,6 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(100, 25);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -244,12 +243,11 @@
// toolStripButton5
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton5.Enabled = false;
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(63, 22);
this.toolStripButton5.Text = "보고서";
this.toolStripButton5.Size = new System.Drawing.Size(144, 22);
this.toolStripButton5.Text = "휴일/연장근무 집계표";
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
@@ -316,6 +314,7 @@
this.toolStripLabel1,
this.tbProcess,
this.toolStripButton4,
this.toolStripSeparator3,
this.toolStripLabel3,
this.cmbUser,
this.btSearch,
@@ -338,7 +337,6 @@
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(90, 37);
this.dtSD.Text = "1982-11-23";
@@ -362,7 +360,6 @@
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(90, 37);
this.dtED.Text = "1982-11-23";
@@ -390,14 +387,15 @@
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(350, 37);
this.tbProcess.Size = new System.Drawing.Size(300, 37);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
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(23, 34);
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -507,19 +505,19 @@
// pdateDataGridViewTextBoxColumn
//
this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle41;
this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜";
this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
this.pdateDataGridViewTextBoxColumn.Width = 54;
this.pdateDataGridViewTextBoxColumn.Width = 51;
//
// wwDataGridViewTextBoxColumn
//
this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle42;
this.wwDataGridViewTextBoxColumn.HeaderText = "WW";
this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn";
this.wwDataGridViewTextBoxColumn.ReadOnly = true;
@@ -531,7 +529,7 @@
this.usernameDataGridViewTextBoxColumn.HeaderText = "담당";
this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn";
this.usernameDataGridViewTextBoxColumn.ReadOnly = true;
this.usernameDataGridViewTextBoxColumn.Width = 54;
this.usernameDataGridViewTextBoxColumn.Width = 51;
//
// requestpartDataGridViewTextBoxColumn
//
@@ -539,7 +537,7 @@
this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서";
this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn";
this.requestpartDataGridViewTextBoxColumn.ReadOnly = true;
this.requestpartDataGridViewTextBoxColumn.Width = 78;
this.requestpartDataGridViewTextBoxColumn.Width = 61;
//
// packageDataGridViewTextBoxColumn
//
@@ -547,17 +545,17 @@
this.packageDataGridViewTextBoxColumn.HeaderText = "패키지";
this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn";
this.packageDataGridViewTextBoxColumn.ReadOnly = true;
this.packageDataGridViewTextBoxColumn.Width = 66;
this.packageDataGridViewTextBoxColumn.Width = 61;
//
// statusDataGridViewTextBoxColumn
//
this.statusDataGridViewTextBoxColumn.DataPropertyName = "status";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle43;
this.statusDataGridViewTextBoxColumn.HeaderText = "상태";
this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn";
this.statusDataGridViewTextBoxColumn.ReadOnly = true;
this.statusDataGridViewTextBoxColumn.Width = 54;
this.statusDataGridViewTextBoxColumn.Width = 51;
//
// svalueDataGridViewTextBoxColumn
//
@@ -565,7 +563,7 @@
this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류";
this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn";
this.svalueDataGridViewTextBoxColumn.ReadOnly = true;
this.svalueDataGridViewTextBoxColumn.Width = 78;
this.svalueDataGridViewTextBoxColumn.Width = 61;
//
// projectNameDataGridViewTextBoxColumn
//
@@ -578,11 +576,11 @@
// otDataGridViewTextBoxColumn
//
this.otDataGridViewTextBoxColumn.DataPropertyName = "ot";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Red;
dataGridViewCellStyle4.Format = "N1";
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle44.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Red;
dataGridViewCellStyle44.Format = "N1";
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle44;
this.otDataGridViewTextBoxColumn.HeaderText = "초과";
this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn";
this.otDataGridViewTextBoxColumn.ReadOnly = true;
@@ -591,10 +589,10 @@
// ot2DataGridViewTextBoxColumn
//
this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle45.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle45;
this.ot2DataGridViewTextBoxColumn.HeaderText = "승인";
this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn";
this.ot2DataGridViewTextBoxColumn.Width = 51;
@@ -602,8 +600,8 @@
// otReasonDataGridViewTextBoxColumn
//
this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason";
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle46.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle46;
this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유";
this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn";
this.otReasonDataGridViewTextBoxColumn.Width = 51;
@@ -611,10 +609,10 @@
// otStartDataGridViewTextBoxColumn
//
this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart";
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle7.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle47.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle47.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle47;
this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
@@ -623,10 +621,10 @@
// otEnd
//
this.otEnd.DataPropertyName = "otEnd";
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle8.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle48.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle48;
this.otEnd.HeaderText = "종료";
this.otEnd.Name = "otEnd";
this.otEnd.ReadOnly = true;
@@ -640,6 +638,11 @@
this.descriptionDataGridViewTextBoxColumn.ReadOnly = true;
this.descriptionDataGridViewTextBoxColumn.Width = 51;
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
//
// fOTConfirm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -724,5 +727,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn otEnd;
private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
}
}

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

@@ -32,6 +32,91 @@ namespace FPJ0000
Boolean binit = false;
private void __Load(object sender, EventArgs e)
{
//this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
//var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.otconfirm));
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
//foreach (dsReport.ProcessListRow dr in dtProcList)
//{
// cmbProcess.Items.Add(dr.processs);
//}
//cmbProcess.Text = FCOMMON.info.Login.process;
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
tbProcess.Text = FCOMMON.info.Login.process;
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
//담당자목록 - 사용자목록으로 처리한다.
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
// if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
// this.cmbUser.Items.Add(namestr);
UpdateUserList(); //현재사용자의 이름을 반환한다
if (curLevel >= 5)
{
if (cmbUser.Items.Count > 0)
cmbUser.SelectedIndex = 0;
}
else
{
cmbUser.Text = namestr;
dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
}
if (cmbUser.SelectedIndex < 0)
{
//내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다
this.cmbUser.Items.Add(namestr);
cmbUser.Text = namestr;
}
//var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
//foreach (var user in userList)
//{
// this.cmbUser.Items.Add(user);
//}
//state list
//var stList = FCOMMON.DBM.getCodeList("05");
//this.cmbState.Items.Clear();
//cmbState.Items.Add("-- All --");
//// cmbState.Items.Add("-- incomplete --");
//foreach (var item in stList)
// cmbState.Items.Add(item);
//this.cmbState.SelectedIndex = 0;
//일반사용자의경우에는 상태를 변경하지 못한다.
if (curLevel >= 5)
{
}
else btEdit.Enabled = false;
//210930-
if (FCOMMON.info.NotShowJobReportview)
this.splitContainer1.Panel2Collapsed = true;
refreshData();
binit = true;
}
void UpdateUserList()
{
//담당자목록 - 사용자목록으로 처리한다.
@@ -74,79 +159,6 @@ namespace FPJ0000
(int)FCOMMON.eGroupPermission.jobreport_kisul);
}
}
private void __Load(object sender, EventArgs e)
{
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
//foreach (dsReport.ProcessListRow dr in dtProcList)
//{
// cmbProcess.Items.Add(dr.processs);
//}
//cmbProcess.Text = FCOMMON.info.Login.process;
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
tbProcess.Text = FCOMMON.info.Login.process;
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
//담당자목록 - 사용자목록으로 처리한다.
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
// if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
// this.cmbUser.Items.Add(namestr);
UpdateUserList(); //현재사용자의 이름을 반환한다
if (cmbUser.Items.Count > 0)
cmbUser.SelectedIndex = 0;
if (cmbUser.SelectedIndex < 0)
{
//내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다
this.cmbUser.Items.Add(namestr);
cmbUser.Text = namestr;
}
//var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
//foreach (var user in userList)
//{
// this.cmbUser.Items.Add(user);
//}
//state list
//var stList = FCOMMON.DBM.getCodeList("05");
//this.cmbState.Items.Clear();
//cmbState.Items.Add("-- All --");
//// cmbState.Items.Add("-- incomplete --");
//foreach (var item in stList)
// cmbState.Items.Add(item);
//this.cmbState.SelectedIndex = 0;
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
if (curLevel >= 5)
{
}
//210930-
if (FCOMMON.info.NotShowJobReportview)
this.splitContainer1.Panel2Collapsed = true;
refreshData();
binit = true;
}
private void cmbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
if (binit == false) return;
@@ -464,7 +476,7 @@ namespace FPJ0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
var f = new JobReport_.rK5Dailyform();
var f = new JobReport_.rJobReportOT();
f.Show();
}

47
SubProject/FPJ0000/OtConfirm/fOTConfirm.resx
View File

@@ -181,20 +181,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3Kv+EsF70UohSyqjIF6WpTQ3s
Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc1tzm04I9NMbc45L+BlqbucoztnfnvO2VIDoR98eF48
5/vh/L7nCLgJu6dMvlihU0RX6n6HS3UUOWmeKu7U09EVWjrysWY0SKKuORzzZh8f2j0RD/vVSzZ6Zcxo
Zq2ODVjtO6zYOGj8XLCh+KMF8ZXjTmGO3Mcb9UxUmWZp0mRhtWYX9DMM9BYGOjMDzfQmlL820DnmwAYD
tI1TKH4/g7Sno9Q/knBpJ7Xu3MTQLIuvsww5GQzykk2ojBv4POYkAjeGFljo510olVsQcrf3NR+Oqwo2
XZfGbInrryKt7hrquppR0lKFEKk/ggnC0jMIk51EdVs1v4qdZrC46kSYWMXwgtiKkHe9I+1on3yBOl0h
L0mqjUThq0TkNsdD1HAJqQ2paBteRPuoHZ++r2ON9BQu66d5gbBG6BMkzWN1E314OSJDuTKHlyTXR5Hw
ZWQ+y4Da6OBX6ZmkoCA9rDpcCC8Z8Ai4iShT0fmNKTAYNWjQ38Gj7gLEVZ1Hcm0MDGYnDKRYrmD1lKcT
KxGEyXYJzt6Xuk4VHUJijRBDU1qU9mVBJs9H/JNQNCs/4NscAwMpVjvtwgBhyeZCyAOv4LjEVxwoOYjc
pgTcqI9AQvUFXpIvT4SkJYO8SSi4+yELi0HuExNspMiAPI1HECjZPxcoOUAe8kVgoS+ulIci+3kK1GMK
lCqKkPU2BaL6WBiIQE/+DR0R0C43ESh3VjiX108vrNEYnmN5VBPzuN2YiXQSFDfEo6Dp1vYdh3OTJYLW
HQFnm7XuCP6Hg1shY5fgdP4Xp3Zkamuvh/fCPDvvPprUZvfGSZGZ3aaZdadNOzrtNi1TMC1RMHpZtrt4
uObtNAujec5NUdSa382OH964QHAisys7QNTZfUyssAaIW+lt0j34/0XUSvuJOlaPpHb0+KfI0wQCgeAP
5eegBTzkqG4AAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiwF6WpTQ3s
Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05Nzeckde8zE3nBbwsdZdzdOfMb885W2og9IMPz4vn
fD+c3/ccATfBD5UJV0q1iogy7e8QqZYiJ81Tzp06OqK0jw57ph45L1FVHot8f4AP7Z3QJ72qZSu9Ojpl
Yi32TVhsu6xaOWj8WrSi4IsZMWXjDmGm/KAn6p7wYvXyxPQs2zfjhG6Wgc7MQDvDQG3agnJqE21jdmwy
QPM4hYJPs0h+MUL9IwmRtlEbji0MzLH4MceQk0E/L9lCj2ET38YcRODCwCIL3YITRXIzAh90vePD0eUB
xlvSyG1xzQ0kV99EdXsDChvLESj1QQBBWOSPYNkZVDRX8KvYaAZLaw4Ep/QwvCCqNPBj13ALWiZfo1qb
x0viq8KQ9zYOWQ0xENVeRVJtEpoHl9AyYsPXoQ2sk55CZL00LxBWCg/6S7NZ7UQ33gzLUKLM5CUJNeEk
fA1pL1OhMtj5VTonKShID2t2J0IKNW4BN6HFPXROXSL0BjVqdffxtCMX0eWXkFAVCf2MA3pSLFewatrd
iYUIgmV7BBceSZ1n848irlKIgek+FHWnQybPQczzIDQoP+PnPAM9KbbP5ISGsGx1IvCxR3BK4iX2kxxB
Vn0sbteEIrbiMi/JkcdB0phK3iQI3P2AmUU/94kJVlKkb7baLfCTHJr3kxwmD3nBL88L10uCkPEqEaox
BYoU+Uj/kAhRTRT0RKAj/4aWCGiniwiUuytczO6lF9dpDM6zPD0TC7hXl4YUEhTXxiC3/u7OHYdjiyWC
pl0BZ5uz7Ar+h51bIXWP4FzOd4dmyLC938P7YTLPu07EN9s8cVJkWodxdsNh1QwbXcYVCsZlCgYPKzYn
D9e8jWYxZZpzURS17n2nddQTFwhOp7Vn+IraOk6KFRZfcRO9Q4obn7+ImmhvUeva8aTWTp9EebJAIBD8
AcSjn/E9z3PXAAAAAElFTkSuQmCC
</value>
</data>
<data name="btEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -223,6 +223,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>186, 17</value>
</metadata>
@@ -232,6 +235,19 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>393, 17</value>
</metadata>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGJSURBVEhL7ZS9TsQwEITzeoBo4Dko6eiRDpAQ4i0oqWg5
aICXoKKjpTQMmgkTs+tLQuhupJHXPzuffYqu22qszta7BeZ0eUXhgsLnD3u/9lf3O3+/kENghPocYKyt
uKc52+fLIZF72FctaPQrTBJCIpjbYT7CjJkmNUcwt8Nmw3EwCm+5BUU9+hJReMsOw3jxuF9u347L9fPh
YJ3xuaLwlv1FgN69n5SXclnWH6fl6umg32d8rii8ZX+poDBqrP3rizMo9ka9OAre5NZLZcBxlpih/ICM
NYToY/E9OIWyV69VLmrifqTDHowGBeNjcXjrpehzqI/EDfUNJ1CHb16P+nDBM2gG00hMrKiphi/2Ulfd
pNrhGRRj3a+R8bnqJq8d7j+v93itfpxjfC5vwugfGwy4oJhHoKif8bFwsA5So4w1QTX3nqwfNTFt4aA3
Zq5BGmXGTRMaI5jbYfXImHmqA2sw1qJ9ts+XQhGGUbWstfqfj+3zFYUoHMbFuNwLF2C5vATmdKsN6rpP
fZjWUaDH7j0AAAAASUVORK5CYII=
</value>
</data>
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -256,4 +272,7 @@
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

116
SubProject/FPJ0000/dsPRJ.Designer.cs generated
View File

@@ -25339,7 +25339,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,
@@ -25354,56 +25354,63 @@ ORDER BY pdate DESC";
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND " +
"(ISNULL(import, 0) = 1) AND (gcode = @gcode)";
this._commandCollection[1].CommandText = "SELECT COUNT(*) FROM JobReport\r\nwhere gcode = @gcode and idx = @idx\r\nand isnull(o" +
"t2,0) > 0";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0)" +
" = 1) AND (gcode = @gcode)";
this._commandCollection[2].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND " +
"(ISNULL(import, 0) = 1) AND (gcode = @gcode)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type)
this._commandCollection[3].CommandText = "DELETE FROM JobReport\r\nWHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0)" +
" = 1) AND (gcode = @gcode)";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type)
AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt, ot2, otReason
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '')
ORDER BY pdate DESC";
this._commandCollection[3].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
this._commandCollection[4].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate)
AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput, ot2, otReason
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode)
ORDER BY pdate DESC";
this._commandCollection[4].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@prjname", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = @"SELECT pidx, projectName, MAX(pdate) AS pdate
this._commandCollection[5].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@prjname", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[6].Connection = this.Connection;
this._commandCollection[6].CommandText = @"SELECT pidx, projectName, MAX(pdate) AS pdate
FROM JobReport
WHERE (ISNULL(projectName, N'') LIKE @search OR
ISNULL(description, N'') LIKE @search) AND (projectName <> '') AND (gcode = @gcode)
GROUP BY pidx, projectName
ORDER BY projectName";
this._commandCollection[5].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[6].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -25483,7 +25490,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillByTagOnly(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string uid, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[3];
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -25520,7 +25527,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual dsPRJ.JobReportDataTable GetByTagOnly(string sd, string ed, string uid, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[3];
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -25555,7 +25562,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillPrjName(dsPRJ.JobReportDataTable dataTable, string sd, string ed, string prjname, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[4];
this.Adapter.SelectCommand = this.CommandCollection[5];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -25592,7 +25599,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual dsPRJ.JobReportDataTable GetPrjName(string sd, string ed, string prjname, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[4];
this.Adapter.SelectCommand = this.CommandCollection[5];
if ((sd == null)) {
this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -25627,7 +25634,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillSearch(dsPRJ.JobReportDataTable dataTable, string search, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[5];
this.Adapter.SelectCommand = this.CommandCollection[6];
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
}
@@ -25652,7 +25659,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual dsPRJ.JobReportDataTable GetSearch(string search, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[5];
this.Adapter.SelectCommand = this.CommandCollection[6];
if ((search == null)) {
throw new global::System.ArgumentNullException("search");
}
@@ -26138,8 +26145,43 @@ ORDER BY projectName";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int DeleteImport(string sd, string ed, string user, string gcode) {
public virtual global::System.Nullable<int> CheckOt2Input(string gcode, int idx) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
command.Parameters[0].Value = ((string)(gcode));
}
command.Parameters[1].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
command.Connection.Open();
}
object returnValue;
try {
returnValue = command.ExecuteScalar();
}
finally {
if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
command.Connection.Close();
}
}
if (((returnValue == null)
|| (returnValue.GetType() == typeof(global::System.DBNull)))) {
return new global::System.Nullable<int>();
}
else {
return new global::System.Nullable<int>(((int)(returnValue)));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int DeleteImport(string sd, string ed, string user, string gcode) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
if ((sd == null)) {
command.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -26186,7 +26228,7 @@ ORDER BY projectName";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, false)]
public virtual int DeleteImportAll(string sd, string ed, string gcode) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
if ((sd == null)) {
command.Parameters[0].Value = global::System.DBNull.Value;
}

17
SubProject/FPJ0000/dsPRJ.xsd
View File

@@ -914,7 +914,20 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckOt2Input" Modifier="Public" Name="CheckOt2Input" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CheckOt2Input">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT COUNT(*) FROM JobReport
where gcode = @gcode and idx = @idx
and isnull(ot2,0) &gt; 0</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="DeleteImport">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>DELETE FROM [JobReport] WHERE pdate between @sd and @ed and wuid = @user</CommandText>
@@ -938,7 +951,7 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (wuid = @user) AND (ISNULL(import, 0) = 1
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImportAll" Modifier="Public" Name="DeleteImportAll" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="DeleteImportAll">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImportAll" Modifier="Public" Name="DeleteImportAll" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="DeleteImportAll">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>DELETE FROM JobReport

4
SubProject/FPJ0000/dsPRJ.xss
View File

@@ -4,13 +4,13 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="265" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Projects" ZOrder="4" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ProjectsIOMap" ZOrder="9" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:ProjectsMailList" ZOrder="18" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ProjectsPart" ZOrder="13" X="973" Y="68" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1257" Y="66" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1257" Y="66" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ProjectsHistory" ZOrder="17" X="1881" Y="31" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:SPMaster" ZOrder="10" X="476" Y="366" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_Note" ZOrder="15" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />

454
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -540,6 +540,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnholyot;
private global::System.Data.DataColumn columnot2;
private global::System.Data.DataColumn columnholyot2;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportDataTable() {
@@ -637,6 +641,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn ot2Column {
get {
return this.columnot2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn holyot2Column {
get {
return this.columnholyot2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -674,7 +694,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot) {
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot, double ot2, double holyot2) {
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
yymm,
@@ -684,7 +704,9 @@ namespace FPJ0000 {
hrs,
ot,
UserProcess,
holyot};
holyot,
ot2,
holyot2};
rowjobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowjobReportRow);
return rowjobReportRow;
@@ -723,6 +745,8 @@ namespace FPJ0000 {
this.columnot = base.Columns["ot"];
this.columnUserProcess = base.Columns["UserProcess"];
this.columnholyot = base.Columns["holyot"];
this.columnot2 = base.Columns["ot2"];
this.columnholyot2 = base.Columns["holyot2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -744,6 +768,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnUserProcess);
this.columnholyot = new global::System.Data.DataColumn("holyot", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnholyot);
this.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnot2);
this.columnholyot2 = new global::System.Data.DataColumn("holyot2", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnholyot2);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnyymm,
this.columnuid}, true));
@@ -1491,6 +1519,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columngcode;
private global::System.Data.DataColumn columnindate;
private global::System.Data.DataColumn columnoutdate;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ProcessUserListDataTable() {
@@ -1548,6 +1580,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn indateColumn {
get {
return this.columnindate;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn outdateColumn {
get {
return this.columnoutdate;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1585,12 +1633,14 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode) {
public ProcessUserListRow AddProcessUserListRow(string id, string name, string gcode, string indate, string outdate) {
ProcessUserListRow rowProcessUserListRow = ((ProcessUserListRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
id,
name,
gcode};
gcode,
indate,
outdate};
rowProcessUserListRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProcessUserListRow);
return rowProcessUserListRow;
@@ -1616,6 +1666,8 @@ namespace FPJ0000 {
this.columnid = base.Columns["id"];
this.columnname = base.Columns["name"];
this.columngcode = base.Columns["gcode"];
this.columnindate = base.Columns["indate"];
this.columnoutdate = base.Columns["outdate"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1627,6 +1679,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnname);
this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columngcode);
this.columnindate = new global::System.Data.DataColumn("indate", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnindate);
this.columnoutdate = new global::System.Data.DataColumn("outdate", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnoutdate);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnid}, false));
this.columnid.Unique = true;
@@ -1634,6 +1690,8 @@ namespace FPJ0000 {
this.columnname.MaxLength = 100;
this.columngcode.AllowDBNull = false;
this.columngcode.MaxLength = 10;
this.columnindate.MaxLength = 20;
this.columnoutdate.MaxLength = 20;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2138,6 +2196,14 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnww;
private global::System.Data.DataColumn columnotStart;
private global::System.Data.DataColumn columnotEnd;
private global::System.Data.DataColumn columnot2;
private global::System.Data.DataColumn columnotReason;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public vJobReportForUserDataTable() {
@@ -2307,6 +2373,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn otStartColumn {
get {
return this.columnotStart;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn otEndColumn {
get {
return this.columnotEnd;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn ot2Column {
get {
return this.columnot2;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn otReasonColumn {
get {
return this.columnotReason;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2361,7 +2459,11 @@ namespace FPJ0000 {
string status,
string projectName,
string description,
string ww) {
string ww,
System.DateTime otStart,
System.DateTime otEnd,
double ot2,
string otReason) {
vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
idx,
@@ -2380,7 +2482,11 @@ namespace FPJ0000 {
status,
projectName,
description,
ww};
ww,
otStart,
otEnd,
ot2,
otReason};
rowvJobReportForUserRow.ItemArray = columnValuesArray;
this.Rows.Add(rowvJobReportForUserRow);
return rowvJobReportForUserRow;
@@ -2427,6 +2533,10 @@ namespace FPJ0000 {
this.columnprojectName = base.Columns["projectName"];
this.columndescription = base.Columns["description"];
this.columnww = base.Columns["ww"];
this.columnotStart = base.Columns["otStart"];
this.columnotEnd = base.Columns["otEnd"];
this.columnot2 = base.Columns["ot2"];
this.columnotReason = base.Columns["otReason"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2466,6 +2576,14 @@ namespace FPJ0000 {
base.Columns.Add(this.columndescription);
this.columnww = new global::System.Data.DataColumn("ww", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnww);
this.columnotStart = new global::System.Data.DataColumn("otStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotStart);
this.columnotEnd = new global::System.Data.DataColumn("otEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotEnd);
this.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnot2);
this.columnotReason = new global::System.Data.DataColumn("otReason", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotReason);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AllowDBNull = false;
@@ -2487,6 +2605,7 @@ namespace FPJ0000 {
this.columndescription.MaxLength = 2147483647;
this.columnww.ReadOnly = true;
this.columnww.MaxLength = 6;
this.columnotReason.MaxLength = 255;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3430,6 +3549,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double ot2 {
get {
if (this.Isot2Null()) {
return 0D;
}
else {
return ((double)(this[this.tablejobReport.ot2Column]));
}
}
set {
this[this.tablejobReport.ot2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double holyot2 {
get {
if (this.Isholyot2Null()) {
return 0D;
}
else {
return ((double)(this[this.tablejobReport.holyot2Column]));
}
}
set {
this[this.tablejobReport.holyot2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IstotalNull() {
@@ -3501,6 +3652,30 @@ namespace FPJ0000 {
public void SetholyotNull() {
this[this.tablejobReport.holyotColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isot2Null() {
return this.IsNull(this.tablejobReport.ot2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void Setot2Null() {
this[this.tablejobReport.ot2Column] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isholyot2Null() {
return this.IsNull(this.tablejobReport.holyot2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void Setholyot2Null() {
this[this.tablejobReport.holyot2Column] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -3735,6 +3910,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string indate {
get {
if (this.IsindateNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProcessUserList.indateColumn]));
}
}
set {
this[this.tableProcessUserList.indateColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string outdate {
get {
if (this.IsoutdateNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableProcessUserList.outdateColumn]));
}
}
set {
this[this.tableProcessUserList.outdateColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsidNull() {
@@ -3758,6 +3965,30 @@ namespace FPJ0000 {
public void SetnameNull() {
this[this.tableProcessUserList.nameColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsindateNull() {
return this.IsNull(this.tableProcessUserList.indateColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetindateNull() {
this[this.tableProcessUserList.indateColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsoutdateNull() {
return this.IsNull(this.tableProcessUserList.outdateColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetoutdateNull() {
this[this.tableProcessUserList.outdateColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -4168,6 +4399,70 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public System.DateTime otStart {
get {
try {
return ((global::System.DateTime)(this[this.tablevJobReportForUser.otStartColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otStart\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tablevJobReportForUser.otStartColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public System.DateTime otEnd {
get {
try {
return ((global::System.DateTime)(this[this.tablevJobReportForUser.otEndColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'vJobReportForUser\' 테이블의 \'otEnd\' 열의 값이 DBNull입니다.", e);
}
}
set {
this[this.tablevJobReportForUser.otEndColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public double ot2 {
get {
if (this.Isot2Null()) {
return 0D;
}
else {
return ((double)(this[this.tablevJobReportForUser.ot2Column]));
}
}
set {
this[this.tablevJobReportForUser.ot2Column] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string otReason {
get {
if (this.IsotReasonNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tablevJobReportForUser.otReasonColumn]));
}
}
set {
this[this.tablevJobReportForUser.otReasonColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IspdateNull() {
@@ -4347,6 +4642,54 @@ namespace FPJ0000 {
public void SetwwNull() {
this[this.tablevJobReportForUser.wwColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsotStartNull() {
return this.IsNull(this.tablevJobReportForUser.otStartColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetotStartNull() {
this[this.tablevJobReportForUser.otStartColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsotEndNull() {
return this.IsNull(this.tablevJobReportForUser.otEndColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetotEndNull() {
this[this.tablevJobReportForUser.otEndColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isot2Null() {
return this.IsNull(this.tablevJobReportForUser.ot2Column);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void Setot2Null() {
this[this.tablevJobReportForUser.ot2Column] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsotReasonNull() {
return this.IsNull(this.tablevJobReportForUser.otReasonColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetotReasonNull() {
this[this.tablevJobReportForUser.otReasonColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -5108,6 +5451,8 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
tableMapping.ColumnMappings.Add("holyot", "holyot");
tableMapping.ColumnMappings.Add("ot2", "ot2");
tableMapping.ColumnMappings.Add("holyot2", "holyot2");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -5121,16 +5466,27 @@ namespace FPJ0000.dsReportTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot\r\nFROM vUserWork" +
"TimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNUL" +
"L(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2\r\nFROM" +
" vUserWorkTimeList\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gco" +
"de) AND (ISNULL(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = @"SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 )
ORDER BY yymm";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5192,6 +5548,66 @@ namespace FPJ0000.dsReportTableAdapters {
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
int returnValue = this.Adapter.Fill(dataTable);
return returnValue;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual dsReport.jobReportDataTable GetByOt2(string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
}
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
}
/// <summary>
@@ -5716,6 +6132,8 @@ ORDER BY processs, JobReport.pdate, uname";
tableMapping.ColumnMappings.Add("id", "id");
tableMapping.ColumnMappings.Add("name", "name");
tableMapping.ColumnMappings.Add("gcode", "gcode");
tableMapping.ColumnMappings.Add("indate", "indate");
tableMapping.ColumnMappings.Add("outdate", "outdate");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -5759,12 +6177,12 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, JobReport.gcode
this._commandCollection[0].CommandText = @"SELECT Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
FROM EETGW_GroupUser INNER JOIN
JobReport ON EETGW_GroupUser.gcode = JobReport.gcode AND EETGW_GroupUser.uid = JobReport.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id
WHERE (Users.id <> 'dev') AND (Users.id <> 'test') AND (EETGW_GroupUser.Process LIKE @process) AND (JobReport.gcode = @gcode)
GROUP BY Users.id, Users.name, JobReport.gcode
GROUP BY Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
ORDER BY Users.name";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "Process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -6539,6 +6957,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
tableMapping.ColumnMappings.Add("projectName", "projectName");
tableMapping.ColumnMappings.Add("description", "description");
tableMapping.ColumnMappings.Add("ww", "ww");
tableMapping.ColumnMappings.Add("otStart", "otStart");
tableMapping.ColumnMappings.Add("otEnd", "otEnd");
tableMapping.ColumnMappings.Add("ot2", "ot2");
tableMapping.ColumnMappings.Add("otReason", "otReason");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -6555,10 +6977,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart," +
" package, userProcess, status, projectName, description, ww\r\nFROM vJobReport" +
"ForUser\r\nWHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)\r\nORDER BY pdate" +
"";
this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
FROM vJobReportForUser
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
ORDER BY pdate";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

63
SubProject/FPJ0000/dsReport.xsd
View File

@@ -12,7 +12,7 @@
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
ORDER BY yymm</CommandText>
@@ -34,8 +34,27 @@ ORDER BY yymm</CommandText>
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
<Mapping SourceColumn="holyot" DataSetColumn="holyot" />
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
<Mapping SourceColumn="holyot2" DataSetColumn="holyot2" />
</Mappings>
<Sources />
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByOt2" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByOt2" GeneratorSourceName="FillByOt2" GetMethodModifier="Public" GetMethodName="GetByOt2" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByOt2" UserSourceName="FillByOt2">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
and (isnull(ot2,0) &gt; 0 or isnull(holyot2,0) &gt; 0 )
ORDER BY yymm</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="yyyy" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yyyy" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</Sources>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobReportDayTableAdapter" GeneratorDataComponentClassName="JobReportDayTableAdapter" Name="JobReportDay" UserDataComponentName="JobReportDayTableAdapter">
<MainSource>
@@ -108,12 +127,12 @@ ORDER BY processs</CommandText>
</DeleteCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT Users.id, Users.name, JobReport.gcode
<CommandText>SELECT Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
FROM EETGW_GroupUser INNER JOIN
JobReport ON EETGW_GroupUser.gcode = JobReport.gcode AND EETGW_GroupUser.uid = JobReport.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id
WHERE (Users.id &lt;&gt; 'dev') AND (Users.id &lt;&gt; 'test') AND (EETGW_GroupUser.Process LIKE @process) AND (JobReport.gcode = @gcode)
GROUP BY Users.id, Users.name, JobReport.gcode
GROUP BY Users.id, Users.name, JobReport.gcode, Users.indate, Users.outdate
ORDER BY Users.name</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="Process" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="Process" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -145,6 +164,8 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
<Mapping SourceColumn="id" DataSetColumn="id" />
<Mapping SourceColumn="name" DataSetColumn="name" />
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="indate" DataSetColumn="indate" />
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
</Mappings>
<Sources />
</TableAdapter>
@@ -230,8 +251,8 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
FROM vJobReportForUser
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
ORDER BY pdate</CommandText>
@@ -262,6 +283,10 @@ ORDER BY pdate</CommandText>
<Mapping SourceColumn="projectName" DataSetColumn="projectName" />
<Mapping SourceColumn="description" DataSetColumn="description" />
<Mapping SourceColumn="ww" DataSetColumn="ww" />
<Mapping SourceColumn="otStart" DataSetColumn="otStart" />
<Mapping SourceColumn="otEnd" DataSetColumn="otEnd" />
<Mapping SourceColumn="ot2" DataSetColumn="ot2" />
<Mapping SourceColumn="otReason" DataSetColumn="otReason" />
</Mappings>
<Sources />
</TableAdapter>
@@ -308,6 +333,8 @@ ORDER BY pdate</CommandText>
</xs:simpleType>
</xs:element>
<xs:element name="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
<xs:element name="holyot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyot2" msprop:Generator_ColumnVarNameInTable="columnholyot2" msprop:Generator_ColumnPropNameInTable="holyot2Column" msprop:Generator_UserColumnName="holyot2" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -384,6 +411,20 @@ ORDER BY pdate</CommandText>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInRow="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -533,6 +574,16 @@ ORDER BY pdate</CommandText>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
<xs:element name="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
<xs:element name="ot2" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:Generator_UserColumnName="ot2" type="xs:double" minOccurs="0" />
<xs:element name="otReason" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:Generator_UserColumnName="otReason" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>

8
SubProject/FPJ0000/dsReport.xss
View File

@@ -4,14 +4,14 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="104" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="3" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="8" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="7" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="5" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PartSummary" ZOrder="6" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:K5DailyForm" ZOrder="4" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
</Shapes>