diff --git a/Project/History.txt b/Project/History.txt
index 47f2f9f..3159696 100644
--- a/Project/History.txt
+++ b/Project/History.txt
@@ -1,5 +1,7 @@
* 주간내역이 업데이트 되지 않는 데이터를 강조시키고 알림을 띄울 방안 확인
-
+190305 chi 일반사용자 자동저장되게함
+ 프로젝트편집화면에서 cost n -> o 뒤바껴 있었음
+ 전장담당자 항목 추가
190303 chi 프로젝트관리 추가 - 화면 정리 작업
아웃룩을 통한 메일 전송기능 추가
메일전송완료시 메일전송 기록 및 주간내역의 메일전송 플래그가 설정됨
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 6482776..71b0d5d 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("19.03.03.2358")]
-[assembly: AssemblyFileVersion("19.03.03.2358")]
+[assembly: AssemblyVersion("19.03.11.2300")]
+[assembly: AssemblyFileVersion("19.03.11.2300")]
diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs
index b38cf59..b129e05 100644
--- a/Project/fMain.Designer.cs
+++ b/Project/fMain.Designer.cs
@@ -49,9 +49,6 @@
this.btSetting = new System.Windows.Forms.ToolStripMenuItem();
this.btLog = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
- this.projectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.listToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.workReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.itemsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.codesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -70,6 +67,7 @@
this.freeBoardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.todoListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.업무일지ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.equipmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataFOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -117,7 +115,7 @@
this.toolStripButton5});
this.toolStrip.Location = new System.Drawing.Point(0, 4);
this.toolStrip.Name = "toolStrip";
- this.toolStrip.Size = new System.Drawing.Size(32, 165);
+ this.toolStrip.Size = new System.Drawing.Size(25, 146);
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
this.toolTip1.SetToolTip(this.toolStrip, "NR파트 구매");
@@ -128,7 +126,7 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(30, 24);
+ this.toolStripButton1.Size = new System.Drawing.Size(23, 24);
this.toolStripButton1.Text = "메일전송";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
@@ -138,7 +136,7 @@
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
- this.toolStripButton2.Size = new System.Drawing.Size(30, 24);
+ this.toolStripButton2.Size = new System.Drawing.Size(23, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
@@ -149,7 +147,7 @@
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
- this.toolStripButton3.Size = new System.Drawing.Size(30, 24);
+ this.toolStripButton3.Size = new System.Drawing.Size(23, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.ToolTipText = "프로젝트";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
@@ -160,7 +158,7 @@
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
- this.toolStripButton4.Size = new System.Drawing.Size(30, 24);
+ this.toolStripButton4.Size = new System.Drawing.Size(23, 24);
this.toolStripButton4.Text = "개인 인벤토리";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -170,7 +168,7 @@
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
- this.toolStripButton5.Size = new System.Drawing.Size(30, 24);
+ this.toolStripButton5.Size = new System.Drawing.Size(23, 24);
this.toolStripButton5.Text = "toolStripButton5";
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
@@ -254,7 +252,6 @@
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btSetting,
this.btLog,
- this.projectToolStripMenuItem,
this.commonToolStripMenuItem,
this.boardsToolStripMenuItem,
this.managementToolStripMenuItem,
@@ -266,30 +263,6 @@
this.menuStrip1.TabIndex = 29;
this.menuStrip1.Text = "menuStrip1";
//
- // projectToolStripMenuItem
- //
- this.projectToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.listToolStripMenuItem,
- this.workReportToolStripMenuItem});
- this.projectToolStripMenuItem.Name = "projectToolStripMenuItem";
- this.projectToolStripMenuItem.Size = new System.Drawing.Size(77, 23);
- this.projectToolStripMenuItem.Text = "프로젝트";
- //
- // listToolStripMenuItem
- //
- this.listToolStripMenuItem.Name = "listToolStripMenuItem";
- this.listToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
- this.listToolStripMenuItem.Text = "목록";
- this.listToolStripMenuItem.Click += new System.EventHandler(this.listToolStripMenuItem_Click);
- //
- // workReportToolStripMenuItem
- //
- this.workReportToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
- this.workReportToolStripMenuItem.Name = "workReportToolStripMenuItem";
- this.workReportToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
- this.workReportToolStripMenuItem.Text = "업무일지";
- this.workReportToolStripMenuItem.Click += new System.EventHandler(this.workReportToolStripMenuItem_Click);
- //
// commonToolStripMenuItem
//
this.commonToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -307,14 +280,14 @@
// itemsToolStripMenuItem
//
this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
- this.itemsToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
+ this.itemsToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.itemsToolStripMenuItem.Text = "품목";
this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
//
// codesToolStripMenuItem
//
this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
- this.codesToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
+ this.codesToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.codesToolStripMenuItem.Text = "공용코드";
this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
//
@@ -325,7 +298,7 @@
this.myAccouserToolStripMenuItem,
this.aDSUserListToolStripMenuItem});
this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
- this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
+ this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.userInfoToolStripMenuItem.Text = "사용자";
//
// userAccountToolStripMenuItem
@@ -353,20 +326,20 @@
// customerToolStripMenuItem
//
this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
- this.customerToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
+ this.customerToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(136, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
//
// staffGridToolStripMenuItem
//
this.staffGridToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem";
- this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
+ this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.staffGridToolStripMenuItem.Text = "Staff Grid";
this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click);
//
@@ -374,7 +347,7 @@
//
this.mailFormToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem";
- this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
+ this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.mailFormToolStripMenuItem.Text = "메일 양식";
this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click);
//
@@ -386,7 +359,8 @@
this.requestITemToolStripMenuItem,
this.freeBoardToolStripMenuItem,
this.bugReportToolStripMenuItem,
- this.todoListToolStripMenuItem});
+ this.todoListToolStripMenuItem,
+ this.업무일지ToolStripMenuItem});
this.boardsToolStripMenuItem.Name = "boardsToolStripMenuItem";
this.boardsToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
this.boardsToolStripMenuItem.Text = "문서";
@@ -395,7 +369,7 @@
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
- this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
+ this.minutesToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
//
@@ -403,7 +377,7 @@
//
this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem";
- this.holidayToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
+ this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.holidayToolStripMenuItem.Text = "휴가";
this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click);
//
@@ -411,7 +385,7 @@
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
- this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
+ this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
//
@@ -419,22 +393,30 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
- this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
+ this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
//
// bugReportToolStripMenuItem
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
- this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
+ this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
//
// todoListToolStripMenuItem
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
- this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
+ this.todoListToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
+ this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
+ //
+ // 업무일지ToolStripMenuItem
+ //
+ this.업무일지ToolStripMenuItem.Name = "업무일지ToolStripMenuItem";
+ this.업무일지ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
+ this.업무일지ToolStripMenuItem.Text = "업무일지";
+ this.업무일지ToolStripMenuItem.Click += new System.EventHandler(this.업무일지ToolStripMenuItem_Click);
//
// managementToolStripMenuItem
//
@@ -581,7 +563,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
- this.tabControl1.Size = new System.Drawing.Size(1002, 569);
+ this.tabControl1.Size = new System.Drawing.Size(1009, 569);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -594,7 +576,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(10);
- this.tabPage1.Size = new System.Drawing.Size(994, 536);
+ this.tabPage1.Size = new System.Drawing.Size(1001, 536);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "요약";
//
@@ -604,7 +586,7 @@
// toolStripContainer1.ContentPanel
//
this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1);
- this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1002, 569);
+ this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569);
this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load);
this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
//
@@ -666,8 +648,6 @@
private System.Windows.Forms.ToolStripMenuItem btLog;
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStrip toolStrip;
- private System.Windows.Forms.ToolStripMenuItem projectToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem listToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem commonToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem itemsToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel sbLogin;
@@ -700,7 +680,6 @@
private System.Windows.Forms.ToolStripMenuItem aDSUserListToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton3;
- private System.Windows.Forms.ToolStripMenuItem workReportToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
@@ -714,6 +693,7 @@
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 프로젝트ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem 업무일지ToolStripMenuItem;
}
}
diff --git a/Project/fMain.cs b/Project/fMain.cs
index 68d4a2a..c046710 100644
--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -187,6 +187,13 @@ namespace Project
AddForm(formkey, new FPJ0000.fJobReport());
}
+
+ void menu_dayhistory()
+ {
+ string formkey = "DAYHISTORY";
+ if (!ShowForm(formkey))
+ AddForm(formkey, new FPJ0000.fProjectList());
+ }
void menu_projecT_list()
{
string formkey = "PROJECTS";
@@ -411,7 +418,7 @@ namespace Project
private void workReportToolStripMenuItem_Click(object sender, EventArgs e)
{
- menu_work_report();
+
}
private void toolStripButton4_Click(object sender, EventArgs e)
@@ -513,5 +520,15 @@ namespace Project
menu_projecT_list();
}
+ private void 업무일지ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ menu_work_report();
+ }
+
+ private void todoListToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+
+ }
+
}
}
diff --git a/Project/fMain.resx b/Project/fMain.resx
index 5a0ddc9..6ae267b 100644
--- a/Project/fMain.resx
+++ b/Project/fMain.resx
@@ -143,14 +143,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5
- Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/vc15/+rr/f5t6C389/Vc6//9
+ Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/nfV5/+rr/f6t6Sz89/Vc6//9
U1J/zq71OLoqNJQZqg0B4hu7PresnfV/1sml//v2z/rfvHXC//I1rf/TF1b+j59T/j9vcfX/hlW1/2vn
- FvwqmphyLG52eQxUKwSktXReqZ0//f+uB3sx8Pa7u/+vurLx/9zTy/5PODj3f/jGnr8x8yreQrVCQFJz
+ FvwqmphyLG52eQxUKwSktXReqZ0//f+uB3sx8Pa7u/+vurLx/9zTy/5PODj3f/DGnr8x8yreQrVCQFJz
8+L43v7fME09+2ZipUF4zqll/5MXVF2AaoWApNbW1PT6+j8wRXFzyrDSIAxyRfy88tVQrRCQ0tEhk1bV
- 93/7vd0EDajfPvlH3JzSFqhWBHAI6/278Pg6sCJ8Xihe0/4xdk5ZKlQbAiTWd7/rWjcfrhAb3nRr+//o
+ 93/7vd0EDajfPvlH3JzSFqhWBLAP6v278Pg6sCJ8Xihe0/4xdk5ZKlQbAiTWd7/rWjcfrhAb3nRr+//o
eZU/EmZWmEK1IUBSc8cp+66Wv0n9+d9hOHp+xY/o+ZVwnDgl62fygpp+qBZUkFbRl5Fa2bcVyiUdpJb1
6qaVt79Pqeo3gAqRDjJqJx7OqK7/l1kz6X9aZT8KzqiZ+D8+fuLvnLop2L0AAtFV9T/mrDv0Pz2//ztU
- CA7wycFBJtD0+PgJv7NrJ/dAheAAVY6BAQA1fKFNPzDvFQAAAABJRU5ErkJggg==
+ CA7wycFBJtD0+PgJv7NrJ/dAheAAVY6BAQDpyqE0YUO1uQAAAABJRU5ErkJggg==
diff --git a/SubProject/FBS0000/dsMSSQL.xsd b/SubProject/FBS0000/dsMSSQL.xsd
index 99dd2ce..6b43db7 100644
--- a/SubProject/FBS0000/dsMSSQL.xsd
+++ b/SubProject/FBS0000/dsMSSQL.xsd
@@ -375,7 +375,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
-
+
@@ -435,7 +435,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
-
+
@@ -487,7 +487,7 @@ SELECT idx, cate, result, sdate, edate, term, title, contents, uid, tolist, mail
-
+
diff --git a/SubProject/FBS0000/fMinutes.Designer.cs b/SubProject/FBS0000/fMinutes.Designer.cs
index d6f85b7..0154cb8 100644
--- a/SubProject/FBS0000/fMinutes.Designer.cs
+++ b/SubProject/FBS0000/fMinutes.Designer.cs
@@ -48,10 +48,6 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.dv1 = new System.Windows.Forms.DataGridView();
- this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.autoColumnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.ta = new FBS0000.dsMSSQLTableAdapters.minutesTableAdapter();
- this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager();
this.idxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.stimeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -59,6 +55,10 @@
this.mainDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.projectDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.autoColumnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.ta = new FBS0000.dsMSSQLTableAdapters.minutesTableAdapter();
+ this.tam = new FBS0000.dsMSSQLTableAdapters.TableAdapterManager();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -88,14 +88,14 @@
this.bindingNavigatorDeleteItem,
this.toolStripButton1,
this.toolStripButton2});
- this.bn.Location = new System.Drawing.Point(0, 481);
+ this.bn.Location = new System.Drawing.Point(0, 514);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
- this.bn.Size = new System.Drawing.Size(735, 25);
+ this.bn.Size = new System.Drawing.Size(924, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -232,37 +232,10 @@
this.dv1.Location = new System.Drawing.Point(0, 0);
this.dv1.Name = "dv1";
this.dv1.RowTemplate.Height = 23;
- this.dv1.Size = new System.Drawing.Size(735, 481);
+ this.dv1.Size = new System.Drawing.Size(924, 514);
this.dv1.TabIndex = 1;
this.dv1.DoubleClick += new System.EventHandler(this.dv1_DoubleClick);
//
- // cm1
- //
- this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.autoColumnSizeToolStripMenuItem});
- this.cm1.Name = "cm1";
- this.cm1.Size = new System.Drawing.Size(170, 26);
- //
- // autoColumnSizeToolStripMenuItem
- //
- this.autoColumnSizeToolStripMenuItem.Name = "autoColumnSizeToolStripMenuItem";
- this.autoColumnSizeToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
- this.autoColumnSizeToolStripMenuItem.Text = "AutoColumn Size";
- this.autoColumnSizeToolStripMenuItem.Click += new System.EventHandler(this.autoColumnSizeToolStripMenuItem_Click);
- //
- // ta
- //
- this.ta.ClearBeforeFill = true;
- //
- // tam
- //
- this.tam.BackupDataSetBeforeUpdate = false;
- this.tam.BoardTableAdapter = null;
- this.tam.Connection = null;
- this.tam.HolydayTableAdapter = null;
- this.tam.minutesTableAdapter = null;
- this.tam.UpdateOrder = FBS0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
- //
// idxDataGridViewTextBoxColumn
//
this.idxDataGridViewTextBoxColumn.DataPropertyName = "idx";
@@ -308,11 +281,38 @@
this.memoDataGridViewTextBoxColumn.HeaderText = "memo";
this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
//
+ // cm1
+ //
+ this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.autoColumnSizeToolStripMenuItem});
+ this.cm1.Name = "cm1";
+ this.cm1.Size = new System.Drawing.Size(170, 26);
+ //
+ // autoColumnSizeToolStripMenuItem
+ //
+ this.autoColumnSizeToolStripMenuItem.Name = "autoColumnSizeToolStripMenuItem";
+ this.autoColumnSizeToolStripMenuItem.Size = new System.Drawing.Size(169, 22);
+ this.autoColumnSizeToolStripMenuItem.Text = "AutoColumn Size";
+ this.autoColumnSizeToolStripMenuItem.Click += new System.EventHandler(this.autoColumnSizeToolStripMenuItem_Click);
+ //
+ // ta
+ //
+ this.ta.ClearBeforeFill = true;
+ //
+ // tam
+ //
+ this.tam.BackupDataSetBeforeUpdate = false;
+ this.tam.BoardTableAdapter = null;
+ this.tam.Connection = null;
+ this.tam.HolydayTableAdapter = null;
+ this.tam.minutesTableAdapter = null;
+ this.tam.UpdateOrder = FBS0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+ //
// fMinutes
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(735, 506);
+ this.ClientSize = new System.Drawing.Size(924, 539);
this.Controls.Add(this.dv1);
this.Controls.Add(this.bn);
this.Name = "fMinutes";
diff --git a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs
index fd78790..7a537fa 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs
@@ -34,11 +34,14 @@
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.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 numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+ 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.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 textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -68,7 +71,6 @@
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();
@@ -81,14 +83,15 @@
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
this.btSearch = new System.Windows.Forms.ToolStripButton();
+ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((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.fpSpread1_Sheet1)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -313,7 +316,9 @@
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.JobReportTableAdapter = this.ta;
+ this.tam.ProjectsHistoryTableAdapter = null;
this.tam.ProjectsIOMapTableAdapter = null;
+ this.tam.ProjectsMailListTableAdapter = null;
this.tam.ProjectsPartTableAdapter = null;
this.tam.ProjectsScheduleTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
@@ -336,71 +341,6 @@
this.fpSpread1.Size = new System.Drawing.Size(1142, 539);
this.fpSpread1.TabIndex = 2;
//
- // 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 = 9;
- this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
- this.fpSpread1_Sheet1.ActiveRowIndex = -1;
- this.fpSpread1_Sheet1.AutoGenerateColumns = false;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "Date";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Group";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "User";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Project";
- 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 = "Type";
- this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
- this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
- this.fpSpread1_Sheet1.Columns.Get(0).Label = "Date";
- this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
- this.fpSpread1_Sheet1.Columns.Get(1).DataField = "group";
- this.fpSpread1_Sheet1.Columns.Get(1).Label = "Group";
- this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F;
- this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
- this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username";
- this.fpSpread1_Sheet1.Columns.Get(2).Label = "User";
- this.fpSpread1_Sheet1.Columns.Get(2).Width = 74F;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
- this.fpSpread1_Sheet1.Columns.Get(3).DataField = "project";
- this.fpSpread1_Sheet1.Columns.Get(3).Label = "Project";
- this.fpSpread1_Sheet1.Columns.Get(3).Width = 109F;
- this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType1.DecimalPlaces = 0;
- numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType1.MaximumValue = 2147483647D;
- numberCellType1.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType1;
- this.fpSpread1_Sheet1.Columns.Get(4).DataField = "projectidx";
- this.fpSpread1_Sheet1.Columns.Get(4).Label = "*";
- this.fpSpread1_Sheet1.Columns.Get(4).Width = 88F;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5;
- this.fpSpread1_Sheet1.Columns.Get(5).DataField = "progress";
- this.fpSpread1_Sheet1.Columns.Get(5).Label = "%";
- this.fpSpread1_Sheet1.Columns.Get(5).Width = 73F;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6;
- this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type";
- this.fpSpread1_Sheet1.Columns.Get(6).Label = "Type";
- this.fpSpread1_Sheet1.Columns.Get(6).Width = 34F;
- numberCellType2.MaximumValue = 999999999999999D;
- numberCellType2.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2;
- this.fpSpread1_Sheet1.Columns.Get(7).DataField = "hrs";
- this.fpSpread1_Sheet1.Columns.Get(7).Width = 25F;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
- this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo";
- this.fpSpread1_Sheet1.Columns.Get(8).Width = 113F;
- 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;
- //
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -494,6 +434,85 @@
this.btSearch.Text = "Refresh(&R)";
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
//
+ // 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.ActiveColumnIndex = -1;
+ this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+ this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+ 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 = "WW";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요일";
+ 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, 7).Value = "TYPE";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Project";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "*";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고";
+ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
+ 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).CellType = textCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(0).DataField = "username";
+ this.fpSpread1_Sheet1.Columns.Get(0).Label = "담당자";
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pdate";
+ this.fpSpread1_Sheet1.Columns.Get(1).Label = "날짜";
+ this.fpSpread1_Sheet1.Columns.Get(1).Width = 58F;
+ this.fpSpread1_Sheet1.Columns.Get(2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
+ this.fpSpread1_Sheet1.Columns.Get(2).DataField = "ww";
+ this.fpSpread1_Sheet1.Columns.Get(2).Label = "WW";
+ this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
+ this.fpSpread1_Sheet1.Columns.Get(3).DataField = "week";
+ this.fpSpread1_Sheet1.Columns.Get(3).Label = "요일";
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
+ this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestpart";
+ this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청부서";
+ this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
+ this.fpSpread1_Sheet1.Columns.Get(5).DataField = "requestpart";
+ this.fpSpread1_Sheet1.Columns.Get(5).Label = "적용패키지";
+ this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
+ this.fpSpread1_Sheet1.Columns.Get(6).DataField = "status";
+ this.fpSpread1_Sheet1.Columns.Get(6).Label = "상태";
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
+ this.fpSpread1_Sheet1.Columns.Get(7).DataField = "type";
+ this.fpSpread1_Sheet1.Columns.Get(7).Label = "TYPE";
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
+ this.fpSpread1_Sheet1.Columns.Get(8).DataField = "project";
+ this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project";
+ this.fpSpread1_Sheet1.Columns.Get(8).Width = 109F;
+ this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ numberCellType1.DecimalPlaces = 0;
+ numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType1.MaximumValue = 2147483647D;
+ numberCellType1.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectidx";
+ this.fpSpread1_Sheet1.Columns.Get(9).Label = "*";
+ this.fpSpread1_Sheet1.Columns.Get(9).Width = 88F;
+ numberCellType2.MaximumValue = 999999999999999D;
+ numberCellType2.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs";
+ this.fpSpread1_Sheet1.Columns.Get(10).Width = 25F;
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10;
+ this.fpSpread1_Sheet1.Columns.Get(11).DataField = "remark";
+ this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고";
+ this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F;
+ 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;
+ //
// fJobReport
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -513,9 +532,9 @@
((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();
+ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs
index 09c759b..06adef5 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport.cs
@@ -28,6 +28,9 @@ namespace FPJ0000
private void __Load(object sender, EventArgs e)
{
+ this.dtSD.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
+ this.dtED.Text = DateTime.Now.ToShortDateString();
+
//프로젝트 목록을 처리함
this.tbRequest.Text = FCOMMON.info.Login.nameK;
@@ -71,10 +74,9 @@ namespace FPJ0000
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["type"] = "02";//other
- e.Row["uid"] = FCOMMON.info.Login.no;
- e.Row["process"] = "Done";
- e.Row["Group"] = "Automation";
- e.Row["hrs"] = 0.5;
+ e.Row["uid"] = FCOMMON.info.Login.no;
+ e.Row["hrs"] = 1.0;
+ e.Row["pdate"] = DateTime.Now.ToShortDateString();
}
private void refreshToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/SubProject/FPJ0000/JobReport/fJobReport.resx b/SubProject/FPJ0000/JobReport/fJobReport.resx
index 983fa36..7550087 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport.resx
+++ b/SubProject/FPJ0000/JobReport/fJobReport.resx
@@ -244,10 +244,10 @@
186, 17
- 651, 17
+ 499, 17
- 17, 56
+ 561, 17
393, 17
diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs
index 8127cb2..34c2820 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.Designer.cs
@@ -31,18 +31,18 @@
this.components = new System.ComponentModel.Container();
System.Windows.Forms.Label groupLabel;
System.Windows.Forms.Label uidLabel;
- System.Windows.Forms.Label progressLabel;
System.Windows.Forms.Label memoLabel;
System.Windows.Forms.Label hrsLabel;
System.Windows.Forms.Label projectLabel;
System.Windows.Forms.Label typeLabel;
+ System.Windows.Forms.Label label1;
+ System.Windows.Forms.Label label2;
this.dsPRJ = new FPJ0000.dsPRJ();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.pdateTextBox = new System.Windows.Forms.TextBox();
this.groupTextBox = new System.Windows.Forms.TextBox();
- this.progressTextBox = new System.Windows.Forms.TextBox();
this.memoTextBox = new System.Windows.Forms.TextBox();
this.hrsTextBox = new System.Windows.Forms.TextBox();
this.projectidxTextBox = new System.Windows.Forms.TextBox();
@@ -54,18 +54,93 @@
this.typeComboBox = new System.Windows.Forms.ComboBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.button1 = new System.Windows.Forms.Button();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
groupLabel = new System.Windows.Forms.Label();
uidLabel = new System.Windows.Forms.Label();
- progressLabel = new System.Windows.Forms.Label();
memoLabel = new System.Windows.Forms.Label();
hrsLabel = new System.Windows.Forms.Label();
projectLabel = new System.Windows.Forms.Label();
typeLabel = new System.Windows.Forms.Label();
+ label1 = new System.Windows.Forms.Label();
+ label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
+ // groupLabel
+ //
+ groupLabel.AutoSize = true;
+ groupLabel.Location = new System.Drawing.Point(43, 68);
+ groupLabel.Name = "groupLabel";
+ groupLabel.Size = new System.Drawing.Size(47, 12);
+ groupLabel.TabIndex = 6;
+ groupLabel.Text = "request";
+ //
+ // uidLabel
+ //
+ uidLabel.AutoSize = true;
+ uidLabel.Location = new System.Drawing.Point(64, 15);
+ uidLabel.Name = "uidLabel";
+ uidLabel.Size = new System.Drawing.Size(26, 12);
+ uidLabel.TabIndex = 8;
+ uidLabel.Text = "uid:";
+ //
+ // memoLabel
+ //
+ memoLabel.AutoSize = true;
+ memoLabel.Location = new System.Drawing.Point(46, 236);
+ memoLabel.Name = "memoLabel";
+ memoLabel.Size = new System.Drawing.Size(44, 12);
+ memoLabel.TabIndex = 12;
+ memoLabel.Text = "remark";
+ //
+ // hrsLabel
+ //
+ hrsLabel.AutoSize = true;
+ hrsLabel.Location = new System.Drawing.Point(188, 123);
+ hrsLabel.Name = "hrsLabel";
+ hrsLabel.Size = new System.Drawing.Size(27, 12);
+ hrsLabel.TabIndex = 16;
+ hrsLabel.Text = "hrs:";
+ //
+ // projectLabel
+ //
+ projectLabel.AutoSize = true;
+ projectLabel.Location = new System.Drawing.Point(43, 150);
+ projectLabel.Name = "projectLabel";
+ projectLabel.Size = new System.Drawing.Size(47, 12);
+ projectLabel.TabIndex = 26;
+ projectLabel.Text = "project:";
+ //
+ // typeLabel
+ //
+ typeLabel.AutoSize = true;
+ typeLabel.Location = new System.Drawing.Point(57, 123);
+ typeLabel.Name = "typeLabel";
+ typeLabel.Size = new System.Drawing.Size(33, 12);
+ typeLabel.TabIndex = 29;
+ typeLabel.Text = "type:";
+ //
+ // label1
+ //
+ label1.AutoSize = true;
+ label1.Location = new System.Drawing.Point(37, 95);
+ label1.Name = "label1";
+ label1.Size = new System.Drawing.Size(53, 12);
+ label1.TabIndex = 33;
+ label1.Text = "package";
+ //
+ // label2
+ //
+ label2.AutoSize = true;
+ label2.Location = new System.Drawing.Point(22, 177);
+ label2.Name = "label2";
+ label2.Size = new System.Drawing.Size(68, 12);
+ label2.TabIndex = 35;
+ label2.Text = "Description";
+ //
// dsPRJ
//
this.dsPRJ.DataSetName = "dsPRJ";
@@ -84,92 +159,42 @@
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.JobReportTableAdapter = this.ta;
+ this.tam.ProjectsHistoryTableAdapter = null;
+ this.tam.ProjectsIOMapTableAdapter = null;
+ this.tam.ProjectsMailListTableAdapter = null;
this.tam.ProjectsPartTableAdapter = null;
+ this.tam.ProjectsScheduleTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// pdateTextBox
//
this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "pdate", true));
- this.pdateTextBox.Location = new System.Drawing.Point(89, 65);
+ this.pdateTextBox.Location = new System.Drawing.Point(98, 38);
this.pdateTextBox.Name = "pdateTextBox";
this.pdateTextBox.Size = new System.Drawing.Size(200, 21);
this.pdateTextBox.TabIndex = 5;
//
- // groupLabel
- //
- groupLabel.AutoSize = true;
- groupLabel.Location = new System.Drawing.Point(42, 41);
- groupLabel.Name = "groupLabel";
- groupLabel.Size = new System.Drawing.Size(41, 12);
- groupLabel.TabIndex = 6;
- groupLabel.Text = "group:";
- //
// groupTextBox
//
- this.groupTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "group", true));
- this.groupTextBox.Location = new System.Drawing.Point(90, 38);
+ this.groupTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "requestpart", true));
+ this.groupTextBox.Location = new System.Drawing.Point(98, 65);
this.groupTextBox.Name = "groupTextBox";
this.groupTextBox.Size = new System.Drawing.Size(200, 21);
this.groupTextBox.TabIndex = 7;
//
- // uidLabel
- //
- uidLabel.AutoSize = true;
- uidLabel.Location = new System.Drawing.Point(57, 15);
- uidLabel.Name = "uidLabel";
- uidLabel.Size = new System.Drawing.Size(26, 12);
- uidLabel.TabIndex = 8;
- uidLabel.Text = "uid:";
- //
- // progressLabel
- //
- progressLabel.AutoSize = true;
- progressLabel.Location = new System.Drawing.Point(24, 98);
- progressLabel.Name = "progressLabel";
- progressLabel.Size = new System.Drawing.Size(59, 12);
- progressLabel.TabIndex = 10;
- progressLabel.Text = "progress:";
- //
- // progressTextBox
- //
- this.progressTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "progress", true));
- this.progressTextBox.Location = new System.Drawing.Point(90, 95);
- this.progressTextBox.Name = "progressTextBox";
- this.progressTextBox.Size = new System.Drawing.Size(200, 21);
- this.progressTextBox.TabIndex = 11;
- //
- // memoLabel
- //
- memoLabel.AutoSize = true;
- memoLabel.Location = new System.Drawing.Point(38, 180);
- memoLabel.Name = "memoLabel";
- memoLabel.Size = new System.Drawing.Size(45, 12);
- memoLabel.TabIndex = 12;
- memoLabel.Text = "memo:";
- //
// memoTextBox
//
- this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true));
- this.memoTextBox.Location = new System.Drawing.Point(90, 177);
- this.memoTextBox.Multiline = true;
+ this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark", true));
+ this.memoTextBox.Location = new System.Drawing.Point(98, 233);
this.memoTextBox.Name = "memoTextBox";
- this.memoTextBox.Size = new System.Drawing.Size(200, 51);
+ this.memoTextBox.Size = new System.Drawing.Size(200, 21);
this.memoTextBox.TabIndex = 13;
//
- // hrsLabel
- //
- hrsLabel.AutoSize = true;
- hrsLabel.Location = new System.Drawing.Point(179, 127);
- hrsLabel.Name = "hrsLabel";
- hrsLabel.Size = new System.Drawing.Size(27, 12);
- hrsLabel.TabIndex = 16;
- hrsLabel.Text = "hrs:";
- //
// hrsTextBox
//
this.hrsTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true));
- this.hrsTextBox.Location = new System.Drawing.Point(213, 124);
+ this.hrsTextBox.Location = new System.Drawing.Point(221, 120);
this.hrsTextBox.Name = "hrsTextBox";
this.hrsTextBox.Size = new System.Drawing.Size(77, 21);
this.hrsTextBox.TabIndex = 17;
@@ -177,26 +202,17 @@
// projectidxTextBox
//
this.projectidxTextBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.projectidxTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "projectidx", true));
- this.projectidxTextBox.Location = new System.Drawing.Point(239, 150);
+ this.projectidxTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "pidx", true));
+ this.projectidxTextBox.Location = new System.Drawing.Point(247, 147);
this.projectidxTextBox.Name = "projectidxTextBox";
this.projectidxTextBox.Size = new System.Drawing.Size(51, 21);
this.projectidxTextBox.TabIndex = 25;
this.projectidxTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
- // projectLabel
- //
- projectLabel.AutoSize = true;
- projectLabel.Location = new System.Drawing.Point(36, 153);
- projectLabel.Name = "projectLabel";
- projectLabel.Size = new System.Drawing.Size(47, 12);
- projectLabel.TabIndex = 26;
- projectLabel.Text = "project:";
- //
// projectTextBox
//
- this.projectTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "project", true));
- this.projectTextBox.Location = new System.Drawing.Point(90, 150);
+ this.projectTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "projectName", true));
+ this.projectTextBox.Location = new System.Drawing.Point(99, 147);
this.projectTextBox.Name = "projectTextBox";
this.projectTextBox.Size = new System.Drawing.Size(143, 21);
this.projectTextBox.TabIndex = 27;
@@ -206,9 +222,9 @@
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1,
this.lbIndex});
- this.statusStrip1.Location = new System.Drawing.Point(0, 278);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 308);
this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(302, 22);
+ this.statusStrip1.Size = new System.Drawing.Size(316, 22);
this.statusStrip1.TabIndex = 28;
this.statusStrip1.Text = "statusStrip1";
//
@@ -228,25 +244,16 @@
//
this.comboBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "uid", true));
this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Location = new System.Drawing.Point(90, 12);
+ this.comboBox1.Location = new System.Drawing.Point(98, 12);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(200, 20);
this.comboBox1.TabIndex = 29;
//
- // typeLabel
- //
- typeLabel.AutoSize = true;
- typeLabel.Location = new System.Drawing.Point(50, 127);
- typeLabel.Name = "typeLabel";
- typeLabel.Size = new System.Drawing.Size(33, 12);
- typeLabel.TabIndex = 29;
- typeLabel.Text = "type:";
- //
// typeComboBox
//
this.typeComboBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "type", true));
this.typeComboBox.FormattingEnabled = true;
- this.typeComboBox.Location = new System.Drawing.Point(90, 124);
+ this.typeComboBox.Location = new System.Drawing.Point(98, 120);
this.typeComboBox.Name = "typeComboBox";
this.typeComboBox.Size = new System.Drawing.Size(77, 20);
this.typeComboBox.TabIndex = 30;
@@ -254,7 +261,7 @@
// linkLabel1
//
this.linkLabel1.AutoSize = true;
- this.linkLabel1.Location = new System.Drawing.Point(49, 68);
+ this.linkLabel1.Location = new System.Drawing.Point(60, 41);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(30, 12);
this.linkLabel1.TabIndex = 31;
@@ -264,7 +271,7 @@
//
// button1
//
- this.button1.Location = new System.Drawing.Point(89, 233);
+ this.button1.Location = new System.Drawing.Point(97, 260);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(201, 31);
this.button1.TabIndex = 32;
@@ -272,11 +279,32 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
+ // textBox1
+ //
+ this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "package", true));
+ this.textBox1.Location = new System.Drawing.Point(98, 92);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(200, 21);
+ this.textBox1.TabIndex = 34;
+ //
+ // textBox2
+ //
+ this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
+ this.textBox2.Location = new System.Drawing.Point(99, 174);
+ this.textBox2.Multiline = true;
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(200, 51);
+ this.textBox2.TabIndex = 36;
+ //
// fJobReport_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(302, 300);
+ this.ClientSize = new System.Drawing.Size(316, 330);
+ this.Controls.Add(label2);
+ this.Controls.Add(this.textBox2);
+ this.Controls.Add(label1);
+ this.Controls.Add(this.textBox1);
this.Controls.Add(this.button1);
this.Controls.Add(this.linkLabel1);
this.Controls.Add(typeLabel);
@@ -287,8 +315,6 @@
this.Controls.Add(groupLabel);
this.Controls.Add(this.groupTextBox);
this.Controls.Add(uidLabel);
- this.Controls.Add(progressLabel);
- this.Controls.Add(this.progressTextBox);
this.Controls.Add(memoLabel);
this.Controls.Add(this.memoTextBox);
this.Controls.Add(hrsLabel);
@@ -319,7 +345,6 @@
private dsPRJTableAdapters.TableAdapterManager tam;
private System.Windows.Forms.TextBox pdateTextBox;
private System.Windows.Forms.TextBox groupTextBox;
- private System.Windows.Forms.TextBox progressTextBox;
private System.Windows.Forms.TextBox memoTextBox;
private System.Windows.Forms.TextBox hrsTextBox;
private System.Windows.Forms.TextBox projectidxTextBox;
@@ -331,5 +356,7 @@
private System.Windows.Forms.ComboBox typeComboBox;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.TextBox textBox2;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport/fJobReport_Add.resx
index 3720edb..e86b9fe 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport_Add.resx
+++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.resx
@@ -117,6 +117,30 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
17, 17
@@ -129,28 +153,7 @@
226, 17
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
299, 17
-
- False
-
\ No newline at end of file
diff --git a/SubProject/FPJ0000/dsMail.Designer.cs b/SubProject/FPJ0000/dsMail.Designer.cs
index 2c516df..558a51e 100644
--- a/SubProject/FPJ0000/dsMail.Designer.cs
+++ b/SubProject/FPJ0000/dsMail.Designer.cs
@@ -2198,12 +2198,18 @@ SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate FR
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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 idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate\r\nF" +
"ROM MailData\r\nORDER BY pdate, cate";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[1].Connection = this.Connection;
+ this._commandCollection[1].CommandText = "SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate\r\nF" +
+ "ROM MailData\r\nwhere project = @project";
+ this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2230,6 +2236,42 @@ SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate FR
return dataTable;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
+ public virtual int FillByProject(dsMail.MailDataDataTable dataTable, global::System.Nullable project) {
+ this.Adapter.SelectCommand = this.CommandCollection[1];
+ if ((project.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[0].Value = ((int)(project.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
+ }
+ 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", "4.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual dsMail.MailDataDataTable GetbyProject(global::System.Nullable project) {
+ this.Adapter.SelectCommand = this.CommandCollection[1];
+ if ((project.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[0].Value = ((int)(project.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
+ }
+ dsMail.MailDataDataTable dataTable = new dsMail.MailDataDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
diff --git a/SubProject/FPJ0000/dsMail.xsd b/SubProject/FPJ0000/dsMail.xsd
index cfd21b0..9b4a685 100644
--- a/SubProject/FPJ0000/dsMail.xsd
+++ b/SubProject/FPJ0000/dsMail.xsd
@@ -95,7 +95,20 @@ SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate FR
-
+
+
+
+
+ SELECT idx, project, cate, pdate, subject, tolist, bcc, cc, body, wuid, wdate
+FROM MailData
+where project = @project
+
+
+
+
+
+
+
@@ -214,7 +227,7 @@ SELECT idx, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, selfCC, s
-
+
@@ -282,7 +295,7 @@ SELECT idx, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, selfCC, s
-
+
diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs
index 0916587..ba07a7a 100644
--- a/SubProject/FPJ0000/dsPRJ.Designer.cs
+++ b/SubProject/FPJ0000/dsPRJ.Designer.cs
@@ -563,6 +563,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnpath;
+ private global::System.Data.DataColumn columnuserhw2;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public ProjectsDataTable() :
@@ -853,6 +855,14 @@ namespace FPJ0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn userhw2Column {
+ get {
+ return this.columnuserhw2;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -920,7 +930,8 @@ namespace FPJ0000 {
bool import,
string asset,
bool isdel,
- string path) {
+ string path,
+ string userhw2) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -953,7 +964,8 @@ namespace FPJ0000 {
import,
asset,
isdel,
- path};
+ path,
+ userhw2};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -990,7 +1002,8 @@ namespace FPJ0000 {
bool import,
string asset,
bool isdel,
- string path) {
+ string path,
+ string userhw2) {
ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -1023,7 +1036,8 @@ namespace FPJ0000 {
import,
asset,
isdel,
- path};
+ path,
+ userhw2};
rowProjectsRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProjectsRow);
return rowProjectsRow;
@@ -1084,6 +1098,7 @@ namespace FPJ0000 {
this.columnasset = base.Columns["asset"];
this.columnisdel = base.Columns["isdel"];
this.columnpath = base.Columns["path"];
+ this.columnuserhw2 = base.Columns["userhw2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1151,6 +1166,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnisdel);
this.columnpath = new global::System.Data.DataColumn("path", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnpath);
+ this.columnuserhw2 = new global::System.Data.DataColumn("userhw2", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnuserhw2);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -1181,6 +1198,7 @@ namespace FPJ0000 {
this.columnddate.MaxLength = 50;
this.columnasset.MaxLength = 100;
this.columnpath.MaxLength = 300;
+ this.columnuserhw2.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1810,14 +1828,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnpdate;
- private global::System.Data.DataColumn columngroup;
-
private global::System.Data.DataColumn columnuid;
- private global::System.Data.DataColumn columnprogress;
-
- private global::System.Data.DataColumn columnmemo;
-
private global::System.Data.DataColumn columntype;
private global::System.Data.DataColumn columnhrs;
@@ -1828,9 +1840,25 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnusername;
- private global::System.Data.DataColumn columnprojectidx;
+ private global::System.Data.DataColumn columnpidx;
- private global::System.Data.DataColumn columnproject;
+ private global::System.Data.DataColumn columnrequestpart;
+
+ private global::System.Data.DataColumn columnpackage;
+
+ private global::System.Data.DataColumn columnstatus;
+
+ private global::System.Data.DataColumn columndescription;
+
+ private global::System.Data.DataColumn columnremark;
+
+ private global::System.Data.DataColumn columnimport;
+
+ private global::System.Data.DataColumn columnprojectName;
+
+ private global::System.Data.DataColumn columnww;
+
+ private global::System.Data.DataColumn columnweek;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
@@ -1881,14 +1909,6 @@ namespace FPJ0000 {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public global::System.Data.DataColumn groupColumn {
- get {
- return this.columngroup;
- }
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn uidColumn {
@@ -1897,22 +1917,6 @@ namespace FPJ0000 {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public global::System.Data.DataColumn progressColumn {
- get {
- return this.columnprogress;
- }
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public global::System.Data.DataColumn memoColumn {
- get {
- return this.columnmemo;
- }
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn typeColumn {
@@ -1955,17 +1959,81 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public global::System.Data.DataColumn projectidxColumn {
+ public global::System.Data.DataColumn pidxColumn {
get {
- return this.columnprojectidx;
+ return this.columnpidx;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public global::System.Data.DataColumn projectColumn {
+ public global::System.Data.DataColumn requestpartColumn {
get {
- return this.columnproject;
+ return this.columnrequestpart;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn packageColumn {
+ get {
+ return this.columnpackage;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn statusColumn {
+ get {
+ return this.columnstatus;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn descriptionColumn {
+ get {
+ return this.columndescription;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn remarkColumn {
+ get {
+ return this.columnremark;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn importColumn {
+ get {
+ return this.columnimport;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn projectNameColumn {
+ get {
+ return this.columnprojectName;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn wwColumn {
+ get {
+ return this.columnww;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn weekColumn {
+ get {
+ return this.columnweek;
}
}
@@ -2006,22 +2074,44 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public JobReportRow AddJobReportRow(string pdate, string group, string uid, string progress, string memo, string type, double hrs, string wuid, System.DateTime wdate, string username, int projectidx, string project) {
+ public JobReportRow AddJobReportRow(
+ string pdate,
+ string uid,
+ string type,
+ double hrs,
+ string wuid,
+ System.DateTime wdate,
+ string username,
+ int pidx,
+ string requestpart,
+ string package,
+ string status,
+ string description,
+ string remark,
+ bool import,
+ string projectName,
+ string ww,
+ string week) {
JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
pdate,
- group,
uid,
- progress,
- memo,
type,
hrs,
wuid,
wdate,
username,
- projectidx,
- project};
+ pidx,
+ requestpart,
+ package,
+ status,
+ description,
+ remark,
+ import,
+ projectName,
+ ww,
+ week};
rowJobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportRow);
return rowJobReportRow;
@@ -2053,17 +2143,22 @@ namespace FPJ0000 {
internal void InitVars() {
this.columnidx = base.Columns["idx"];
this.columnpdate = base.Columns["pdate"];
- this.columngroup = base.Columns["group"];
this.columnuid = base.Columns["uid"];
- this.columnprogress = base.Columns["progress"];
- this.columnmemo = base.Columns["memo"];
this.columntype = base.Columns["type"];
this.columnhrs = base.Columns["hrs"];
this.columnwuid = base.Columns["wuid"];
this.columnwdate = base.Columns["wdate"];
this.columnusername = base.Columns["username"];
- this.columnprojectidx = base.Columns["projectidx"];
- this.columnproject = base.Columns["project"];
+ this.columnpidx = base.Columns["pidx"];
+ this.columnrequestpart = base.Columns["requestpart"];
+ this.columnpackage = base.Columns["package"];
+ this.columnstatus = base.Columns["status"];
+ this.columndescription = base.Columns["description"];
+ this.columnremark = base.Columns["remark"];
+ this.columnimport = base.Columns["import"];
+ this.columnprojectName = base.Columns["projectName"];
+ this.columnww = base.Columns["ww"];
+ this.columnweek = base.Columns["week"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2073,14 +2168,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnidx);
this.columnpdate = new global::System.Data.DataColumn("pdate", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnpdate);
- this.columngroup = new global::System.Data.DataColumn("group", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columngroup);
this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnuid);
- this.columnprogress = new global::System.Data.DataColumn("progress", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columnprogress);
- this.columnmemo = new global::System.Data.DataColumn("memo", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columnmemo);
this.columntype = new global::System.Data.DataColumn("type", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columntype);
this.columnhrs = new global::System.Data.DataColumn("hrs", typeof(double), null, global::System.Data.MappingType.Element);
@@ -2091,10 +2180,26 @@ namespace FPJ0000 {
base.Columns.Add(this.columnwdate);
this.columnusername = new global::System.Data.DataColumn("username", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnusername);
- this.columnprojectidx = new global::System.Data.DataColumn("projectidx", typeof(int), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columnprojectidx);
- this.columnproject = new global::System.Data.DataColumn("project", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columnproject);
+ this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnpidx);
+ this.columnrequestpart = new global::System.Data.DataColumn("requestpart", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnrequestpart);
+ this.columnpackage = new global::System.Data.DataColumn("package", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnpackage);
+ this.columnstatus = new global::System.Data.DataColumn("status", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnstatus);
+ this.columndescription = new global::System.Data.DataColumn("description", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columndescription);
+ this.columnremark = new global::System.Data.DataColumn("remark", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnremark);
+ this.columnimport = new global::System.Data.DataColumn("import", typeof(bool), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnimport);
+ this.columnprojectName = new global::System.Data.DataColumn("projectName", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnprojectName);
+ this.columnww = new global::System.Data.DataColumn("ww", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnww);
+ this.columnweek = new global::System.Data.DataColumn("week", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnweek);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -2104,17 +2209,19 @@ namespace FPJ0000 {
this.columnidx.ReadOnly = true;
this.columnidx.Unique = true;
this.columnpdate.MaxLength = 10;
- this.columngroup.MaxLength = 20;
this.columnuid.MaxLength = 20;
- this.columnprogress.MaxLength = 20;
- this.columnmemo.MaxLength = 255;
this.columntype.MaxLength = 20;
this.columnwuid.AllowDBNull = false;
this.columnwuid.MaxLength = 20;
this.columnwdate.AllowDBNull = false;
this.columnusername.ReadOnly = true;
this.columnusername.MaxLength = 200;
- this.columnproject.MaxLength = 50;
+ this.columnrequestpart.MaxLength = 50;
+ this.columnpackage.MaxLength = 50;
+ this.columnstatus.MaxLength = 20;
+ this.columndescription.MaxLength = 2147483647;
+ this.columnremark.MaxLength = 255;
+ this.columnprojectName.MaxLength = 255;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4243,6 +4350,22 @@ namespace FPJ0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string userhw2 {
+ get {
+ if (this.Isuserhw2Null()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableProjects.userhw2Column]));
+ }
+ }
+ set {
+ this[this.tableProjects.userhw2Column] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsnameNull() {
@@ -4578,6 +4701,18 @@ namespace FPJ0000 {
public void SetpathNull() {
this[this.tableProjects.pathColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool Isuserhw2Null() {
+ return this.IsNull(this.tableProjects.userhw2Column);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void Setuserhw2Null() {
+ this[this.tableProjects.userhw2Column] = global::System.Convert.DBNull;
+ }
}
///
@@ -5033,22 +5168,6 @@ namespace FPJ0000 {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public string group {
- get {
- if (this.IsgroupNull()) {
- return string.Empty;
- }
- else {
- return ((string)(this[this.tableJobReport.groupColumn]));
- }
- }
- set {
- this[this.tableJobReport.groupColumn] = value;
- }
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string uid {
@@ -5065,38 +5184,6 @@ namespace FPJ0000 {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public string progress {
- get {
- try {
- return ((string)(this[this.tableJobReport.progressColumn]));
- }
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'progress\' 열의 값이 DBNull입니다.", e);
- }
- }
- set {
- this[this.tableJobReport.progressColumn] = value;
- }
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public string memo {
- get {
- if (this.IsmemoNull()) {
- return string.Empty;
- }
- else {
- return ((string)(this[this.tableJobReport.memoColumn]));
- }
- }
- set {
- this[this.tableJobReport.memoColumn] = value;
- }
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string type {
@@ -5117,11 +5204,11 @@ namespace FPJ0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public double hrs {
get {
- try {
- return ((double)(this[this.tableJobReport.hrsColumn]));
+ if (this.IshrsNull()) {
+ return 0D;
}
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'hrs\' 열의 값이 DBNull입니다.", e);
+ else {
+ return ((double)(this[this.tableJobReport.hrsColumn]));
}
}
set {
@@ -5169,33 +5256,161 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public int projectidx {
+ public int pidx {
get {
- try {
- return ((int)(this[this.tableJobReport.projectidxColumn]));
+ if (this.IspidxNull()) {
+ return -1;
}
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'projectidx\' 열의 값이 DBNull입니다.", e);
+ else {
+ return ((int)(this[this.tableJobReport.pidxColumn]));
}
}
set {
- this[this.tableJobReport.projectidxColumn] = value;
+ this[this.tableJobReport.pidxColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public string project {
+ public string requestpart {
get {
- try {
- return ((string)(this[this.tableJobReport.projectColumn]));
+ if (this.IsrequestpartNull()) {
+ return string.Empty;
}
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'project\' 열의 값이 DBNull입니다.", e);
+ else {
+ return ((string)(this[this.tableJobReport.requestpartColumn]));
}
}
set {
- this[this.tableJobReport.projectColumn] = value;
+ this[this.tableJobReport.requestpartColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string package {
+ get {
+ if (this.IspackageNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.packageColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.packageColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string status {
+ get {
+ if (this.IsstatusNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.statusColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.statusColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string description {
+ get {
+ if (this.IsdescriptionNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.descriptionColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.descriptionColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string remark {
+ get {
+ if (this.IsremarkNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.remarkColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.remarkColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool import {
+ get {
+ if (this.IsimportNull()) {
+ return false;
+ }
+ else {
+ return ((bool)(this[this.tableJobReport.importColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.importColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string projectName {
+ get {
+ if (this.IsprojectNameNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.projectNameColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.projectNameColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string ww {
+ get {
+ if (this.IswwNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.wwColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.wwColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public string week {
+ get {
+ if (this.IsweekNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableJobReport.weekColumn]));
+ }
+ }
+ set {
+ this[this.tableJobReport.weekColumn] = value;
}
}
@@ -5211,18 +5426,6 @@ namespace FPJ0000 {
this[this.tableJobReport.pdateColumn] = global::System.Convert.DBNull;
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public bool IsgroupNull() {
- return this.IsNull(this.tableJobReport.groupColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public void SetgroupNull() {
- this[this.tableJobReport.groupColumn] = global::System.Convert.DBNull;
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsuidNull() {
@@ -5235,30 +5438,6 @@ namespace FPJ0000 {
this[this.tableJobReport.uidColumn] = global::System.Convert.DBNull;
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public bool IsprogressNull() {
- return this.IsNull(this.tableJobReport.progressColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public void SetprogressNull() {
- this[this.tableJobReport.progressColumn] = global::System.Convert.DBNull;
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public bool IsmemoNull() {
- return this.IsNull(this.tableJobReport.memoColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public void SetmemoNull() {
- this[this.tableJobReport.memoColumn] = global::System.Convert.DBNull;
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IstypeNull() {
@@ -5297,26 +5476,122 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public bool IsprojectidxNull() {
- return this.IsNull(this.tableJobReport.projectidxColumn);
+ public bool IspidxNull() {
+ return this.IsNull(this.tableJobReport.pidxColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public void SetprojectidxNull() {
- this[this.tableJobReport.projectidxColumn] = global::System.Convert.DBNull;
+ public void SetpidxNull() {
+ this[this.tableJobReport.pidxColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public bool IsprojectNull() {
- return this.IsNull(this.tableJobReport.projectColumn);
+ public bool IsrequestpartNull() {
+ return this.IsNull(this.tableJobReport.requestpartColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public void SetprojectNull() {
- this[this.tableJobReport.projectColumn] = global::System.Convert.DBNull;
+ public void SetrequestpartNull() {
+ this[this.tableJobReport.requestpartColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IspackageNull() {
+ return this.IsNull(this.tableJobReport.packageColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetpackageNull() {
+ this[this.tableJobReport.packageColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsstatusNull() {
+ return this.IsNull(this.tableJobReport.statusColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetstatusNull() {
+ this[this.tableJobReport.statusColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsdescriptionNull() {
+ return this.IsNull(this.tableJobReport.descriptionColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetdescriptionNull() {
+ this[this.tableJobReport.descriptionColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsremarkNull() {
+ return this.IsNull(this.tableJobReport.remarkColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetremarkNull() {
+ this[this.tableJobReport.remarkColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsimportNull() {
+ return this.IsNull(this.tableJobReport.importColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetimportNull() {
+ this[this.tableJobReport.importColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsprojectNameNull() {
+ return this.IsNull(this.tableJobReport.projectNameColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetprojectNameNull() {
+ this[this.tableJobReport.projectNameColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IswwNull() {
+ return this.IsNull(this.tableJobReport.wwColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetwwNull() {
+ this[this.tableJobReport.wwColumn] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsweekNull() {
+ return this.IsNull(this.tableJobReport.weekColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetweekNull() {
+ this[this.tableJobReport.weekColumn] = global::System.Convert.DBNull;
}
}
@@ -6532,94 +6807,17 @@ namespace FPJ0000.dsPRJTableAdapters {
tableMapping.ColumnMappings.Add("asset", "asset");
tableMapping.ColumnMappings.Add("isdel", "isdel");
tableMapping.ColumnMappings.Add("path", "path");
+ tableMapping.ColumnMappings.Add("userhw2", "userhw2");
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 [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AN" +
- "D [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AN" +
- "D [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [n" +
- "ame] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [user" +
- "main] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 A" +
- "ND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff" +
- " = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull" +
- "_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_ed" +
- "ate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate" +
- " = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1" +
- " AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid)" +
- " AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([r" +
- "ev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @O" +
- "riginal_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([use" +
- "rManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL)" +
- " OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR (" +
- "[part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([" +
- "process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR (" +
- "[costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([co" +
- "stn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @O" +
- "riginal_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Origin" +
- "al_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @" +
- "Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] " +
- "= @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = " +
- "@Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Or" +
- "iginal_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original" +
- "_path)))";
+ this._adapter.DeleteCommand.CommandText = "UPDATE Projects\r\nSET isdel = 1\r\nWHERE (idx = @Original_idx)";
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_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usermain", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usermain", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usersub", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usersub", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqstaff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_odate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userManager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_part", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_costo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_costo", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_costn", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_costn", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ddate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_asset", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_isdel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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 [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path);
-SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)";
+ this._adapter.InsertCommand.CommandText = @"INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2);
+SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -6650,6 +6848,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", 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 [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [user" +
@@ -6659,38 +6858,40 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
"level, [part] = @part, [process] = @process, [costo] = @costo, [costn] = @costn," +
" [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [ddate] =" +
" @ddate, [progress] = @progress, [import] = @import, [asset] = @asset, [isdel] =" +
- " @isdel, [path] = @path WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 " +
- "AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 " +
- "AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND " +
- "[name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [us" +
- "ermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1" +
- " AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqsta" +
- "ff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNu" +
- "ll_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_" +
- "edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_oda" +
- "te = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo =" +
- " 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wui" +
- "d) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR (" +
- "[rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = " +
- "@Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([u" +
- "serManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NUL" +
- "L) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR" +
- " ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR " +
- "([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR" +
- " ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([" +
- "costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = " +
- "@Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Orig" +
- "inal_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] =" +
- " @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import" +
- "] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] " +
- "= @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @" +
- "Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Origin" +
- "al_path)));\r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate" +
- ", edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process," +
- " costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isde" +
- "l, path FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THE" +
- "N \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([sta" +
- "tus] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)";
+ " @isdel, [path] = @path, [userhw2] = @userhw2 WHERE (([idx] = @Original_idx) AND" +
+ " ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AN" +
+ "D ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND (" +
+ "(@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNul" +
+ "l_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND" +
+ " ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)" +
+ ") AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_" +
+ "reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_" +
+ "sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_eda" +
+ "te)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)" +
+ ") AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND (" +
+ "[wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 A" +
+ "ND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] " +
+ "IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userMa" +
+ "nager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level " +
+ "= 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 " +
+ "AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND " +
+ "[process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 A" +
+ "ND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND " +
+ "[costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt]" +
+ " IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NUL" +
+ "L) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS " +
+ "NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import" +
+ "] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset]" +
+ " IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS" +
+ " NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL" +
+ ") OR ([path] = @Original_path)) AND ((@IsNull_userhw2 = 1 AND [userhw2] IS NULL)" +
+ " OR ([userhw2] = @Original_userhw2)));\r\nSELECT idx, status, pdate, name, usermai" +
+ "n, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userMan" +
+ "ager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, pr" +
+ "ogress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORD" +
+ "ER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN (" +
+ "[status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\')" +
+ " THEN \'9\' ELSE \'5\' END)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -6721,6 +6922,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", 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_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -6774,6 +6976,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userhw2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userhw2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", 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, "", "", ""));
}
@@ -6791,7 +6995,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
- progress, import, asset, isdel, path
+ progress, import, asset, isdel, path, userhw2
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -6807,10 +7011,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
- this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
- userManager, usermain, usersub, wdate, wuid
-FROM Projects
-WHERE (idx = @idx)";
+ this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid FROM Projects WHERE (idx = @idx)";
this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[2].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, "", "", ""));
}
@@ -6922,243 +7123,8 @@ WHERE (idx = @idx)";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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_status,
- string Original_pdate,
- string Original_name,
- string Original_usermain,
- string Original_usersub,
- string Original_reqstaff,
- string Original_sdate,
- string Original_edate,
- string Original_odate,
- string Original_memo,
- string Original_wuid,
- System.DateTime Original_wdate,
- global::System.Nullable Original_rev,
- global::System.Nullable Original_pidx,
- string Original_userManager,
- global::System.Nullable Original_level,
- string Original_part,
- string Original_process,
- global::System.Nullable Original_costo,
- global::System.Nullable Original_costn,
- global::System.Nullable Original_cnt,
- string Original_ddate,
- global::System.Nullable Original_progress,
- global::System.Nullable Original_import,
- string Original_asset,
- global::System.Nullable Original_isdel,
- string Original_path) {
+ public virtual int Delete(int Original_idx) {
this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
- if ((Original_status == null)) {
- this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_status));
- }
- if ((Original_pdate == null)) {
- this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_pdate));
- }
- if ((Original_name == null)) {
- this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_name));
- }
- if ((Original_usermain == null)) {
- this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_usermain));
- }
- if ((Original_usersub == null)) {
- this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_usersub));
- }
- if ((Original_reqstaff == null)) {
- this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_reqstaff));
- }
- if ((Original_sdate == null)) {
- this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_sdate));
- }
- if ((Original_edate == null)) {
- this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_edate));
- }
- if ((Original_odate == null)) {
- this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_odate));
- }
- if ((Original_memo == null)) {
- this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[20].Value = ((string)(Original_memo));
- }
- if ((Original_wuid == null)) {
- throw new global::System.ArgumentNullException("Original_wuid");
- }
- else {
- this.Adapter.DeleteCommand.Parameters[21].Value = ((string)(Original_wuid));
- }
- this.Adapter.DeleteCommand.Parameters[22].Value = ((System.DateTime)(Original_wdate));
- if ((Original_rev.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[24].Value = ((int)(Original_rev.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value;
- }
- if ((Original_pidx.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[26].Value = ((int)(Original_pidx.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value;
- }
- if ((Original_userManager == null)) {
- this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_userManager));
- }
- if ((Original_level.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[30].Value = ((int)(Original_level.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[30].Value = global::System.DBNull.Value;
- }
- if ((Original_part == null)) {
- this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[32].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[32].Value = ((string)(Original_part));
- }
- if ((Original_process == null)) {
- this.Adapter.DeleteCommand.Parameters[33].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[34].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[33].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[34].Value = ((string)(Original_process));
- }
- if ((Original_costo.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[35].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[36].Value = ((double)(Original_costo.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[35].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[36].Value = global::System.DBNull.Value;
- }
- if ((Original_costn.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[37].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[38].Value = ((double)(Original_costn.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[37].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[38].Value = global::System.DBNull.Value;
- }
- if ((Original_cnt.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[40].Value = ((int)(Original_cnt.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[40].Value = global::System.DBNull.Value;
- }
- if ((Original_ddate == null)) {
- this.Adapter.DeleteCommand.Parameters[41].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[42].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[41].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[42].Value = ((string)(Original_ddate));
- }
- if ((Original_progress.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[44].Value = ((int)(Original_progress.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[43].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[44].Value = global::System.DBNull.Value;
- }
- if ((Original_import.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[46].Value = ((bool)(Original_import.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[45].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[46].Value = global::System.DBNull.Value;
- }
- if ((Original_asset == null)) {
- this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[48].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[47].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[48].Value = ((string)(Original_asset));
- }
- if ((Original_isdel.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[50].Value = ((bool)(Original_isdel.Value));
- }
- else {
- this.Adapter.DeleteCommand.Parameters[49].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[50].Value = global::System.DBNull.Value;
- }
- if ((Original_path == null)) {
- this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(1));
- this.Adapter.DeleteCommand.Parameters[52].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.DeleteCommand.Parameters[51].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[52].Value = ((string)(Original_path));
- }
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)) {
@@ -7208,7 +7174,8 @@ WHERE (idx = @idx)";
global::System.Nullable import,
string asset,
global::System.Nullable isdel,
- string path) {
+ string path,
+ string userhw2) {
if ((status == null)) {
this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
@@ -7378,6 +7345,12 @@ WHERE (idx = @idx)";
else {
this.Adapter.InsertCommand.Parameters[28].Value = ((string)(path));
}
+ if ((userhw2 == null)) {
+ this.Adapter.InsertCommand.Parameters[29].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[29].Value = ((string)(userhw2));
+ }
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)) {
@@ -7428,6 +7401,7 @@ WHERE (idx = @idx)";
string asset,
global::System.Nullable isdel,
string path,
+ string userhw2,
int Original_idx,
string Original_status,
string Original_pdate,
@@ -7456,6 +7430,7 @@ WHERE (idx = @idx)";
string Original_asset,
global::System.Nullable Original_isdel,
string Original_path,
+ string Original_userhw2,
int idx) {
if ((status == null)) {
this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -7626,215 +7601,229 @@ WHERE (idx = @idx)";
else {
this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(path));
}
- this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_idx));
- if ((Original_status == null)) {
- this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
+ if ((userhw2 == null)) {
+ this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_status));
+ this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(userhw2));
+ }
+ this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_idx));
+ if ((Original_status == null)) {
+ this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_status));
}
if ((Original_pdate == null)) {
- this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_pdate));
+ this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_pdate));
}
if ((Original_name == null)) {
- this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_name));
+ this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_name));
}
if ((Original_usermain == null)) {
- this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_usermain));
+ this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_usermain));
}
if ((Original_usersub == null)) {
- this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_usersub));
+ this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_usersub));
}
if ((Original_reqstaff == null)) {
- this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_reqstaff));
+ this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_reqstaff));
}
if ((Original_sdate == null)) {
- this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_sdate));
+ this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_sdate));
}
if ((Original_edate == null)) {
- this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_edate));
+ this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_edate));
}
if ((Original_odate == null)) {
- this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_odate));
+ this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_odate));
}
if ((Original_memo == null)) {
- this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_memo));
+ this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_memo));
}
if ((Original_wuid == null)) {
throw new global::System.ArgumentNullException("Original_wuid");
}
else {
- this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_wuid));
+ this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_wuid));
}
- this.Adapter.UpdateCommand.Parameters[51].Value = ((System.DateTime)(Original_wdate));
+ this.Adapter.UpdateCommand.Parameters[52].Value = ((System.DateTime)(Original_wdate));
if ((Original_rev.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_rev.Value));
+ this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[54].Value = ((int)(Original_rev.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value;
}
if ((Original_pidx.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_pidx.Value));
+ this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_pidx.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value;
}
if ((Original_userManager == null)) {
- this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_userManager));
+ this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_userManager));
}
if ((Original_level.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_level.Value));
+ this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(Original_level.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value;
}
if ((Original_part == null)) {
- this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_part));
+ this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_part));
}
if ((Original_process == null)) {
- this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_process));
+ this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_process));
}
if ((Original_costo.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[65].Value = ((double)(Original_costo.Value));
+ this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[66].Value = ((double)(Original_costo.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value;
}
if ((Original_costn.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[67].Value = ((double)(Original_costn.Value));
+ this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[68].Value = ((double)(Original_costn.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value;
}
if ((Original_cnt.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[69].Value = ((int)(Original_cnt.Value));
+ this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[70].Value = ((int)(Original_cnt.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value;
}
if ((Original_ddate == null)) {
- this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_ddate));
+ this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[72].Value = ((string)(Original_ddate));
}
if ((Original_progress.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[73].Value = ((int)(Original_progress.Value));
+ this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[74].Value = ((int)(Original_progress.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value;
}
if ((Original_import.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[75].Value = ((bool)(Original_import.Value));
+ this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[76].Value = ((bool)(Original_import.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value;
}
if ((Original_asset == null)) {
- this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_asset));
+ this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_asset));
}
if ((Original_isdel.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[79].Value = ((bool)(Original_isdel.Value));
+ this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[80].Value = ((bool)(Original_isdel.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value;
}
if ((Original_path == null)) {
- this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_path));
+ this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[82].Value = ((string)(Original_path));
}
- this.Adapter.UpdateCommand.Parameters[82].Value = ((int)(idx));
+ if ((Original_userhw2 == null)) {
+ this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[84].Value = ((string)(Original_userhw2));
+ }
+ this.Adapter.UpdateCommand.Parameters[85].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)) {
@@ -7885,6 +7874,7 @@ WHERE (idx = @idx)";
string asset,
global::System.Nullable isdel,
string path,
+ string userhw2,
int Original_idx,
string Original_status,
string Original_pdate,
@@ -7912,8 +7902,9 @@ WHERE (idx = @idx)";
global::System.Nullable Original_import,
string Original_asset,
global::System.Nullable Original_isdel,
- string Original_path) {
- return this.Update(status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_userManager, Original_level, Original_part, Original_process, Original_costo, Original_costn, Original_cnt, Original_ddate, Original_progress, Original_import, Original_asset, Original_isdel, Original_path, Original_idx);
+ string Original_path,
+ string Original_userhw2) {
+ return this.Update(status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_userManager, Original_level, Original_part, Original_process, Original_costo, Original_costn, Original_cnt, Original_ddate, Original_progress, Original_import, Original_asset, Original_isdel, Original_path, Original_userhw2, Original_idx);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8845,96 +8836,130 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I
tableMapping.DataSetTable = "JobReport";
tableMapping.ColumnMappings.Add("idx", "idx");
tableMapping.ColumnMappings.Add("pdate", "pdate");
- tableMapping.ColumnMappings.Add("group", "group");
tableMapping.ColumnMappings.Add("uid", "uid");
- tableMapping.ColumnMappings.Add("progress", "progress");
- tableMapping.ColumnMappings.Add("memo", "memo");
tableMapping.ColumnMappings.Add("type", "type");
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("wuid", "wuid");
tableMapping.ColumnMappings.Add("wdate", "wdate");
tableMapping.ColumnMappings.Add("username", "username");
- tableMapping.ColumnMappings.Add("projectidx", "projectidx");
- tableMapping.ColumnMappings.Add("project", "project");
+ tableMapping.ColumnMappings.Add("pidx", "pidx");
+ tableMapping.ColumnMappings.Add("requestpart", "requestpart");
+ tableMapping.ColumnMappings.Add("package", "package");
+ tableMapping.ColumnMappings.Add("status", "status");
+ tableMapping.ColumnMappings.Add("description", "description");
+ tableMapping.ColumnMappings.Add("remark", "remark");
+ tableMapping.ColumnMappings.Add("import", "import");
+ tableMapping.ColumnMappings.Add("projectName", "projectName");
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 [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_group = 1 AND [group] IS NULL) OR ([group] = @Original_group)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)))";
+ this._adapter.DeleteCommand.CommandText = @"DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)))";
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_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_group", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "group", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_group", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "group", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", 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 [JobReport] ([pdate], [group], [uid], [progress], [memo], [type], [hrs], [wuid], [wdate], [projectidx], [project]) VALUES (@pdate, @group, @uid, @progress, @memo, @type, @hrs, @wuid, @wdate, @projectidx, @project);
-SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, memo, type, hrs, wuid, wdate, projectidx, project FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
+ this._adapter.InsertCommand.CommandText = @"INSERT INTO [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName);
+SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@group", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "group", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", 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 [JobReport] SET [pdate] = @pdate, [group] = @group, [uid] = @uid, [progress] = @progress, [memo] = @memo, [type] = @type, [hrs] = @hrs, [wuid] = @wuid, [wdate] = @wdate, [projectidx] = @projectidx, [project] = @project WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_group = 1 AND [group] IS NULL) OR ([group] = @Original_group)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)));
-SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, memo, type, hrs, wuid, wdate, projectidx, project FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC";
+ this._adapter.UpdateCommand.CommandText = "UPDATE [JobReport] SET [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpa" +
+ "rt] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [d" +
+ "escription] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import" +
+ ", [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName WHERE (([idx] =" +
+ " @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Origina" +
+ "l_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pd" +
+ "ate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND (" +
+ "(@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Origina" +
+ "l_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] =" +
+ " @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status]" +
+ " = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @O" +
+ "riginal_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Or" +
+ "iginal_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_h" +
+ "rs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_imp" +
+ "ort)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNul" +
+ "l_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_proje" +
+ "ctName)));\r\nSELECT idx, pidx, pdate, uid, requestpart, package, status, type, de" +
+ "scription, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, p" +
+ "rojectName FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@group", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "group", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", 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_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_group", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "group", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_group", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "group", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_progress", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", 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, "", "", ""));
}
@@ -8951,19 +8976,17 @@ SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, mem
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 idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, mem" +
- "o, type, hrs, wuid, wdate, projectidx, project\r\nFROM JobReport\r\nWHERE (pdat" +
- "e BETWEEN @sd AND @ed) AND (uid LIKE @uid)\r\nORDER BY pdate DESC";
+ 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
+FROM JobReport
+WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid)
+ORDER BY pdate DESC";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
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, "", "", ""));
this._commandCollection[0].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[0].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[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
- this._commandCollection[1].CommandText = @"SELECT [group], hrs, idx, memo, pdate, progress, project, projectidx, type, uid, dbo.getUserName(uid) AS username, wdate, wuid
-FROM JobReport
-WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(project), '') LIKE @prjname)
-ORDER BY pdate DESC";
+ this._commandCollection[1].CommandText = @"SELECT description, hrs, idx, import, package, pdate, pidx, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) ORDER BY pdate DESC";
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.Current, 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.Current, false, null, "", "", ""));
@@ -9123,23 +9146,23 @@ ORDER BY pdate DESC";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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_pdate, string Original_group, string Original_uid, string Original_progress, string Original_memo, string Original_type, global::System.Nullable Original_hrs, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_projectidx, string Original_project) {
+ public virtual int Delete(int Original_idx, global::System.Nullable Original_pidx, string Original_pdate, string Original_uid, string Original_requestpart, string Original_package, string Original_status, string Original_type, string Original_remark, global::System.Nullable Original_hrs, global::System.Nullable Original_import, string Original_wuid, System.DateTime Original_wdate, string Original_projectName) {
this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
- if ((Original_pdate == null)) {
+ if ((Original_pidx.HasValue == true)) {
+ this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
+ this.Adapter.DeleteCommand.Parameters[2].Value = ((int)(Original_pidx.Value));
+ }
+ else {
this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value;
}
- else {
- this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_pdate));
- }
- if ((Original_group == null)) {
+ if ((Original_pdate == null)) {
this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_group));
+ this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_pdate));
}
if ((Original_uid == null)) {
this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1));
@@ -9149,60 +9172,76 @@ ORDER BY pdate DESC";
this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_uid));
}
- if ((Original_progress == null)) {
+ if ((Original_requestpart == null)) {
this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_progress));
+ this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_requestpart));
}
- if ((Original_memo == null)) {
+ if ((Original_package == null)) {
this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_memo));
+ this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_package));
}
- if ((Original_type == null)) {
+ if ((Original_status == null)) {
this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value;
}
else {
this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_type));
+ this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_status));
}
- if ((Original_hrs.HasValue == true)) {
- this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[14].Value = ((double)(Original_hrs.Value));
- }
- else {
+ if ((Original_type == null)) {
this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value;
}
- if ((Original_wuid == null)) {
- throw new global::System.ArgumentNullException("Original_wuid");
+ else {
+ this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
+ this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_type));
+ }
+ if ((Original_remark == null)) {
+ this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1));
+ this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.DeleteCommand.Parameters[15].Value = ((string)(Original_wuid));
+ this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0));
+ this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_remark));
}
- this.Adapter.DeleteCommand.Parameters[16].Value = ((System.DateTime)(Original_wdate));
- if ((Original_projectidx.HasValue == true)) {
+ if ((Original_hrs.HasValue == true)) {
this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[18].Value = ((int)(Original_projectidx.Value));
+ this.Adapter.DeleteCommand.Parameters[18].Value = ((double)(Original_hrs.Value));
}
else {
this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value;
}
- if ((Original_project == null)) {
+ if ((Original_import.HasValue == true)) {
+ this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0));
+ this.Adapter.DeleteCommand.Parameters[20].Value = ((bool)(Original_import.Value));
+ }
+ else {
this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value;
}
+ if ((Original_wuid == null)) {
+ throw new global::System.ArgumentNullException("Original_wuid");
+ }
else {
- this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0));
- this.Adapter.DeleteCommand.Parameters[20].Value = ((string)(Original_project));
+ this.Adapter.DeleteCommand.Parameters[21].Value = ((string)(Original_wuid));
+ }
+ this.Adapter.DeleteCommand.Parameters[22].Value = ((System.DateTime)(Original_wdate));
+ if ((Original_projectName == null)) {
+ this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1));
+ this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0));
+ this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_projectName));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
@@ -9224,18 +9263,18 @@ ORDER BY pdate DESC";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.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 pdate, string group, string uid, string progress, string memo, string type, global::System.Nullable hrs, string wuid, System.DateTime wdate, global::System.Nullable projectidx, string project) {
- if ((pdate == null)) {
- this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
+ public virtual int Insert(global::System.Nullable pidx, string pdate, string uid, string requestpart, string package, string status, string type, string description, string remark, global::System.Nullable hrs, global::System.Nullable import, string wuid, System.DateTime wdate, string projectName) {
+ if ((pidx.HasValue == true)) {
+ this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value));
}
else {
- this.Adapter.InsertCommand.Parameters[0].Value = ((string)(pdate));
+ this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
}
- if ((group == null)) {
+ if ((pdate == null)) {
this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[1].Value = ((string)(group));
+ this.Adapter.InsertCommand.Parameters[1].Value = ((string)(pdate));
}
if ((uid == null)) {
this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value;
@@ -9243,48 +9282,66 @@ ORDER BY pdate DESC";
else {
this.Adapter.InsertCommand.Parameters[2].Value = ((string)(uid));
}
- if ((progress == null)) {
+ if ((requestpart == null)) {
this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[3].Value = ((string)(progress));
+ this.Adapter.InsertCommand.Parameters[3].Value = ((string)(requestpart));
}
- if ((memo == null)) {
+ if ((package == null)) {
this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[4].Value = ((string)(memo));
+ this.Adapter.InsertCommand.Parameters[4].Value = ((string)(package));
}
- if ((type == null)) {
+ if ((status == null)) {
this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[5].Value = ((string)(type));
+ this.Adapter.InsertCommand.Parameters[5].Value = ((string)(status));
}
- if ((hrs.HasValue == true)) {
- this.Adapter.InsertCommand.Parameters[6].Value = ((double)(hrs.Value));
+ if ((type == null)) {
+ this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value;
+ this.Adapter.InsertCommand.Parameters[6].Value = ((string)(type));
+ }
+ if ((description == null)) {
+ this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[7].Value = ((string)(description));
+ }
+ if ((remark == null)) {
+ this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[8].Value = ((string)(remark));
+ }
+ if ((hrs.HasValue == true)) {
+ this.Adapter.InsertCommand.Parameters[9].Value = ((double)(hrs.Value));
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value;
+ }
+ if ((import.HasValue == true)) {
+ this.Adapter.InsertCommand.Parameters[10].Value = ((bool)(import.Value));
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value;
}
if ((wuid == null)) {
throw new global::System.ArgumentNullException("wuid");
}
else {
- this.Adapter.InsertCommand.Parameters[7].Value = ((string)(wuid));
+ this.Adapter.InsertCommand.Parameters[11].Value = ((string)(wuid));
}
- this.Adapter.InsertCommand.Parameters[8].Value = ((System.DateTime)(wdate));
- if ((projectidx.HasValue == true)) {
- this.Adapter.InsertCommand.Parameters[9].Value = ((int)(projectidx.Value));
+ this.Adapter.InsertCommand.Parameters[12].Value = ((System.DateTime)(wdate));
+ if ((projectName == null)) {
+ this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value;
- }
- if ((project == null)) {
- this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.InsertCommand.Parameters[10].Value = ((string)(project));
+ this.Adapter.InsertCommand.Parameters[13].Value = ((string)(projectName));
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
@@ -9307,41 +9364,46 @@ ORDER BY pdate DESC";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
public virtual int Update(
+ global::System.Nullable pidx,
string pdate,
- string group,
string uid,
- string progress,
- string memo,
+ string requestpart,
+ string package,
+ string status,
string type,
+ string description,
+ string remark,
global::System.Nullable hrs,
+ global::System.Nullable import,
string wuid,
System.DateTime wdate,
- global::System.Nullable projectidx,
- string project,
+ string projectName,
int Original_idx,
+ global::System.Nullable Original_pidx,
string Original_pdate,
- string Original_group,
string Original_uid,
- string Original_progress,
- string Original_memo,
+ string Original_requestpart,
+ string Original_package,
+ string Original_status,
string Original_type,
+ string Original_remark,
global::System.Nullable Original_hrs,
+ global::System.Nullable Original_import,
string Original_wuid,
System.DateTime Original_wdate,
- global::System.Nullable Original_projectidx,
- string Original_project,
+ string Original_projectName,
int idx) {
- if ((pdate == null)) {
- this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
+ if ((pidx.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(pidx.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(pdate));
+ this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
}
- if ((group == null)) {
+ if ((pdate == null)) {
this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(group));
+ this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(pdate));
}
if ((uid == null)) {
this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value;
@@ -9349,130 +9411,164 @@ ORDER BY pdate DESC";
else {
this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(uid));
}
- if ((progress == null)) {
+ if ((requestpart == null)) {
this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(progress));
+ this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(requestpart));
}
- if ((memo == null)) {
+ if ((package == null)) {
this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(memo));
+ this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(package));
}
- if ((type == null)) {
+ if ((status == null)) {
this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(type));
+ this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(status));
}
- if ((hrs.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[6].Value = ((double)(hrs.Value));
+ if ((type == null)) {
+ this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(type));
+ }
+ if ((description == null)) {
+ this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(description));
+ }
+ if ((remark == null)) {
+ this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(remark));
+ }
+ if ((hrs.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[9].Value = ((double)(hrs.Value));
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value;
+ }
+ if ((import.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[10].Value = ((bool)(import.Value));
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
}
if ((wuid == null)) {
throw new global::System.ArgumentNullException("wuid");
}
else {
- this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(wuid));
+ this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(wuid));
}
- this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(wdate));
- if ((projectidx.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(projectidx.Value));
- }
- else {
- this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value;
- }
- if ((project == null)) {
- this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(project));
- }
- this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_idx));
- if ((Original_pdate == null)) {
- this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[12].Value = ((System.DateTime)(wdate));
+ if ((projectName == null)) {
this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_pdate));
+ this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(projectName));
}
- if ((Original_group == null)) {
- this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_idx));
+ if ((Original_pidx.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_pidx.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_group));
+ this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
+ }
+ if ((Original_pdate == null)) {
+ this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_pdate));
}
if ((Original_uid == null)) {
- this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_uid));
+ this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_uid));
}
- if ((Original_progress == null)) {
- this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
+ if ((Original_requestpart == null)) {
+ this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_progress));
+ this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_requestpart));
}
- if ((Original_memo == null)) {
- this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
+ if ((Original_package == null)) {
+ this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_memo));
+ this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_package));
+ }
+ if ((Original_status == null)) {
+ this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_status));
}
if ((Original_type == null)) {
- this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_type));
+ this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_type));
+ }
+ if ((Original_remark == null)) {
+ this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_remark));
}
if ((Original_hrs.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[25].Value = ((double)(Original_hrs.Value));
+ this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[32].Value = ((double)(Original_hrs.Value));
}
else {
- this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
+ }
+ if ((Original_import.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[34].Value = ((bool)(Original_import.Value));
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
}
if ((Original_wuid == null)) {
throw new global::System.ArgumentNullException("Original_wuid");
}
else {
- this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_wuid));
+ this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_wuid));
}
- this.Adapter.UpdateCommand.Parameters[27].Value = ((System.DateTime)(Original_wdate));
- if ((Original_projectidx.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_projectidx.Value));
+ this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(Original_wdate));
+ if ((Original_projectName == null)) {
+ this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
+ this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_projectName));
}
- if ((Original_project == null)) {
- this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_project));
- }
- this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(idx));
+ this.Adapter.UpdateCommand.Parameters[39].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)) {
@@ -9494,30 +9590,35 @@ ORDER BY pdate DESC";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
public virtual int Update(
+ global::System.Nullable pidx,
string pdate,
- string group,
string uid,
- string progress,
- string memo,
+ string requestpart,
+ string package,
+ string status,
string type,
+ string description,
+ string remark,
global::System.Nullable hrs,
+ global::System.Nullable import,
string wuid,
System.DateTime wdate,
- global::System.Nullable projectidx,
- string project,
+ string projectName,
int Original_idx,
+ global::System.Nullable Original_pidx,
string Original_pdate,
- string Original_group,
string Original_uid,
- string Original_progress,
- string Original_memo,
+ string Original_requestpart,
+ string Original_package,
+ string Original_status,
string Original_type,
+ string Original_remark,
global::System.Nullable Original_hrs,
+ global::System.Nullable Original_import,
string Original_wuid,
System.DateTime Original_wdate,
- global::System.Nullable Original_projectidx,
- string Original_project) {
- return this.Update(pdate, group, uid, progress, memo, type, hrs, wuid, wdate, projectidx, project, Original_idx, Original_pdate, Original_group, Original_uid, Original_progress, Original_memo, Original_type, Original_hrs, Original_wuid, Original_wdate, Original_projectidx, Original_project, Original_idx);
+ string Original_projectName) {
+ return this.Update(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, Original_idx, Original_pidx, Original_pdate, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_remark, Original_hrs, Original_import, Original_wuid, Original_wdate, Original_projectName, Original_idx);
}
}
@@ -11427,7 +11528,7 @@ SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend\r\nFROM ProjectsHi" +
@@ -11440,6 +11541,11 @@ SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory
"story\r\nWHERE (pidx = @project) and isnull(mailsend,0) = 0\r\nORDER BY pdate DESC";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", 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 = "UPDATE [ProjectsHistory] SET [mailsend] = 1\r\nWHERE (pidx = @pidx)";
+ this._commandCollection[2].CommandType = global::System.Data.CommandType.Text;
+ this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -11724,6 +11830,30 @@ SELECT idx, pidx, pdate, div, remark, wuid, wdate, mailsend FROM ProjectsHistory
public virtual int Update(int pidx, string pdate, string div, string remark, string wuid, System.DateTime wdate, global::System.Nullable mailsend, int Original_idx, int Original_pidx, string Original_pdate, string Original_div, string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_mailsend) {
return this.Update(pidx, pdate, div, remark, wuid, wdate, mailsend, Original_idx, Original_pidx, Original_pdate, Original_div, Original_wuid, Original_wdate, Original_mailsend, Original_idx);
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)]
+ public virtual int UpdateMailSend(int pidx) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
+ command.Parameters[0].Value = ((int)(pidx));
+ 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();
+ }
+ int returnValue;
+ try {
+ returnValue = command.ExecuteNonQuery();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ return returnValue;
+ }
}
///
diff --git a/SubProject/FPJ0000/dsPRJ.xsc b/SubProject/FPJ0000/dsPRJ.xsc
index a933069..10a6e86 100644
--- a/SubProject/FPJ0000/dsPRJ.xsc
+++ b/SubProject/FPJ0000/dsPRJ.xsc
@@ -9,9 +9,11 @@
-
+
+
-
+
+
diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd
index 58db911..afcf449 100644
--- a/SubProject/FPJ0000/dsPRJ.xsd
+++ b/SubProject/FPJ0000/dsPRJ.xsd
@@ -11,69 +11,19 @@
-
- DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path)))
+
+ UPDATE Projects
+SET isdel = 1
+WHERE (idx = @Original_idx)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
- INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path);
-SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)
+ INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2);
+SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)
@@ -104,13 +54,14 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
+
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
- progress, import, asset, isdel, path
+ progress, import, asset, isdel, path, userhw2
FROM Projects
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -125,8 +76,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
- UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx, [userManager] = @userManager, [level] = @level, [part] = @part, [process] = @process, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [ddate] = @ddate, [progress] = @progress, [import] = @import, [asset] = @asset, [isdel] = @isdel, [path] = @path WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path)));
-SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)
+ UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx, [userManager] = @userManager, [level] = @level, [part] = @part, [process] = @process, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [ddate] = @ddate, [progress] = @progress, [import] = @import, [asset] = @asset, [isdel] = @isdel, [path] = @path, [userhw2] = @userhw2 WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path)) AND ((@IsNull_userhw2 = 1 AND [userhw2] IS NULL) OR ([userhw2] = @Original_userhw2)));
+SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)
@@ -157,6 +108,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
+
@@ -210,6 +162,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
+
+
@@ -247,6 +201,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
+
@@ -260,10 +215,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
- SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
- userManager, usermain, usersub, wdate, wuid
-FROM Projects
-WHERE (idx = @idx)
+ SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid FROM Projects WHERE (idx = @idx)
@@ -412,54 +364,61 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I
- DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_group = 1 AND [group] IS NULL) OR ([group] = @Original_group)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)))
+ DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)))
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
- INSERT INTO [JobReport] ([pdate], [group], [uid], [progress], [memo], [type], [hrs], [wuid], [wdate], [projectidx], [project]) VALUES (@pdate, @group, @uid, @progress, @memo, @type, @hrs, @wuid, @wdate, @projectidx, @project);
-SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, memo, type, hrs, wuid, wdate, projectidx, project FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC
+ INSERT INTO [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName);
+SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC
+
-
-
-
+
+
+
+
+
+
-
-
+
- SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, memo, type, hrs, wuid, wdate, projectidx, project
+ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName
FROM JobReport
WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid)
ORDER BY pdate DESC
@@ -472,41 +431,48 @@ ORDER BY pdate DESC
- UPDATE [JobReport] SET [pdate] = @pdate, [group] = @group, [uid] = @uid, [progress] = @progress, [memo] = @memo, [type] = @type, [hrs] = @hrs, [wuid] = @wuid, [wdate] = @wdate, [projectidx] = @projectidx, [project] = @project WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_group = 1 AND [group] IS NULL) OR ([group] = @Original_group)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectidx = 1 AND [projectidx] IS NULL) OR ([projectidx] = @Original_projectidx)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)));
-SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, memo, type, hrs, wuid, wdate, projectidx, project FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC
+ UPDATE [JobReport] SET [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)));
+SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC
+
-
-
-
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
@@ -516,26 +482,26 @@ SELECT idx, pdate, [group], uid, dbo.getUserName(uid) AS username, progress, mem
-
-
-
-
-
+
+
+
+
+
+
+
+
- SELECT [group], hrs, idx, memo, pdate, progress, project, projectidx, type, uid, dbo.getUserName(uid) AS username, wdate, wuid
-FROM JobReport
-WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(project), '') LIKE @prjname)
-ORDER BY pdate DESC
+ SELECT description, hrs, idx, import, package, pdate, pidx, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) ORDER BY pdate DESC
@@ -937,6 +903,17 @@ ORDER BY pdate DESC
+
+
+
+ UPDATE [ProjectsHistory] SET [mailsend] = 1
+WHERE (pidx = @pidx)
+
+
+
+
+
+
@@ -1108,6 +1085,13 @@ ORDER BY pdate DESC
+
+
+
+
+
+
+
@@ -1186,13 +1170,6 @@ ORDER BY pdate DESC
-
-
-
-
-
-
-
@@ -1200,20 +1177,6 @@ ORDER BY pdate DESC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1221,7 +1184,7 @@ ORDER BY pdate DESC
-
+
@@ -1237,14 +1200,52 @@ ORDER BY pdate DESC
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SubProject/FPJ0000/fMailSend.Designer.cs b/SubProject/FPJ0000/fMailSend.Designer.cs
index 21c213c..67a61c5 100644
--- a/SubProject/FPJ0000/fMailSend.Designer.cs
+++ b/SubProject/FPJ0000/fMailSend.Designer.cs
@@ -66,6 +66,7 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
+ this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
this.taPrj = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
@@ -86,7 +87,7 @@
this.textBox3 = new System.Windows.Forms.TextBox();
this.arLabel3 = new arCtl.arLabel();
this.ta = new FPJ0000.dsMailTableAdapters.MailDataTableAdapter();
- this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
+ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMail)).BeginInit();
this.cm1.SuspendLayout();
@@ -334,6 +335,11 @@
this.toolStripButton3.Text = "일괄전송";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
+ // prb1
+ //
+ this.prb1.Name = "prb1";
+ this.prb1.Size = new System.Drawing.Size(100, 22);
+ //
// taPrj
//
this.taPrj.ClearBeforeFill = true;
@@ -876,10 +882,9 @@
//
this.ta.ClearBeforeFill = true;
//
- // toolStripProgressBar1
+ // taHist
//
- this.prb1.Name = "toolStripProgressBar1";
- this.prb1.Size = new System.Drawing.Size(100, 22);
+ this.taHist.ClearBeforeFill = true;
//
// fMailSend
//
@@ -968,5 +973,6 @@
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripProgressBar prb1;
+ private dsPRJTableAdapters.ProjectsHistoryTableAdapter taHist;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/fMailSend.cs b/SubProject/FPJ0000/fMailSend.cs
index eb1ebe6..7a72828 100644
--- a/SubProject/FPJ0000/fMailSend.cs
+++ b/SubProject/FPJ0000/fMailSend.cs
@@ -27,7 +27,7 @@ namespace FPJ0000
dsPRJTableAdapters.ProjectsTableAdapter taproj = new dsPRJTableAdapters.ProjectsTableAdapter();
dsPRJTableAdapters.ProjectsMailListTableAdapter tamail = new dsPRJTableAdapters.ProjectsMailListTableAdapter();
dsMailTableAdapters.MailFormTableAdapter taform = new dsMailTableAdapters.MailFormTableAdapter();
- dsPRJTableAdapters.ProjectsHistoryTableAdapter taHist = new dsPRJTableAdapters.ProjectsHistoryTableAdapter();
+ // dsPRJTableAdapters.ProjectsHistoryTableAdapter taHist = new dsPRJTableAdapters.ProjectsHistoryTableAdapter();
var mailformDt = taform.GetData("PM");
dsMail.MailFormRow drForm = null;
@@ -42,17 +42,25 @@ namespace FPJ0000
string updateHistory = "";
var dtHIst = taHist.GetbySendMail(pidx);
+ int histCnt = 0;
if (dtHIst != null)
{
foreach (dsPRJ.ProjectsHistoryRow drhist in dtHIst.Rows)
{
if (drhist.remark.Trim() == "") continue;
- updateHistory += "- drhist.remark
";
+ histCnt += 1;
+ updateHistory += "- ["+drhist.pdate + "] " + drhist.remark + "
";
}
}
updateHistory += "
";
+ if(histCnt < 1)
+ {
+ FCOMMON.Util.MsgE("프로젝트:" + pidx.ToString() + "의 변경사항이 존재하지 않습니다.");
+ continue;
+ }
var newdr = this.dsMail.MailData.NewMailDataRow();
+ newdr.project = pidx;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.cate = "PM";
@@ -265,12 +273,31 @@ namespace FPJ0000
this.Validate();
this.bs.EndEdit();
-
//아웃룩에서 데이터를 표시한다.
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsMail.MailDataRow;
+ //이 데이터로 발송된 메일이 있는지 체크한다.
+ dsMailTableAdapters.MailDataTableAdapter taMailData = new dsMailTableAdapters.MailDataTableAdapter();
+ var dtPreData = taMailData.GetbyProject(dr.project);
+ if (dtPreData != null && dtPreData.Rows.Count > 0)
+ {
+ var predataOne = dtPreData.Rows[0] as dsMail.MailDataRow;
+ var dlgexist = FCOMMON.Util.MsgQ("해당 프로젝트는 " + predataOne.pdate + "에 메일이 발송된 기록이 있습니다.\n\n" +
+ "Prject:" + predataOne.subject + "\n\n" +
+ "To:" + predataOne.tolist + "\n" +
+ "CC:" + predataOne.cc + "\n\n" +
+ "그래도 메일을 보내시겠습니까?");
+ if (dlgexist != System.Windows.Forms.DialogResult.Yes) return;
+ }
+
+ var dlg = FCOMMON.Util.MsgQ("프로젝트의 알림 메일을 전송 하시겠습니까?\n\n" +
+ dr.subject + "\n\n" +
+ "To:" + dr.tolist + "\n" +
+ "CC:" + dr.cc + "\n" +
+ "BCC:" + dr.bcc);
+ if (dlg != System.Windows.Forms.DialogResult.Yes) return;
Outlook.Application outlookApplication = new Outlook.Application();
@@ -281,11 +308,19 @@ namespace FPJ0000
newMail.CC = dr.cc;// tbCC.Text.Trim();
newMail.BCC = dr.bcc; // tbBCC.Text.Trim();
// newMail.BodyFormat = OlBodyFormat.olFormatHTML;
- newMail.HTMLBody = dr.body; //
+ newMail.HTMLBody = dr.body + newMail.HTMLBody; //
newMail.Send();
FCOMMON.Util.MsgI("메일이 전송되었습니다.\n\n전송된 메일은 아웃룩의 보낸편지함 혹은 그룹웨어의 보낸편지함에서 확인할 수 있습니다.");
+ try
+ {
+ this.taHist.UpdateMailSend(dr.project);
+ }
+ catch (Exception ex)
+ {
+ FCOMMON.Util.MsgE("MailSend Update Error\n\n" + ex.Message);
+ }
try
{
this.ta.Update(dr);
@@ -293,7 +328,7 @@ namespace FPJ0000
}
catch (Exception ex)
{
- FCOMMON.Util.MsgE("전송 오류\n\n" + ex.Message);
+ FCOMMON.Util.MsgE("전송 결과 저장 오류\n\n" + ex.Message);
}
}
@@ -304,7 +339,7 @@ namespace FPJ0000
private void toolStripButton3_Click(object sender, EventArgs e)
{
- string msg = bs.Count.ToString() + "건의 메일을 일괄 전송 하시겠습니까?\n" +
+ string msg = bs.Count.ToString() + "건의 메일을 일괄 전송 하시겠습니까?\n\n" +
"전송은 아웃룩을 통해서 진행되므로 아웃룩이 보낼수 있는 상태인지 확인하시기 바랍니다";
var dlg = FCOMMON.Util.MsgQ(msg);
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
@@ -324,27 +359,53 @@ namespace FPJ0000
FCOMMON.Util.MsgE("받을 주소가 없어서 진행하지 않습니다\n" + dr.subject);
continue;
}
+
+
+ //이 데이터로 발송된 메일이 있는지 체크한다.
+ dsMailTableAdapters.MailDataTableAdapter taMailData = new dsMailTableAdapters.MailDataTableAdapter();
+ var dtPreData = taMailData.GetbyProject(dr.project);
+ if (dtPreData != null && dtPreData.Rows.Count > 0)
+ {
+ var predataOne = dtPreData.Rows[0] as dsMail.MailDataRow;
+ var dlgexist = FCOMMON.Util.MsgQ("해당 프로젝트는 " + predataOne.pdate + "에 메일이 발송된 기록이 있습니다.\n\n" +
+ "Prject:" + predataOne.subject + "\n\n" +
+ "To:" + predataOne.tolist + "\n" +
+ "CC:" + predataOne.cc + "\n\n" +
+ "그래도 메일을 보내시겠습니까?");
+ if (dlgexist != System.Windows.Forms.DialogResult.Yes) continue;
+ }
+
+
+ var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
+ newMail.Display();
+ newMail.Subject = dr.subject;
+ newMail.To = dr.tolist;// to;
+ newMail.CC = dr.cc;// tbCC.Text.Trim();
+ newMail.BCC = dr.bcc;// tbBCC.Text.Trim();
+ // newMail.BodyFormat = OlBodyFormat.olFormatHTML;
+ newMail.HTMLBody = dr.body + newMail.HTMLBody; //
+ newMail.Send();
+ cntSend += 1;
+
+ try
+ {
+ this.taHist.UpdateMailSend(dr.project);
+ }
+ catch (Exception ex)
+ {
+ FCOMMON.Util.MsgE("MailSend Update Error\n\n" + ex.Message);
+ }
try
{
- var newMail = outlookApplication.CreateItem(OlItemType.olMailItem) as Outlook.MailItem;
- newMail.Display();
- newMail.Subject = dr.subject;
- newMail.To = dr.tolist;// to;
- newMail.CC = dr.cc;// tbCC.Text.Trim();
- newMail.BCC = dr.bcc;// tbBCC.Text.Trim();
- // newMail.BodyFormat = OlBodyFormat.olFormatHTML;
- newMail.HTMLBody = dr.body; //
- newMail.Send();
- cntSend += 1;
-
dr.EndEdit();
ta.Update(dr);
dr.AcceptChanges();
}
catch (Exception ex)
{
- FCOMMON.Util.MsgE("메일 전송 오류\n\n"+ex.Message);
+ FCOMMON.Util.MsgE("메일 전송 오류\n\n" + ex.Message);
}
+
}
FCOMMON.Util.MsgI(cntSend.ToString() + " 건의 메일이 전송되었습니다.\n\n전송된 메일은 아웃룩의 보낸편지함 혹은 그룹웨어의 보낸편지함에서 확인할 수 있습니다.");
@@ -369,9 +430,9 @@ namespace FPJ0000
newMail.CC = dr.cc;// tbCC.Text.Trim();
newMail.BCC = dr.bcc; // tbBCC.Text.Trim();
// newMail.BodyFormat = OlBodyFormat.olFormatHTML;
- newMail.HTMLBody = dr.body; //
+ newMail.HTMLBody = dr.body + newMail.HTMLBody; //
}
- catch(Exception ex)
+ catch (Exception ex)
{
util.MsgE("전송실패\n\n" + ex.Message + "\n\n" +
"아웃룩의 설정이 정상인지 확인하세요");
diff --git a/SubProject/FPJ0000/fMailSend.resx b/SubProject/FPJ0000/fMailSend.resx
index 2182073..3b27f1c 100644
--- a/SubProject/FPJ0000/fMailSend.resx
+++ b/SubProject/FPJ0000/fMailSend.resx
@@ -303,4 +303,7 @@
387, 17
+
+ 601, 17
+
\ No newline at end of file
diff --git a/SubProject/FPJ0000/fProjectData.Designer.cs b/SubProject/FPJ0000/fProjectData.Designer.cs
index e0136bb..c339f9c 100644
--- a/SubProject/FPJ0000/fProjectData.Designer.cs
+++ b/SubProject/FPJ0000/fProjectData.Designer.cs
@@ -49,9 +49,12 @@
System.Windows.Forms.Label label4;
System.Windows.Forms.Label label5;
System.Windows.Forms.Label label6;
+ System.Windows.Forms.Label label8;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.tbIdx = new System.Windows.Forms.TextBox();
+ this.bs = new System.Windows.Forms.BindingSource(this.components);
+ this.dsPRJ = new FPJ0000.dsPRJ();
this.nameTextBox = new System.Windows.Forms.TextBox();
this.reqstaffTextBox = new System.Windows.Forms.TextBox();
this.sdateTextBox = new System.Windows.Forms.TextBox();
@@ -68,21 +71,38 @@
this.assetTextBox = new System.Windows.Forms.TextBox();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
+ this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
+ this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox();
this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
+ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.btSave = new System.Windows.Forms.ToolStripButton();
+ this.btPart = new System.Windows.Forms.ToolStripButton();
+ this.btIO = new System.Windows.Forms.ToolStripButton();
+ this.btMailAddr = new System.Windows.Forms.ToolStripButton();
+ this.btPath = new System.Windows.Forms.ToolStripButton();
+ this.btSendMail = new System.Windows.Forms.ToolStripButton();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.bsWeek = new System.Windows.Forms.BindingSource(this.components);
this.cmbProcess = new System.Windows.Forms.ComboBox();
this.cmbState = new System.Windows.Forms.ComboBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.panel7 = new System.Windows.Forms.Panel();
+ this.cmbPart = new System.Windows.Forms.ComboBox();
this.arLabel1 = new arCtl.arLabel();
this.panel1 = new System.Windows.Forms.Panel();
this.tbPath = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.arLabel2 = new arCtl.arLabel();
this.panel5 = new System.Windows.Forms.Panel();
+ this.textBox3 = new System.Windows.Forms.TextBox();
this.arLabel3 = new arCtl.arLabel();
this.panel2 = new System.Windows.Forms.Panel();
this.arLabel4 = new arCtl.arLabel();
@@ -93,40 +113,23 @@
this.arPanel2 = new arCtl.arPanel();
this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem1 = new System.Windows.Forms.ToolStripLabel();
+ this.bindingNavigatorMoveFirstItem1 = new System.Windows.Forms.ToolStripButton();
+ this.bindingNavigatorMovePreviousItem1 = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.bindingNavigatorPositionItem1 = new System.Windows.Forms.ToolStripTextBox();
this.bindingNavigatorSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bindingNavigatorSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.arLabel7 = new arCtl.arLabel();
- this.cmbPart = new System.Windows.Forms.ComboBox();
- this.bindingNavigatorMoveFirstItem1 = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorMovePreviousItem1 = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveNextItem1 = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveLastItem1 = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
- this.btSave = new System.Windows.Forms.ToolStripButton();
- this.btPart = new System.Windows.Forms.ToolStripButton();
- this.btIO = new System.Windows.Forms.ToolStripButton();
- this.btMailAddr = new System.Windows.Forms.ToolStripButton();
- this.btPath = new System.Windows.Forms.ToolStripButton();
- this.btSendMail = new System.Windows.Forms.ToolStripButton();
- this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
- this.bsWeek = new System.Windows.Forms.BindingSource(this.components);
- this.dsPRJ = new FPJ0000.dsPRJ();
- this.bs = new System.Windows.Forms.BindingSource(this.components);
+ this.bindingNavigatorSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.btwADd = new System.Windows.Forms.ToolStripButton();
+ this.btwDel = new System.Windows.Forms.ToolStripButton();
+ this.arLabel7 = new arCtl.arLabel();
this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.bsSchedule = new System.Windows.Forms.BindingSource(this.components);
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.taSchedule = new FPJ0000.dsPRJTableAdapters.ProjectsScheduleTableAdapter();
+ this.btwEdit = new System.Windows.Forms.ToolStripButton();
nameLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
sdateLabel = new System.Windows.Forms.Label();
@@ -147,9 +150,13 @@
label4 = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
+ label8 = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).BeginInit();
this.panel7.SuspendLayout();
this.panel1.SuspendLayout();
this.panel5.SuspendLayout();
@@ -159,9 +166,6 @@
this.arPanel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit();
this.bindingNavigator1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).BeginInit();
this.SuspendLayout();
//
@@ -213,7 +217,7 @@
// usersubLabel
//
usersubLabel.AutoSize = true;
- usersubLabel.Location = new System.Drawing.Point(374, 36);
+ usersubLabel.Location = new System.Drawing.Point(214, 62);
usersubLabel.Name = "usersubLabel";
usersubLabel.Size = new System.Drawing.Size(29, 12);
usersubLabel.TabIndex = 26;
@@ -339,6 +343,25 @@
label5.TabIndex = 89;
label5.Text = "공유파일";
//
+ // label6
+ //
+ label6.AutoSize = true;
+ label6.Location = new System.Drawing.Point(56, 37);
+ label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ label6.Name = "label6";
+ label6.Size = new System.Drawing.Size(29, 12);
+ label6.TabIndex = 87;
+ label6.Text = "파트";
+ //
+ // label8
+ //
+ label8.AutoSize = true;
+ label8.Location = new System.Drawing.Point(387, 35);
+ label8.Name = "label8";
+ label8.Size = new System.Drawing.Size(29, 12);
+ label8.TabIndex = 87;
+ label8.Text = "전장";
+ //
// tbIdx
//
this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
@@ -349,9 +372,20 @@
this.tbIdx.TabIndex = 3;
this.tbIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
+ // bs
+ //
+ this.bs.DataMember = "Projects";
+ this.bs.DataSource = this.dsPRJ;
+ //
+ // dsPRJ
+ //
+ this.dsPRJ.DataSetName = "dsPRJ";
+ this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+ //
// nameTextBox
//
this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true));
+ this.nameTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.nameTextBox.Location = new System.Drawing.Point(93, 30);
this.nameTextBox.Name = "nameTextBox";
this.nameTextBox.Size = new System.Drawing.Size(447, 21);
@@ -360,6 +394,7 @@
// reqstaffTextBox
//
this.reqstaffTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "reqstaff", true));
+ this.reqstaffTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.reqstaffTextBox.Location = new System.Drawing.Point(425, 34);
this.reqstaffTextBox.Name = "reqstaffTextBox";
this.reqstaffTextBox.Size = new System.Drawing.Size(113, 21);
@@ -368,6 +403,7 @@
// sdateTextBox
//
this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true));
+ this.sdateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.sdateTextBox.Location = new System.Drawing.Point(93, 31);
this.sdateTextBox.Name = "sdateTextBox";
this.sdateTextBox.Size = new System.Drawing.Size(166, 21);
@@ -376,6 +412,7 @@
// edateTextBox
//
this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true));
+ this.edateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.edateTextBox.Location = new System.Drawing.Point(356, 57);
this.edateTextBox.Name = "edateTextBox";
this.edateTextBox.Size = new System.Drawing.Size(166, 21);
@@ -384,6 +421,7 @@
// usermainTextBox
//
this.usermainTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usermain", true));
+ this.usermainTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.usermainTextBox.Location = new System.Drawing.Point(249, 31);
this.usermainTextBox.Name = "usermainTextBox";
this.usermainTextBox.Size = new System.Drawing.Size(113, 21);
@@ -392,7 +430,8 @@
// usersubTextBox
//
this.usersubTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "usersub", true));
- this.usersubTextBox.Location = new System.Drawing.Point(409, 32);
+ this.usersubTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+ this.usersubTextBox.Location = new System.Drawing.Point(249, 58);
this.usersubTextBox.Name = "usersubTextBox";
this.usersubTextBox.Size = new System.Drawing.Size(113, 21);
this.usersubTextBox.TabIndex = 27;
@@ -400,6 +439,7 @@
// userManagerTextBox
//
this.userManagerTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userManager", true));
+ this.userManagerTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.userManagerTextBox.Location = new System.Drawing.Point(93, 30);
this.userManagerTextBox.Name = "userManagerTextBox";
this.userManagerTextBox.Size = new System.Drawing.Size(113, 21);
@@ -407,7 +447,7 @@
//
// costoTextBox
//
- this.costoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
+ this.costoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
this.costoTextBox.Location = new System.Drawing.Point(261, 33);
this.costoTextBox.Name = "costoTextBox";
this.costoTextBox.Size = new System.Drawing.Size(88, 21);
@@ -416,7 +456,7 @@
//
// costnTextBox
//
- this.costnTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
+ this.costnTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
this.costnTextBox.Location = new System.Drawing.Point(93, 33);
this.costnTextBox.Name = "costnTextBox";
this.costnTextBox.Size = new System.Drawing.Size(88, 21);
@@ -447,16 +487,18 @@
this.remark_reqTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.remark_reqTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
this.remark_reqTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.remark_reqTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.remark_reqTextBox.Location = new System.Drawing.Point(1, 24);
this.remark_reqTextBox.Multiline = true;
this.remark_reqTextBox.Name = "remark_reqTextBox";
this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.remark_reqTextBox.Size = new System.Drawing.Size(508, 160);
+ this.remark_reqTextBox.Size = new System.Drawing.Size(433, 120);
this.remark_reqTextBox.TabIndex = 49;
//
// ddateTextBox
//
this.ddateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true));
+ this.ddateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.ddateTextBox.Location = new System.Drawing.Point(356, 31);
this.ddateTextBox.Name = "ddateTextBox";
this.ddateTextBox.Size = new System.Drawing.Size(166, 21);
@@ -493,14 +535,14 @@
this.btMailAddr,
this.btPath,
this.btSendMail});
- this.bn.Location = new System.Drawing.Point(0, 491);
+ this.bn.Location = new System.Drawing.Point(0, 517);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
- this.bn.Size = new System.Drawing.Size(1084, 25);
+ this.bn.Size = new System.Drawing.Size(1008, 25);
this.bn.TabIndex = 65;
this.bn.Text = "bindingNavigator1";
//
@@ -511,6 +553,24 @@
this.bindingNavigatorCountItem.Text = "/{0}";
this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
//
+ // bindingNavigatorMoveFirstItem
+ //
+ this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
+ this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
+ this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
+ //
+ // bindingNavigatorMovePreviousItem
+ //
+ this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
+ this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
+ this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
+ //
// bindingNavigatorSeparator
//
this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
@@ -530,11 +590,84 @@
this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
//
+ // bindingNavigatorMoveNextItem
+ //
+ this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
+ this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
+ this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
+ //
+ // bindingNavigatorMoveLastItem
+ //
+ this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
+ this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
+ this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
+ //
// bindingNavigatorSeparator2
//
this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
//
+ // btSave
+ //
+ this.btSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image")));
+ this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btSave.Name = "btSave";
+ this.btSave.Size = new System.Drawing.Size(66, 22);
+ this.btSave.Text = "확인(&S)";
+ this.btSave.Click += new System.EventHandler(this.btSave_Click);
+ //
+ // btPart
+ //
+ this.btPart.Image = ((System.Drawing.Image)(resources.GetObject("btPart.Image")));
+ this.btPart.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btPart.Name = "btPart";
+ this.btPart.Size = new System.Drawing.Size(87, 22);
+ this.btPart.Text = "파트리스트";
+ this.btPart.Click += new System.EventHandler(this.btPart_Click);
+ //
+ // btIO
+ //
+ this.btIO.Image = ((System.Drawing.Image)(resources.GetObject("btIO.Image")));
+ this.btIO.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btIO.Name = "btIO";
+ this.btIO.Size = new System.Drawing.Size(60, 22);
+ this.btIO.Text = "I/O 맵";
+ this.btIO.Click += new System.EventHandler(this.btIO_Click);
+ //
+ // btMailAddr
+ //
+ this.btMailAddr.Image = ((System.Drawing.Image)(resources.GetObject("btMailAddr.Image")));
+ this.btMailAddr.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btMailAddr.Name = "btMailAddr";
+ this.btMailAddr.Size = new System.Drawing.Size(99, 22);
+ this.btMailAddr.Text = "메일주소관리";
+ this.btMailAddr.Click += new System.EventHandler(this.btMailAddr_Click);
+ //
+ // btPath
+ //
+ this.btPath.Image = ((System.Drawing.Image)(resources.GetObject("btPath.Image")));
+ this.btPath.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btPath.Name = "btPath";
+ this.btPath.Size = new System.Drawing.Size(75, 22);
+ this.btPath.Text = "폴더열기";
+ this.btPath.Click += new System.EventHandler(this.btPath_Click);
+ //
+ // btSendMail
+ //
+ this.btSendMail.Image = ((System.Drawing.Image)(resources.GetObject("btSendMail.Image")));
+ this.btSendMail.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btSendMail.Name = "btSendMail";
+ this.btSendMail.Size = new System.Drawing.Size(99, 22);
+ this.btSendMail.Text = "알림메일발송";
+ this.btSendMail.Click += new System.EventHandler(this.btSendMail_Click);
+ //
// dataGridView1
//
this.dataGridView1.AllowUserToAddRows = false;
@@ -542,7 +675,8 @@
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView1.ColumnHeadersHeight = 35;
+ this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn1,
this.dataGridViewTextBoxColumn2,
@@ -553,10 +687,53 @@
this.dataGridView1.Location = new System.Drawing.Point(1, 24);
this.dataGridView1.Margin = new System.Windows.Forms.Padding(7, 3, 7, 7);
this.dataGridView1.Name = "dataGridView1";
+ this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(508, 233);
+ this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+ this.dataGridView1.Size = new System.Drawing.Size(433, 296);
this.dataGridView1.TabIndex = 0;
+ this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick);
+ //
+ // dataGridViewTextBoxColumn1
+ //
+ this.dataGridViewTextBoxColumn1.DataPropertyName = "div";
+ this.dataGridViewTextBoxColumn1.HeaderText = "*";
+ this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+ this.dataGridViewTextBoxColumn1.ReadOnly = true;
+ this.dataGridViewTextBoxColumn1.Visible = false;
+ this.dataGridViewTextBoxColumn1.Width = 36;
+ //
+ // dataGridViewTextBoxColumn2
+ //
+ this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
+ this.dataGridViewTextBoxColumn2.HeaderText = "등록일";
+ this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+ this.dataGridViewTextBoxColumn2.ReadOnly = true;
+ this.dataGridViewTextBoxColumn2.Width = 72;
+ //
+ // dataGridViewTextBoxColumn10
+ //
+ this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+ this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle3;
+ this.dataGridViewTextBoxColumn10.HeaderText = "비고";
+ this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+ this.dataGridViewTextBoxColumn10.ReadOnly = true;
+ //
+ // dataGridViewCheckBoxColumn2
+ //
+ this.dataGridViewCheckBoxColumn2.DataPropertyName = "mailsend";
+ this.dataGridViewCheckBoxColumn2.HeaderText = "M";
+ this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
+ this.dataGridViewCheckBoxColumn2.ReadOnly = true;
+ this.dataGridViewCheckBoxColumn2.Width = 26;
+ //
+ // bsWeek
+ //
+ this.bsWeek.DataMember = "ProjectsHistory";
+ this.bsWeek.DataSource = this.dsPRJ;
//
// cmbProcess
//
@@ -587,6 +764,7 @@
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true));
+ this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.textBox1.Location = new System.Drawing.Point(93, 57);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(166, 21);
@@ -607,6 +785,19 @@
this.panel7.Size = new System.Drawing.Size(547, 64);
this.panel7.TabIndex = 85;
//
+ // cmbPart
+ //
+ this.cmbPart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.cmbPart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+ this.cmbPart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.cmbPart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbPart.FormattingEnabled = true;
+ this.cmbPart.Location = new System.Drawing.Point(93, 32);
+ this.cmbPart.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbPart.Name = "cmbPart";
+ this.cmbPart.Size = new System.Drawing.Size(102, 20);
+ this.cmbPart.TabIndex = 88;
+ //
// arLabel1
//
this.arLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
@@ -685,6 +876,7 @@
// textBox2
//
this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true));
+ this.textBox2.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.textBox2.Location = new System.Drawing.Point(93, 84);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(315, 21);
@@ -739,6 +931,8 @@
// panel5
//
this.panel5.BackColor = System.Drawing.Color.Gainsboro;
+ this.panel5.Controls.Add(label8);
+ this.panel5.Controls.Add(this.textBox3);
this.panel5.Controls.Add(this.arLabel3);
this.panel5.Controls.Add(this.usersubTextBox);
this.panel5.Controls.Add(usersubLabel);
@@ -748,9 +942,18 @@
this.panel5.Controls.Add(this.userManagerTextBox);
this.panel5.Location = new System.Drawing.Point(12, 235);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(547, 60);
+ this.panel5.Size = new System.Drawing.Size(547, 88);
this.panel5.TabIndex = 85;
//
+ // textBox3
+ //
+ this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userhw2", true));
+ this.textBox3.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+ this.textBox3.Location = new System.Drawing.Point(423, 31);
+ this.textBox3.Name = "textBox3";
+ this.textBox3.Size = new System.Drawing.Size(113, 21);
+ this.textBox3.TabIndex = 88;
+ //
// arLabel3
//
this.arLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
@@ -809,7 +1012,7 @@
this.panel2.Controls.Add(label7);
this.panel2.Controls.Add(sdateLabel);
this.panel2.Controls.Add(this.textBox1);
- this.panel2.Location = new System.Drawing.Point(12, 301);
+ this.panel2.Location = new System.Drawing.Point(12, 329);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(546, 88);
this.panel2.TabIndex = 86;
@@ -872,7 +1075,7 @@
this.panel3.Controls.Add(costnLabel);
this.panel3.Controls.Add(this.costoTextBox);
this.panel3.Controls.Add(costoLabel);
- this.panel3.Location = new System.Drawing.Point(12, 395);
+ this.panel3.Location = new System.Drawing.Point(12, 423);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(546, 88);
this.panel3.TabIndex = 86;
@@ -962,7 +1165,7 @@
this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel6.SignColor = System.Drawing.Color.Yellow;
this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.arLabel6.Size = new System.Drawing.Size(508, 23);
+ this.arLabel6.Size = new System.Drawing.Size(433, 23);
this.arLabel6.TabIndex = 86;
this.arLabel6.Text = "개선방향";
this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -992,7 +1195,7 @@
this.arPanel1.ProgressValue = 0F;
this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel1.ShowBorder = true;
- this.arPanel1.Size = new System.Drawing.Size(510, 185);
+ this.arPanel1.Size = new System.Drawing.Size(435, 145);
this.arPanel1.TabIndex = 88;
this.arPanel1.Text = "arPanel1";
this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1012,7 +1215,7 @@
this.arPanel2.ForeColor = System.Drawing.Color.Black;
this.arPanel2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arPanel2.GradientRepeatBG = true;
- this.arPanel2.Location = new System.Drawing.Point(565, 200);
+ this.arPanel2.Location = new System.Drawing.Point(565, 165);
this.arPanel2.Name = "arPanel2";
this.arPanel2.Padding = new System.Windows.Forms.Padding(1);
this.arPanel2.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
@@ -1023,7 +1226,7 @@
this.arPanel2.ProgressValue = 0F;
this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel2.ShowBorder = true;
- this.arPanel2.Size = new System.Drawing.Size(510, 283);
+ this.arPanel2.Size = new System.Drawing.Size(435, 346);
this.arPanel2.TabIndex = 89;
this.arPanel2.Text = "arPanel2";
this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1047,16 +1250,17 @@
this.bindingNavigatorMoveNextItem1,
this.bindingNavigatorMoveLastItem1,
this.bindingNavigatorSeparator5,
- this.bindingNavigatorAddNewItem,
- this.bindingNavigatorDeleteItem});
- this.bindingNavigator1.Location = new System.Drawing.Point(1, 257);
+ this.btwADd,
+ this.btwEdit,
+ this.btwDel});
+ this.bindingNavigator1.Location = new System.Drawing.Point(1, 320);
this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem1;
this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem1;
this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem1;
this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1;
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1;
- this.bindingNavigator1.Size = new System.Drawing.Size(508, 25);
+ this.bindingNavigator1.Size = new System.Drawing.Size(433, 25);
this.bindingNavigator1.TabIndex = 87;
this.bindingNavigator1.Text = "bindingNavigator1";
//
@@ -1067,6 +1271,24 @@
this.bindingNavigatorCountItem1.Text = "/{0}";
this.bindingNavigatorCountItem1.ToolTipText = "전체 항목 수";
//
+ // bindingNavigatorMoveFirstItem1
+ //
+ this.bindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMoveFirstItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem1.Image")));
+ this.bindingNavigatorMoveFirstItem1.Name = "bindingNavigatorMoveFirstItem1";
+ this.bindingNavigatorMoveFirstItem1.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMoveFirstItem1.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveFirstItem1.Text = "처음으로 이동";
+ //
+ // bindingNavigatorMovePreviousItem1
+ //
+ this.bindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMovePreviousItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem1.Image")));
+ this.bindingNavigatorMovePreviousItem1.Name = "bindingNavigatorMovePreviousItem1";
+ this.bindingNavigatorMovePreviousItem1.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMovePreviousItem1.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMovePreviousItem1.Text = "이전으로 이동";
+ //
// bindingNavigatorSeparator3
//
this.bindingNavigatorSeparator3.Name = "bindingNavigatorSeparator3";
@@ -1086,11 +1308,47 @@
this.bindingNavigatorSeparator4.Name = "bindingNavigatorSeparator4";
this.bindingNavigatorSeparator4.Size = new System.Drawing.Size(6, 25);
//
+ // bindingNavigatorMoveNextItem1
+ //
+ this.bindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMoveNextItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem1.Image")));
+ this.bindingNavigatorMoveNextItem1.Name = "bindingNavigatorMoveNextItem1";
+ this.bindingNavigatorMoveNextItem1.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMoveNextItem1.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveNextItem1.Text = "다음으로 이동";
+ //
+ // bindingNavigatorMoveLastItem1
+ //
+ this.bindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.bindingNavigatorMoveLastItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem1.Image")));
+ this.bindingNavigatorMoveLastItem1.Name = "bindingNavigatorMoveLastItem1";
+ this.bindingNavigatorMoveLastItem1.RightToLeftAutoMirrorImage = true;
+ this.bindingNavigatorMoveLastItem1.Size = new System.Drawing.Size(23, 22);
+ this.bindingNavigatorMoveLastItem1.Text = "마지막으로 이동";
+ //
// bindingNavigatorSeparator5
//
this.bindingNavigatorSeparator5.Name = "bindingNavigatorSeparator5";
this.bindingNavigatorSeparator5.Size = new System.Drawing.Size(6, 25);
//
+ // btwADd
+ //
+ this.btwADd.Image = ((System.Drawing.Image)(resources.GetObject("btwADd.Image")));
+ this.btwADd.Name = "btwADd";
+ this.btwADd.RightToLeftAutoMirrorImage = true;
+ this.btwADd.Size = new System.Drawing.Size(51, 22);
+ this.btwADd.Text = "추가";
+ this.btwADd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
+ //
+ // btwDel
+ //
+ this.btwDel.Image = ((System.Drawing.Image)(resources.GetObject("btwDel.Image")));
+ this.btwDel.Name = "btwDel";
+ this.btwDel.RightToLeftAutoMirrorImage = true;
+ this.btwDel.Size = new System.Drawing.Size(51, 22);
+ this.btwDel.Text = "삭제";
+ this.btwDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
+ //
// arLabel7
//
this.arLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
@@ -1130,229 +1388,13 @@
this.arLabel7.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel7.SignColor = System.Drawing.Color.Yellow;
this.arLabel7.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.arLabel7.Size = new System.Drawing.Size(508, 23);
+ this.arLabel7.Size = new System.Drawing.Size(433, 23);
this.arLabel7.TabIndex = 86;
this.arLabel7.Text = "주간업무현황";
this.arLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.arLabel7.TextShadow = true;
this.arLabel7.TextVisible = true;
//
- // cmbPart
- //
- this.cmbPart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
- this.cmbPart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
- this.cmbPart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.cmbPart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbPart.FormattingEnabled = true;
- this.cmbPart.Location = new System.Drawing.Point(93, 32);
- this.cmbPart.Margin = new System.Windows.Forms.Padding(4);
- this.cmbPart.Name = "cmbPart";
- this.cmbPart.Size = new System.Drawing.Size(102, 20);
- this.cmbPart.TabIndex = 88;
- //
- // label6
- //
- label6.AutoSize = true;
- label6.Location = new System.Drawing.Point(56, 37);
- label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- label6.Name = "label6";
- label6.Size = new System.Drawing.Size(29, 12);
- label6.TabIndex = 87;
- label6.Text = "파트";
- //
- // bindingNavigatorMoveFirstItem1
- //
- this.bindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMoveFirstItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem1.Image")));
- this.bindingNavigatorMoveFirstItem1.Name = "bindingNavigatorMoveFirstItem1";
- this.bindingNavigatorMoveFirstItem1.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveFirstItem1.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMoveFirstItem1.Text = "처음으로 이동";
- //
- // bindingNavigatorMovePreviousItem1
- //
- this.bindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMovePreviousItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem1.Image")));
- this.bindingNavigatorMovePreviousItem1.Name = "bindingNavigatorMovePreviousItem1";
- this.bindingNavigatorMovePreviousItem1.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMovePreviousItem1.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMovePreviousItem1.Text = "이전으로 이동";
- //
- // bindingNavigatorMoveNextItem1
- //
- this.bindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMoveNextItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem1.Image")));
- this.bindingNavigatorMoveNextItem1.Name = "bindingNavigatorMoveNextItem1";
- this.bindingNavigatorMoveNextItem1.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveNextItem1.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMoveNextItem1.Text = "다음으로 이동";
- //
- // bindingNavigatorMoveLastItem1
- //
- this.bindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMoveLastItem1.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem1.Image")));
- this.bindingNavigatorMoveLastItem1.Name = "bindingNavigatorMoveLastItem1";
- this.bindingNavigatorMoveLastItem1.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveLastItem1.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMoveLastItem1.Text = "마지막으로 이동";
- //
- // bindingNavigatorAddNewItem
- //
- this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
- this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
- this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorAddNewItem.Text = "새로 추가";
- this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
- //
- // bindingNavigatorDeleteItem
- //
- this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
- this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
- this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorDeleteItem.Text = "삭제";
- this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
- //
- // bindingNavigatorMoveFirstItem
- //
- this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
- this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
- this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
- //
- // bindingNavigatorMovePreviousItem
- //
- this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
- this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
- this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
- //
- // bindingNavigatorMoveNextItem
- //
- this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
- this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
- this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
- //
- // bindingNavigatorMoveLastItem
- //
- this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
- this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
- this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
- //
- // btSave
- //
- this.btSave.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image")));
- this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btSave.Name = "btSave";
- this.btSave.Size = new System.Drawing.Size(66, 22);
- this.btSave.Text = "저장(&S)";
- this.btSave.Click += new System.EventHandler(this.btSave_Click);
- //
- // btPart
- //
- this.btPart.Image = ((System.Drawing.Image)(resources.GetObject("btPart.Image")));
- this.btPart.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btPart.Name = "btPart";
- this.btPart.Size = new System.Drawing.Size(87, 22);
- this.btPart.Text = "파트리스트";
- this.btPart.Click += new System.EventHandler(this.btPart_Click);
- //
- // btIO
- //
- this.btIO.Image = ((System.Drawing.Image)(resources.GetObject("btIO.Image")));
- this.btIO.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btIO.Name = "btIO";
- this.btIO.Size = new System.Drawing.Size(60, 22);
- this.btIO.Text = "I/O 맵";
- this.btIO.Click += new System.EventHandler(this.btIO_Click);
- //
- // btMailAddr
- //
- this.btMailAddr.Image = ((System.Drawing.Image)(resources.GetObject("btMailAddr.Image")));
- this.btMailAddr.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btMailAddr.Name = "btMailAddr";
- this.btMailAddr.Size = new System.Drawing.Size(99, 22);
- this.btMailAddr.Text = "메일주소관리";
- this.btMailAddr.Click += new System.EventHandler(this.btMailAddr_Click);
- //
- // btPath
- //
- this.btPath.Image = ((System.Drawing.Image)(resources.GetObject("btPath.Image")));
- this.btPath.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btPath.Name = "btPath";
- this.btPath.Size = new System.Drawing.Size(75, 22);
- this.btPath.Text = "폴더열기";
- this.btPath.Click += new System.EventHandler(this.btPath_Click);
- //
- // btSendMail
- //
- this.btSendMail.Image = ((System.Drawing.Image)(resources.GetObject("btSendMail.Image")));
- this.btSendMail.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btSendMail.Name = "btSendMail";
- this.btSendMail.Size = new System.Drawing.Size(99, 22);
- this.btSendMail.Text = "알림메일발송";
- this.btSendMail.Click += new System.EventHandler(this.btSendMail_Click);
- //
- // dataGridViewTextBoxColumn1
- //
- this.dataGridViewTextBoxColumn1.DataPropertyName = "div";
- this.dataGridViewTextBoxColumn1.HeaderText = "*";
- this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
- this.dataGridViewTextBoxColumn1.Visible = false;
- this.dataGridViewTextBoxColumn1.Width = 17;
- //
- // dataGridViewTextBoxColumn2
- //
- this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
- this.dataGridViewTextBoxColumn2.HeaderText = "등록일";
- this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
- this.dataGridViewTextBoxColumn2.Width = 72;
- //
- // dataGridViewTextBoxColumn10
- //
- this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
- this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1;
- this.dataGridViewTextBoxColumn10.HeaderText = "비고";
- this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
- //
- // dataGridViewCheckBoxColumn2
- //
- this.dataGridViewCheckBoxColumn2.DataPropertyName = "mailsend";
- this.dataGridViewCheckBoxColumn2.HeaderText = "M";
- this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
- this.dataGridViewCheckBoxColumn2.Width = 26;
- //
- // bsWeek
- //
- this.bsWeek.DataMember = "ProjectsHistory";
- this.bsWeek.DataSource = this.dsPRJ;
- //
- // dsPRJ
- //
- this.dsPRJ.DataSetName = "dsPRJ";
- this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
- //
- // bs
- //
- this.bs.DataMember = "Projects";
- this.bs.DataSource = this.dsPRJ;
- //
// ta
//
this.ta.ClearBeforeFill = true;
@@ -1382,11 +1424,20 @@
//
this.taSchedule.ClearBeforeFill = true;
//
+ // btwEdit
+ //
+ this.btwEdit.Image = ((System.Drawing.Image)(resources.GetObject("btwEdit.Image")));
+ this.btwEdit.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btwEdit.Name = "btwEdit";
+ this.btwEdit.Size = new System.Drawing.Size(51, 22);
+ this.btwEdit.Text = "편집";
+ this.btwEdit.Click += new System.EventHandler(this.btwEdit_Click);
+ //
// fProjectData
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1084, 516);
+ this.ClientSize = new System.Drawing.Size(1008, 542);
this.Controls.Add(this.arPanel2);
this.Controls.Add(this.arPanel1);
this.Controls.Add(this.panel3);
@@ -1401,10 +1452,13 @@
this.Name = "fProjectData";
this.Text = "프로젝트 정보 추가/편집";
this.Load += new System.EventHandler(this.fProjectData_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).EndInit();
this.panel7.ResumeLayout(false);
this.panel7.PerformLayout();
this.panel1.ResumeLayout(false);
@@ -1422,9 +1476,6 @@
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit();
this.bindingNavigator1.ResumeLayout(false);
this.bindingNavigator1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.bsWeek)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bsSchedule)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1492,9 +1543,9 @@
private System.Windows.Forms.ToolStripButton btPath;
private System.Windows.Forms.TextBox tbPath;
private System.Windows.Forms.BindingNavigator bindingNavigator1;
- private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
+ private System.Windows.Forms.ToolStripButton btwADd;
private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem1;
- private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem;
+ private System.Windows.Forms.ToolStripButton btwDel;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem1;
private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem1;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator3;
@@ -1509,5 +1560,7 @@
private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2;
private System.Windows.Forms.ToolStripButton btSendMail;
private System.Windows.Forms.ComboBox cmbPart;
+ private System.Windows.Forms.TextBox textBox3;
+ private System.Windows.Forms.ToolStripButton btwEdit;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/fProjectData.cs b/SubProject/FPJ0000/fProjectData.cs
index 2451f96..fa5269d 100644
--- a/SubProject/FPJ0000/fProjectData.cs
+++ b/SubProject/FPJ0000/fProjectData.cs
@@ -51,15 +51,8 @@ namespace FPJ0000
this.bs.DataSource = dr;
- try
- {
- if(dr.idx >= 0)
- this.taHist.Fill(this.dsPRJ.ProjectsHistory,this.dr.idx);
- }
- catch (System.Exception ex)
- {
- System.Windows.Forms.MessageBox.Show(ex.Message);
- }
+ //주간일지내역을 업데이트
+ refresh_History();
try
{
@@ -84,6 +77,7 @@ namespace FPJ0000
//btWeek.Enabled = btPart.Enabled;
btMailAddr.Enabled = btPart.Enabled;
btPath.Enabled = btPart.Enabled;
+ btSendMail.Enabled = btPart.Enabled;
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project));
@@ -180,6 +174,39 @@ namespace FPJ0000
prjlist.Add(int.Parse(this.tbIdx.Text));
fMailSend f = new fMailSend(prjlist);
f.ShowDialog();
+ refresh_History();
+ }
+
+ void refresh_History()
+ {
+ try
+ {
+ if (dr.idx >= 0)
+ this.taHist.Fill(this.dsPRJ.ProjectsHistory, this.dr.idx);
+ }
+ catch (System.Exception ex)
+ {
+ System.Windows.Forms.MessageBox.Show(ex.Message);
+ }
+
+ }
+
+ private void btwEdit_Click(object sender, EventArgs e)
+ {
+ var drv = this.bsWeek.Current as DataRowView;
+ if (drv == null) return;
+
+ var newdr = drv.Row as dsPRJ.ProjectsHistoryRow;
+ var f = new fHistAdd(newdr);
+ if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ newdr.EndEdit();
+ }
+ }
+
+ private void dataGridView1_DoubleClick(object sender, EventArgs e)
+ {
+ btwEdit.PerformClick();
}
diff --git a/SubProject/FPJ0000/fProjectData.resx b/SubProject/FPJ0000/fProjectData.resx
index 5cfa287..690f5f8 100644
--- a/SubProject/FPJ0000/fProjectData.resx
+++ b/SubProject/FPJ0000/fProjectData.resx
@@ -174,9 +174,21 @@
False
+
+ False
+
+
+ False
+
100, 17
+
+ 100, 17
+
+
+ 17, 17
+
17, 17
@@ -317,9 +329,6 @@
449, 17
-
- False
-
773, 17
@@ -363,7 +372,7 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
@@ -375,7 +384,22 @@
rkJggg==
-
+
+
+ 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==
+
+
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs
index f8f80d1..753cf5d 100644
--- a/SubProject/FPJ0000/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/fProjectList.Designer.cs
@@ -31,7 +31,6 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList));
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = 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.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
@@ -40,11 +39,13 @@
FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType21 = 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.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -72,6 +73,7 @@
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+ this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.partListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.scheduleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.iOMapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -100,33 +102,26 @@
this.btSearch = new System.Windows.Forms.ToolStripButton();
this.btViewDel = new System.Windows.Forms.ToolStripButton();
this.label1 = new System.Windows.Forms.Label();
- this.panel1 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
- this.label2 = new System.Windows.Forms.Label();
- this.textBox3 = new System.Windows.Forms.TextBox();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.label11 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.bsHist = new System.Windows.Forms.BindingSource(this.components);
- this.panel2 = new System.Windows.Forms.Panel();
this.textBox4 = new System.Windows.Forms.TextBox();
- this.label11 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.textBox3 = new System.Windows.Forms.TextBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.label6 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
- this.textBox8 = new System.Windows.Forms.TextBox();
- this.label8 = new System.Windows.Forms.Label();
- this.textBox7 = new System.Windows.Forms.TextBox();
- this.label10 = new System.Windows.Forms.Label();
- this.textBox6 = new System.Windows.Forms.TextBox();
- this.textBox5 = new System.Windows.Forms.TextBox();
- this.label9 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
- this.textBox2 = new System.Windows.Forms.TextBox();
+ this.label9 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.textBox9 = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.panel3 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -135,11 +130,11 @@
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.toolStrip1.SuspendLayout();
- this.panel1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
+ this.panel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit();
- this.panel2.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
+ this.panel3.SuspendLayout();
this.SuspendLayout();
//
// bn
@@ -335,7 +330,7 @@
this.toolStripMenuItem1,
this.엑셀파일로저장ToolStripMenuItem});
this.cm.Name = "contextMenuStrip1";
- this.cm.Size = new System.Drawing.Size(305, 332);
+ this.cm.Size = new System.Drawing.Size(305, 310);
//
// columnSizeToolStripMenuItem
//
@@ -385,6 +380,13 @@
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(301, 6);
//
+ // 편집ToolStripMenuItem
+ //
+ this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem";
+ this.편집ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
+ this.편집ToolStripMenuItem.Text = "편집";
+ this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click);
+ //
// partListToolStripMenuItem
//
this.partListToolStripMenuItem.Name = "partListToolStripMenuItem";
@@ -457,6 +459,8 @@
// fpSpread1
//
this.fpSpread1.AccessibleDescription = "";
+ this.fpSpread1.AutoFitColumnOptions = FarPoint.Win.Spread.PreferredSizeColumnOptions.IncludeAll;
+ this.fpSpread1.AutoFitRowOptions = FarPoint.Win.Spread.PreferredSizeRowOptions.IncludeAll;
this.fpSpread1.ContextMenuStrip = this.cm;
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.EditModeReplace = true;
@@ -465,7 +469,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(620, 480);
+ this.fpSpread1.Size = new System.Drawing.Size(1052, 304);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 2;
//
@@ -475,7 +479,7 @@
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 = 15;
+ this.fpSpread1_Sheet1.ColumnCount = 16;
this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
@@ -492,26 +496,27 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Requestor";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Project\r\nChampion";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 2;
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Co Workers";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Asset No.";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Project";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Asset No.";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "대수";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Project";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Original\r\n($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "대수";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).StyleName = " ";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Input\r\n($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Original\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Effect\r\n($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).StyleName = " ";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Input\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Remark";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Effect\r\n($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Remark";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "H/W";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "S/W";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Asset No.";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "전장";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "S/W";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Asset No.";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType6.DecimalPlaces = 0;
@@ -525,87 +530,94 @@
this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType11;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F;
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType12;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType13;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part";
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType13;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType14;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F;
this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType14;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType15;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType15;
+ this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType16;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F;
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType16;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17;
- this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usersub";
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType18;
+ this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userhw2";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(7).Label = "S/W";
+ this.fpSpread1_Sheet1.Columns.Get(7).Label = "전장";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType18;
- this.fpSpread1_Sheet1.Columns.Get(8).DataField = "asset";
+ this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType19;
+ this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usersub";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(8).Label = "Asset No.";
+ this.fpSpread1_Sheet1.Columns.Get(8).Label = "S/W";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F;
- this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType19;
- this.fpSpread1_Sheet1.Columns.Get(9).DataField = "name";
- this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType20;
+ this.fpSpread1_Sheet1.Columns.Get(9).DataField = "asset";
+ this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(9).Label = "Asset No.";
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType21;
+ this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name";
+ this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+ this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F;
numberCellType7.DecimalPlaces = 0;
numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType7.MaximumValue = 2147483647D;
numberCellType7.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType7;
- this.fpSpread1_Sheet1.Columns.Get(10).DataField = "cnt";
- this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(10).Width = 59F;
- numberCellType8.MaximumValue = 999999999999999D;
- numberCellType8.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType8;
- this.fpSpread1_Sheet1.Columns.Get(11).DataField = "costo";
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType7;
+ this.fpSpread1_Sheet1.Columns.Get(11).DataField = "cnt";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- numberCellType9.MaximumValue = 999999999999999D;
- numberCellType9.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType9;
- this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costn";
+ this.fpSpread1_Sheet1.Columns.Get(11).Width = 59F;
+ numberCellType8.MaximumValue = 999999999999999D;
+ numberCellType8.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType8;
+ this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costo";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
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)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType10.MaximumValue = 999999999999999D;
- numberCellType10.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType10;
- this.fpSpread1_Sheet1.Columns.Get(13).DataField = "coste";
- this.fpSpread1_Sheet1.Columns.Get(13).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ numberCellType9.MaximumValue = 999999999999999D;
+ numberCellType9.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType9;
+ this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costn";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType20;
- this.fpSpread1_Sheet1.Columns.Get(14).DataField = "memo";
+ this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ numberCellType10.MaximumValue = 999999999999999D;
+ numberCellType10.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType10;
+ this.fpSpread1_Sheet1.Columns.Get(14).DataField = "coste";
+ this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType22;
+ this.fpSpread1_Sheet1.Columns.Get(15).DataField = "memo";
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
@@ -752,7 +764,7 @@
this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true));
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label1.Location = new System.Drawing.Point(0, 505);
+ this.label1.Location = new System.Drawing.Point(0, 329);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1052, 23);
@@ -760,71 +772,52 @@
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // panel1
- //
- this.panel1.Controls.Add(this.tableLayoutPanel1);
- this.panel1.Controls.Add(this.tableLayoutPanel2);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(620, 25);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(432, 480);
- this.panel1.TabIndex = 6;
- //
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 100F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.Controls.Add(this.panel4, 1, 0);
+ this.tableLayoutPanel1.Controls.Add(this.textBox4, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.textBox3, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.label4, 1, 2);
- this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 3);
- this.tableLayoutPanel1.Controls.Add(this.label11, 0, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 74);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 22);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 4;
+ this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(432, 406);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1052, 154);
this.tableLayoutPanel1.TabIndex = 11;
//
- // label2
+ // panel4
//
- this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.tableLayoutPanel1.SetColumnSpan(this.label2, 2);
- this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label2.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label2.Location = new System.Drawing.Point(0, 0);
- this.label2.Margin = new System.Windows.Forms.Padding(0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(432, 25);
- this.label2.TabIndex = 0;
- this.label2.Text = "개선방향";
- this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.panel4.Controls.Add(this.label11);
+ this.panel4.Controls.Add(this.label4);
+ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel4.Location = new System.Drawing.Point(526, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(0);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(526, 25);
+ this.panel4.TabIndex = 0;
//
- // textBox3
+ // label11
//
- this.tableLayoutPanel1.SetColumnSpan(this.textBox3, 2);
- this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
- this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox3.Location = new System.Drawing.Point(0, 25);
- this.textBox3.Margin = new System.Windows.Forms.Padding(0);
- this.textBox3.Multiline = true;
- this.textBox3.Name = "textBox3";
- this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.textBox3.Size = new System.Drawing.Size(432, 178);
- this.textBox3.TabIndex = 8;
+ this.label11.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label11.Location = new System.Drawing.Point(0, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(426, 25);
+ this.label11.TabIndex = 14;
+ this.label11.Text = "주간 진행 내용";
+ this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label4
//
this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "pdate", true));
- this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label4.Dock = System.Windows.Forms.DockStyle.Right;
this.label4.Font = new System.Drawing.Font("Cambria", 11.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(332, 203);
+ this.label4.Location = new System.Drawing.Point(426, 0);
this.label4.Margin = new System.Windows.Forms.Padding(0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(100, 25);
@@ -838,71 +831,70 @@
this.bsHist.DataSource = this.dsMSSQL;
this.bsHist.Sort = "pdate desc";
//
- // panel2
- //
- this.tableLayoutPanel1.SetColumnSpan(this.panel2, 2);
- this.panel2.Controls.Add(this.textBox4);
- this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel2.Location = new System.Drawing.Point(0, 228);
- this.panel2.Margin = new System.Windows.Forms.Padding(0);
- this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(432, 178);
- this.panel2.TabIndex = 13;
- //
// textBox4
//
this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true));
this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox4.Location = new System.Drawing.Point(0, 0);
+ this.textBox4.Location = new System.Drawing.Point(526, 25);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(0);
this.textBox4.Multiline = true;
this.textBox4.Name = "textBox4";
this.textBox4.ReadOnly = true;
this.textBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.textBox4.Size = new System.Drawing.Size(432, 178);
+ this.textBox4.Size = new System.Drawing.Size(526, 129);
this.textBox4.TabIndex = 10;
//
- // label11
+ // label2
//
- this.label11.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label11.Location = new System.Drawing.Point(3, 203);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(326, 25);
- this.label11.TabIndex = 14;
- this.label11.Text = "Weekly History";
- this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label2.Font = new System.Drawing.Font("굴림", 9F);
+ this.label2.Location = new System.Drawing.Point(0, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(526, 25);
+ this.label2.TabIndex = 0;
+ this.label2.Text = "요청 사항";
+ this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // textBox3
+ //
+ this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
+ this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.textBox3.Location = new System.Drawing.Point(0, 25);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(0);
+ this.textBox3.Multiline = true;
+ this.textBox3.Name = "textBox3";
+ this.textBox3.ReadOnly = true;
+ this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.textBox3.Size = new System.Drawing.Size(526, 129);
+ this.textBox3.TabIndex = 8;
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
- this.tableLayoutPanel2.ColumnCount = 6;
+ this.tableLayoutPanel2.ColumnCount = 8;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.06266F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.81203F));
this.tableLayoutPanel2.Controls.Add(this.label6, 0, 0);
- this.tableLayoutPanel2.Controls.Add(this.textBox1, 1, 0);
- this.tableLayoutPanel2.Controls.Add(this.label7, 0, 2);
- this.tableLayoutPanel2.Controls.Add(this.textBox8, 1, 2);
- this.tableLayoutPanel2.Controls.Add(this.label8, 2, 2);
- this.tableLayoutPanel2.Controls.Add(this.textBox7, 3, 2);
- this.tableLayoutPanel2.Controls.Add(this.label10, 4, 2);
- this.tableLayoutPanel2.Controls.Add(this.textBox6, 5, 2);
- this.tableLayoutPanel2.Controls.Add(this.textBox5, 4, 0);
- this.tableLayoutPanel2.Controls.Add(this.label9, 3, 0);
- this.tableLayoutPanel2.Controls.Add(this.label5, 3, 1);
- this.tableLayoutPanel2.Controls.Add(this.textBox2, 4, 1);
- this.tableLayoutPanel2.Controls.Add(this.label3, 0, 1);
- this.tableLayoutPanel2.Controls.Add(this.textBox9, 1, 1);
+ this.tableLayoutPanel2.Controls.Add(this.label5, 6, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label9, 2, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label3, 4, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label7, 1, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label8, 3, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label10, 5, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label12, 7, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
- this.tableLayoutPanel2.RowCount = 3;
+ this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(432, 74);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(1052, 22);
this.tableLayoutPanel2.TabIndex = 12;
//
// label6
@@ -911,194 +903,115 @@
this.label6.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label6.Location = new System.Drawing.Point(4, 1);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(74, 25);
+ this.label6.Size = new System.Drawing.Size(74, 20);
this.label6.TabIndex = 0;
this.label6.Text = "Start";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.toolTip1.SetToolTip(this.label6, "시작일");
//
- // textBox1
+ // label5
//
- this.tableLayoutPanel2.SetColumnSpan(this.textBox1, 2);
- this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true));
- this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox1.Location = new System.Drawing.Point(82, 1);
- this.textBox1.Margin = new System.Windows.Forms.Padding(0);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(142, 21);
- this.textBox1.TabIndex = 1;
- this.textBox1.Text = "--";
- this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.toolTip1.SetToolTip(this.textBox1, "시작일");
- //
- // label7
- //
- this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label7.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label7.Location = new System.Drawing.Point(4, 53);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(74, 20);
- this.label7.TabIndex = 0;
- this.label7.Text = "Origin($K)";
- this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // textBox8
- //
- this.textBox8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costo", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2"));
- this.textBox8.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox8.Location = new System.Drawing.Point(82, 53);
- this.textBox8.Margin = new System.Windows.Forms.Padding(0);
- this.textBox8.Name = "textBox8";
- this.textBox8.Size = new System.Drawing.Size(61, 21);
- this.textBox8.TabIndex = 1;
- this.textBox8.Text = "--";
- this.textBox8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- //
- // label8
- //
- this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label8.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label8.Location = new System.Drawing.Point(147, 53);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(74, 20);
- this.label8.TabIndex = 0;
- this.label8.Text = "Input($K)";
- this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // textBox7
- //
- this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "costn", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2"));
- this.textBox7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox7.Location = new System.Drawing.Point(225, 53);
- this.textBox7.Margin = new System.Windows.Forms.Padding(0);
- this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(61, 21);
- this.textBox7.TabIndex = 1;
- this.textBox7.Text = "--";
- this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- //
- // label10
- //
- this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(290, 53);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(74, 20);
- this.label10.TabIndex = 0;
- this.label10.Text = "Effect($K)";
- this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // textBox6
- //
- this.textBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "coste", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, "0", "N2"));
- this.textBox6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox6.Location = new System.Drawing.Point(368, 53);
- this.textBox6.Margin = new System.Windows.Forms.Padding(0);
- this.textBox6.Name = "textBox6";
- this.textBox6.ReadOnly = true;
- this.textBox6.Size = new System.Drawing.Size(63, 21);
- this.textBox6.TabIndex = 1;
- this.textBox6.Text = "--";
- this.textBox6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- //
- // textBox5
- //
- this.tableLayoutPanel2.SetColumnSpan(this.textBox5, 2);
- this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true));
- this.textBox5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox5.Location = new System.Drawing.Point(287, 1);
- this.textBox5.Margin = new System.Windows.Forms.Padding(0);
- this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(144, 21);
- this.textBox5.TabIndex = 1;
- this.textBox5.Text = "--";
- this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.toolTip1.SetToolTip(this.textBox5, "예상완료일");
+ this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label5.Location = new System.Drawing.Point(793, 1);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(74, 20);
+ this.label5.TabIndex = 0;
+ this.label5.Text = "End";
+ this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.toolTip1.SetToolTip(this.label5, "완료일");
//
// label9
//
this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
this.label9.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.label9.Location = new System.Drawing.Point(228, 1);
+ this.label9.Location = new System.Drawing.Point(267, 1);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(55, 25);
+ this.label9.Size = new System.Drawing.Size(74, 20);
this.label9.TabIndex = 0;
this.label9.Text = "Due";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.toolTip1.SetToolTip(this.label9, "예상완료일");
//
- // label5
- //
- this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(228, 27);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(55, 25);
- this.label5.TabIndex = 0;
- this.label5.Text = "End";
- this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.toolTip1.SetToolTip(this.label5, "완료일");
- //
- // textBox2
- //
- this.tableLayoutPanel2.SetColumnSpan(this.textBox2, 2);
- this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true));
- this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox2.Location = new System.Drawing.Point(287, 27);
- this.textBox2.Margin = new System.Windows.Forms.Padding(0);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(144, 21);
- this.textBox2.TabIndex = 1;
- this.textBox2.Text = "--";
- this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.toolTip1.SetToolTip(this.textBox2, "완료일");
- //
// label3
//
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
- this.label3.Location = new System.Drawing.Point(4, 27);
+ this.label3.Location = new System.Drawing.Point(530, 1);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(74, 25);
+ this.label3.Size = new System.Drawing.Size(74, 20);
this.label3.TabIndex = 0;
this.label3.Text = "Out";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.toolTip1.SetToolTip(this.label3, "출고일(프로그램의 경우 설치일)");
//
- // textBox9
+ // label7
//
- this.tableLayoutPanel2.SetColumnSpan(this.textBox9, 2);
- this.textBox9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true));
- this.textBox9.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox9.Location = new System.Drawing.Point(82, 27);
- this.textBox9.Margin = new System.Windows.Forms.Padding(0);
- this.textBox9.Name = "textBox9";
- this.textBox9.Size = new System.Drawing.Size(142, 21);
- this.textBox9.TabIndex = 1;
- this.textBox9.Text = "--";
- this.textBox9.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.toolTip1.SetToolTip(this.textBox9, "출고일(프로그램의 경우 설치일)");
+ this.label7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sdate", true));
+ this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label7.Location = new System.Drawing.Point(85, 1);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(175, 20);
+ this.label7.TabIndex = 1;
+ this.label7.Text = "--";
+ this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // label8
+ //
+ this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true));
+ this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label8.Location = new System.Drawing.Point(348, 1);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(175, 20);
+ this.label8.TabIndex = 1;
+ this.label8.Text = "--";
+ this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // label10
+ //
+ this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true));
+ this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label10.Location = new System.Drawing.Point(611, 1);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(175, 20);
+ this.label10.TabIndex = 1;
+ this.label10.Text = "--";
+ this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // label12
+ //
+ this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true));
+ this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label12.Location = new System.Drawing.Point(874, 1);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(174, 20);
+ this.label12.TabIndex = 1;
+ this.label12.Text = "--";
+ this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// taHist
//
this.taHist.ClearBeforeFill = true;
//
- // 편집ToolStripMenuItem
+ // panel3
//
- this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem";
- this.편집ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
- this.편집ToolStripMenuItem.Text = "편집";
- this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click);
+ this.panel3.Controls.Add(this.tableLayoutPanel1);
+ this.panel3.Controls.Add(this.tableLayoutPanel2);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel3.Location = new System.Drawing.Point(0, 352);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(1052, 176);
+ this.panel3.TabIndex = 7;
//
// fProjectList
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1052, 553);
this.Controls.Add(this.fpSpread1);
- this.Controls.Add(this.panel1);
this.Controls.Add(this.label1);
+ this.Controls.Add(this.panel3);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);
this.Name = "fProjectList";
@@ -1115,14 +1028,12 @@
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
- this.panel1.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
+ this.panel4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit();
- this.panel2.ResumeLayout(false);
- this.panel2.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false);
- this.tableLayoutPanel2.PerformLayout();
+ this.panel3.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1176,7 +1087,6 @@
private System.Windows.Forms.ToolStripTextBox tbFind;
private System.Windows.Forms.ToolStripButton btFind;
private System.Windows.Forms.ToolStripButton chk대기;
- private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.TextBox textBox4;
@@ -1190,27 +1100,22 @@
private System.Windows.Forms.BindingSource bsHist;
private dsPRJTableAdapters.ProjectsHistoryTableAdapter taHist;
private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.Label label6;
- private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label9;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.TextBox textBox1;
- private System.Windows.Forms.TextBox textBox2;
- private System.Windows.Forms.TextBox textBox5;
- private System.Windows.Forms.TextBox textBox6;
- private System.Windows.Forms.TextBox textBox7;
- private System.Windows.Forms.TextBox textBox8;
private System.Windows.Forms.ToolStripButton btEdit;
- private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox textBox9;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.ToolStripButton btViewDel;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem;
+ private System.Windows.Forms.Panel panel4;
+ private System.Windows.Forms.Panel panel3;
+ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Label label12;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs
index ed52891..2d5e44c 100644
--- a/SubProject/FPJ0000/fProjectList.cs
+++ b/SubProject/FPJ0000/fProjectList.cs
@@ -19,7 +19,7 @@ namespace FPJ0000
fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow;
this.FormClosed += __Closed;
-
+
}
void __Closed(object sender, FormClosedEventArgs e)
@@ -129,8 +129,8 @@ namespace FPJ0000
string State_Select = " SELECT * FROM Projects";
string State_where = " WHERE ";
-
- if (btViewDel.Checked) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
+
+ if (btViewDel.Checked==false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
State_where += " pdate >= '" + cmbYear.Text + "-01-01' AND (ISNULL(userManager, '') LIKE @username OR " +
"ISNULL(usermain, '') LIKE @username OR " +
"ISNULL(reqstaff, '') LIKE @username OR " +
@@ -204,30 +204,32 @@ namespace FPJ0000
this.fpSpread1.ResumeLayout();
}
- void saveData()
+ void saveData(Boolean pmt)
{
this.Validate();
this.bs.EndEdit();
- var dlg = FCOMMON.Util.MsgQ("변경 사항을 저장하시겠습니까?");
- if (dlg == System.Windows.Forms.DialogResult.Yes)
+ if(pmt)
{
- try
- {
- this.tam.UpdateAll(this.dsMSSQL);
- dsMSSQL.AcceptChanges();
- FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
- }
- catch (Exception ex)
- {
- FCOMMON.Util.MsgE(ex.Message);
- }
+ var dlg = FCOMMON.Util.MsgQ("변경 사항을 저장하시겠습니까?");
+ if (dlg != System.Windows.Forms.DialogResult.Yes) return;
+ }
+
+ try
+ {
+ this.tam.UpdateAll(this.dsMSSQL);
+ dsMSSQL.AcceptChanges();
+ FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
+ }
+ catch (Exception ex)
+ {
+ FCOMMON.Util.MsgE(ex.Message);
}
}
private void projectsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
- saveData();
+ saveData(true);
}
void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e)
@@ -372,6 +374,13 @@ namespace FPJ0000
if (dlg == System.Windows.Forms.DialogResult.Yes)
{
bs.RemoveCurrent();
+
+ //일반사용자는 바로 저장되도록 함
+ int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project));
+ if (curLevel < 5)
+ {
+ saveData(false); //자동저장
+ }
}
}
@@ -442,7 +451,16 @@ namespace FPJ0000
if (dlg == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.Projects.AddProjectsRow(newdr);
- ta.Update(newdr);
+ try
+ {
+
+ ta.Update(newdr);
+ }
+ catch (Exception ex)
+ {
+ FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
+ }
+
}
else newdr.Delete();
}
@@ -457,7 +475,14 @@ namespace FPJ0000
if (drv == null) return;
var dr = drv.Row as dsPRJ.ProjectsRow;
var f = new fProjectData(dr);
- f.ShowDialog();
+ if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project));
+ if (curLevel < 5)
+ {
+ saveData(false); //자동저장
+ }
+ }
}
private void 편집ToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx
index 0176bbd..aed326e 100644
--- a/SubProject/FPJ0000/fProjectList.resx
+++ b/SubProject/FPJ0000/fProjectList.resx
@@ -260,7 +260,7 @@
248, 17
- 731, 17
+ 17, 56
455, 17
@@ -397,9 +397,6 @@
561, 17
-
- 561, 17
-
883, 17