diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs
index 9973048..c276015 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport.cs
@@ -311,7 +311,7 @@ namespace FPJ0000
{
if (dr.RowState != DataRowState.Unchanged)
{
- this.ta.Update(dr);
+ int cnt = this.ta.Update(dr);
dr.AcceptChanges();
}
}
diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
index cae28a7..1e480fb 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
@@ -78,7 +78,7 @@ namespace FPJ0000.JobReport
// tbWW.Text = dr.ww;
dtPdate.Value = DateTime.Parse(dr.pdate); //일자선택
- cmbUser.SelectedValue = dr.wuid;
+ cmbUser.SelectedValue = dr.uid;
tbProject.Text = dr.projectName;
cmbRequest.SelectedValue = dr.requestpart;
cmbPackage.SelectedValue = dr.package;
diff --git a/SubProject/FPJ0000/JobReport/rJobReport.rdlc b/SubProject/FPJ0000/JobReport/rJobReport.rdlc
new file mode 100644
index 0000000..d127d2b
--- /dev/null
+++ b/SubProject/FPJ0000/JobReport/rJobReport.rdlc
@@ -0,0 +1,863 @@
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ 사원명
+
+
+
+
+
+
+ Textbox7
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+ 1.09771cm
+
+
+ 0.9125cm
+
+
+ 1.30938cm
+
+
+ 1.09771cm
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!hrs.Value)
+
+
+
+
+
+
+ hrs
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!ot.Value)
+
+
+
+
+
+
+ ot
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!hrs.Value)
+
+
+
+
+
+
+ Textbox15
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!ot.Value)
+
+
+
+
+
+
+ Textbox19
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ 0.6cm
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!hrs.Value)
+
+
+
+
+
+
+ Textbox11
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!ot.Value)
+
+
+
+
+
+
+ Textbox12
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!hrs.Value)
+
+
+
+
+
+
+ Textbox16
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+ true
+ true
+
+
+
+
+ =Sum(Fields!ot.Value)
+
+
+
+
+
+
+ Textbox20
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+ =Fields!yymm.Value
+
+
+
+
+ =Fields!yymm.Value
+
+
+
+ 0.6cm
+
+
+ true
+ true
+
+
+
+
+ =Fields!yymm.Value
+
+
+
+
+
+
+ yymm
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.6cm
+
+
+ true
+ true
+
+
+
+
+ 시간
+
+
+
+
+
+
+ Textbox3
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+ 0.6cm
+
+
+ true
+ true
+
+
+
+
+ 초과
+
+
+
+
+
+
+ Textbox5
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+ 0.6cm
+
+
+ true
+ true
+
+
+
+
+ 합계
+
+
+
+
+
+
+ Textbox13
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.6cm
+
+
+ true
+ true
+
+
+
+
+ 시간
+
+
+
+
+
+
+ Textbox14
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ 0.6cm
+
+
+ true
+ true
+
+
+
+
+ 초과
+
+
+
+
+
+
+ Textbox18
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =Fields!uname.Value
+
+
+
+
+ =Fields!uname.Value
+
+
+
+ 1.91792cm
+
+
+ true
+ true
+
+
+
+
+ =Fields!uname.Value
+
+
+
+
+
+
+ uname
+
+
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+
+
+ 1.91792cm
+
+
+ true
+ true
+
+
+
+
+ 합계
+
+
+
+
+
+
+ Textbox10
+
+ true
+
+
+
+ Silver
+ Middle
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+ Before
+
+
+
+ DataSet1
+ 2.4cm
+ 6.33521cm
+
+
+
+
+
+ 0.94488in
+
+
+ 2.49418in
+
+ 21cm
+ 29.7cm
+ 2cm
+ 2cm
+ 2cm
+ 2cm
+ 0.13cm
+
+
+ 0
+
+
+
+ System.Data.DataSet
+ /* Local Connection */
+
+ def3b4b9-e33c-4ebc-92a9-a60ef301b762
+
+
+
+
+
+ dsReport
+ /* Local Query */
+
+
+
+ yymm
+ System.String
+
+
+ total
+ System.Int32
+
+
+ uid
+ System.String
+
+
+ uname
+ System.String
+
+
+ hrs
+ System.Double
+
+
+ ot
+ System.Double
+
+
+
+ dsReport
+ D:\Source\(014) GroupWare\EET_GroupWare_190428_1800\SubProject\FPJ0000\dsReport.xsd
+ jobReport
+ Fill
+ GetData
+ jobReportTableAdapter
+
+
+
+ Cm
+ f122d35f-5d79-47e1-bb91-474800d268ee
+
\ No newline at end of file
diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs
index 0fd3b87..d84dbca 100644
--- a/SubProject/FPJ0000/dsPRJ.Designer.cs
+++ b/SubProject/FPJ0000/dsPRJ.Designer.cs
@@ -10118,75 +10118,30 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", 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 [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, [ot] = @ot, [p" +
- "rocess] = @process WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pi" +
- "dx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] I" +
- "S 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 A" +
- "ND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [r" +
- "emark] 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 ([wdat" +
- "e] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) O" +
- "R ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL" +
- ") OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR " +
- "([process] = @Original_process)));\r\nSELECT idx, pidx, pdate, uid, requestpart, p" +
- "ackage, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUser" +
- "Name(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FR" +
- "OM JobReport WHERE (idx = @idx) ORDER BY pdate DESC";
+ this._adapter.UpdateCommand.CommandText = @"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, ot = @ot, process = @process
+WHERE (idx = @Original_idx);
+SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process 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("@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("@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("@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("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", 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_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_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_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("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
- this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
- this._adapter.UpdateCommand.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.UpdateCommand.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.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, "", "", ""));
+ this._adapter.UpdateCommand.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.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, 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("@uid", global::System.Data.SqlDbType.VarChar, 20, 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("@requestpart", global::System.Data.SqlDbType.VarChar, 50, 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, 50, 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, 20, 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, 50, 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, 2147483647, 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, 255, 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, 8, 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, 1, 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, 20, 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, 8, 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("@projectName", global::System.Data.SqlDbType.NVarChar, 255, 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("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.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.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.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10680,21 +10635,6 @@ ORDER BY pdate DESC";
global::System.Nullable ot,
string process,
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,
- global::System.Nullable Original_ot,
- string Original_process,
int idx) {
if ((pidx.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(pidx.Value));
@@ -10788,118 +10728,7 @@ ORDER BY pdate DESC";
this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(process));
}
this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx));
- if ((Original_pidx.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_pidx.Value));
- }
- else {
- this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
- }
- if ((Original_pdate == null)) {
- this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_pdate));
- }
- if ((Original_uid == null)) {
- this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_uid));
- }
- if ((Original_requestpart == null)) {
- this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_requestpart));
- }
- if ((Original_package == 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_package));
- }
- if ((Original_status == null)) {
- this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_status));
- }
- if ((Original_type == 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_type));
- }
- if ((Original_remark == 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_remark));
- }
- if ((Original_hrs.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[34].Value = ((double)(Original_hrs.Value));
- }
- else {
- this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
- }
- if ((Original_import.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[36].Value = ((bool)(Original_import.Value));
- }
- else {
- this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
- }
- if ((Original_wuid == null)) {
- throw new global::System.ArgumentNullException("Original_wuid");
- }
- else {
- this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_wuid));
- }
- this.Adapter.UpdateCommand.Parameters[38].Value = ((System.DateTime)(Original_wdate));
- if ((Original_projectName == null)) {
- this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_projectName));
- }
- if ((Original_ot.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[42].Value = ((double)(Original_ot.Value));
- }
- else {
- this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value;
- }
- if ((Original_process == null)) {
- this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_process));
- }
- this.Adapter.UpdateCommand.Parameters[45].Value = ((int)(idx));
+ this.Adapter.UpdateCommand.Parameters[17].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)) {
@@ -10916,46 +10745,6 @@ ORDER BY pdate DESC";
}
}
- [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, true)]
- public virtual int Update(
- 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,
- global::System.Nullable ot,
- string process,
- 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,
- global::System.Nullable Original_ot,
- string Original_process) {
- return this.Update(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, 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_ot, Original_process, 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")]
diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd
index 4559359..7dad4a8 100644
--- a/SubProject/FPJ0000/dsPRJ.xsd
+++ b/SubProject/FPJ0000/dsPRJ.xsd
@@ -668,56 +668,31 @@ 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, [ot] = @ot, [process] = @process 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)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)));
+
+ 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, ot = @ot, process = @process
+WHERE (idx = @Original_idx);
SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1018,7 +993,7 @@ WHERE (pidx = @pidx)
-
+
@@ -1183,7 +1158,7 @@ WHERE (pidx = @pidx)
-
+
@@ -1227,7 +1202,7 @@ WHERE (pidx = @pidx)
-
+
@@ -1272,7 +1247,7 @@ WHERE (pidx = @pidx)
-
+
@@ -1336,7 +1311,7 @@ WHERE (pidx = @pidx)
-
+
@@ -1440,7 +1415,7 @@ WHERE (pidx = @pidx)
-
+
@@ -1474,7 +1449,7 @@ WHERE (pidx = @pidx)
-
+