diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs index 1e97c47..07438f8 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs @@ -46,6 +46,8 @@ System.Windows.Forms.Label label7; System.Windows.Forms.Label label8; System.Windows.Forms.Label label9; + System.Windows.Forms.Label label10; + System.Windows.Forms.Label label11; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSaveCostData)); this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -89,6 +91,8 @@ this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.arLabel2 = new arCtl.arLabel(); this.panel3 = new System.Windows.Forms.Panel(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.textBox4 = new System.Windows.Forms.TextBox(); this.arLabel5 = new arCtl.arLabel(); this.arLabel6 = new arCtl.arLabel(); this.arPanel1 = new arCtl.arPanel(); @@ -116,6 +120,8 @@ label7 = new System.Windows.Forms.Label(); label8 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); + label10 = new System.Windows.Forms.Label(); + label11 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -286,6 +292,26 @@ label9.TabIndex = 22; label9.Text = "Sub Category"; // + // label10 + // + label10.AutoSize = true; + label10.ForeColor = System.Drawing.Color.Blue; + label10.Location = new System.Drawing.Point(205, 64); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(72, 12); + label10.TabIndex = 89; + label10.Text = "적용전(min)"; + // + // label11 + // + label11.AutoSize = true; + label11.ForeColor = System.Drawing.Color.Blue; + label11.Location = new System.Drawing.Point(371, 63); + label11.Name = "label11"; + label11.Size = new System.Drawing.Size(72, 12); + label11.TabIndex = 87; + label11.Text = "적용후(min)"; + // // tbIdx // this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); @@ -792,6 +818,10 @@ // panel3 // this.panel3.BackColor = System.Drawing.Color.Gainsboro; + this.panel3.Controls.Add(this.textBox3); + this.panel3.Controls.Add(label10); + this.panel3.Controls.Add(this.textBox4); + this.panel3.Controls.Add(label11); this.panel3.Controls.Add(this.arLabel5); this.panel3.Controls.Add(this.costeTextBox); this.panel3.Controls.Add(this.cntTextBox); @@ -806,6 +836,26 @@ this.panel3.Size = new System.Drawing.Size(546, 85); this.panel3.TabIndex = 86; // + // textBox3 + // + this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "bef_time", true)); + this.textBox3.ForeColor = System.Drawing.Color.Blue; + this.textBox3.Location = new System.Drawing.Point(281, 59); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(88, 21); + this.textBox3.TabIndex = 90; + this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox4 + // + this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "aft_time", true)); + this.textBox4.ForeColor = System.Drawing.Color.Blue; + this.textBox4.Location = new System.Drawing.Point(444, 59); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(88, 21); + this.textBox4.TabIndex = 88; + this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // arLabel5 // this.arLabel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231))))); @@ -845,7 +895,7 @@ this.arLabel5.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); this.arLabel5.Size = new System.Drawing.Size(546, 23); this.arLabel5.TabIndex = 86; - this.arLabel5.Text = "비용"; + this.arLabel5.Text = "비용 / 시간"; this.arLabel5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.arLabel5.TextShadow = true; this.arLabel5.TextVisible = true; @@ -932,6 +982,7 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; this.tam.JobReportTableAdapter = null; @@ -1148,5 +1199,7 @@ private System.Windows.Forms.ComboBox cmbWorkgrp; private System.Windows.Forms.CheckBox weeklyCheckBox; private System.Windows.Forms.CheckBox fanoutCheckBox; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox4; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.resx b/SubProject/FPJ0000/SaveCost/fSaveCostData.resx index b9018e2..82c4262 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.resx +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.resx @@ -168,6 +168,12 @@ False + + False + + + False + 100, 17 diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 326c56f..9af96c8 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -5478,6 +5478,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnweekly; + private global::System.Data.DataColumn columnbef_time; + + private global::System.Data.DataColumn columnaft_time; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_SaveCostDataTable() : @@ -5776,6 +5780,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn bef_timeColumn { + get { + return this.columnbef_time; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn aft_timeColumn { + get { + return this.columnaft_time; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -5844,7 +5864,9 @@ namespace FPJ0000 { string subcate, string eepart, bool fanout, - bool weekly) { + bool weekly, + double bef_time, + double aft_time) { EETGW_SaveCostRow rowEETGW_SaveCostRow = ((EETGW_SaveCostRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -5878,7 +5900,9 @@ namespace FPJ0000 { subcate, eepart, fanout, - weekly}; + weekly, + bef_time, + aft_time}; rowEETGW_SaveCostRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_SaveCostRow); return rowEETGW_SaveCostRow; @@ -5916,7 +5940,9 @@ namespace FPJ0000 { string subcate, string eepart, bool fanout, - bool weekly) { + bool weekly, + double bef_time, + double aft_time) { EETGW_SaveCostRow rowEETGW_SaveCostRow = ((EETGW_SaveCostRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -5950,7 +5976,9 @@ namespace FPJ0000 { subcate, eepart, fanout, - weekly}; + weekly, + bef_time, + aft_time}; rowEETGW_SaveCostRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_SaveCostRow); return rowEETGW_SaveCostRow; @@ -6012,6 +6040,8 @@ namespace FPJ0000 { this.columneepart = base.Columns["eepart"]; this.columnfanout = base.Columns["fanout"]; this.columnweekly = base.Columns["weekly"]; + this.columnbef_time = base.Columns["bef_time"]; + this.columnaft_time = base.Columns["aft_time"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6081,6 +6111,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnfanout); this.columnweekly = new global::System.Data.DataColumn("weekly", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnweekly); + this.columnbef_time = new global::System.Data.DataColumn("bef_time", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbef_time); + this.columnaft_time = new global::System.Data.DataColumn("aft_time", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnaft_time); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -14876,6 +14910,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double bef_time { + get { + if (this.Isbef_timeNull()) { + return 0D; + } + else { + return ((double)(this[this.tableEETGW_SaveCost.bef_timeColumn])); + } + } + set { + this[this.tableEETGW_SaveCost.bef_timeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double aft_time { + get { + if (this.Isaft_timeNull()) { + return 0D; + } + else { + return ((double)(this[this.tableEETGW_SaveCost.aft_timeColumn])); + } + } + set { + this[this.tableEETGW_SaveCost.aft_timeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsisdelNull() { @@ -15211,6 +15277,30 @@ namespace FPJ0000 { public void SetweeklyNull() { this[this.tableEETGW_SaveCost.weeklyColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool Isbef_timeNull() { + return this.IsNull(this.tableEETGW_SaveCost.bef_timeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void Setbef_timeNull() { + this[this.tableEETGW_SaveCost.bef_timeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool Isaft_timeNull() { + return this.IsNull(this.tableEETGW_SaveCost.aft_timeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void Setaft_timeNull() { + this[this.tableEETGW_SaveCost.aft_timeColumn] = global::System.Convert.DBNull; + } } /// @@ -27018,6 +27108,8 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e tableMapping.ColumnMappings.Add("eepart", "eepart"); tableMapping.ColumnMappings.Add("fanout", "fanout"); tableMapping.ColumnMappings.Add("weekly", "weekly"); + tableMapping.ColumnMappings.Add("bef_time", "bef_time"); + tableMapping.ColumnMappings.Add("aft_time", "aft_time"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -27048,7 +27140,9 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e " NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart]" + " IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout" + "] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekl" + - "y] IS NULL) OR ([weekly] = @Original_weekly)))"; + "y] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [be" + + "f_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = " + + "1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time)))"; 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -27104,10 +27198,14 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_fanout", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fanout", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_weekly", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_weekly", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bef_time", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_aft_time", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", 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 [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly); -SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly], [bef_time], [aft_time]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly, @bef_time, @aft_time); +SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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, "", "", "")); @@ -27139,6 +27237,8 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@eepart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "eepart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fanout", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fanout", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@weekly", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", 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 [EETGW_SaveCost] SET [gcode] = @gcode, [isdel] = @isdel, [asset] = @asset," + @@ -27149,38 +27249,41 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma "] = @wuid, [wdate] = @wdate, [orderno] = @orderno, [userprocess] = @userprocess," + " [category] = @category, [status] = @status, [workgroup] = @workgroup, [site] = " + "@site, [subcate] = @subcate, [eepart] = @eepart, [fanout] = @fanout, [weekly] = " + - "@weekly WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@Is" + - "Null_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNul" + - "l_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_p" + - "rocess = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsN" + - "ull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pda" + - "te = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name =" + - " 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager =" + - " 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((" + - "@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain" + - ")) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original" + - "_reqstaff)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original" + - "_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_co" + - "stn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND (" + - "(@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@I" + - "sNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress))" + - " AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([" + - "wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = " + - "1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userp" + - "rocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)" + - ") AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_" + - "category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Origin" + - "al_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup]" + - " = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] =" + - " @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate]" + - " = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepar" + - "t] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fano" + - "ut] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([wee" + - "kly] = @Original_weekly)));\r\nSELECT idx, gcode, isdel, asset, process, part, pda" + - "te, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark" + - "_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status" + - ", workgroup, site, subcate, eepart, fanout, weekly FROM EETGW_SaveCost WHERE (id" + - "x = @idx) ORDER BY pdate"; + "@weekly, [bef_time] = @bef_time, [aft_time] = @aft_time WHERE (([idx] = @Origina" + + "l_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NU" + + "LL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL)" + + " OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL" + + ") OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL)" + + " OR ([part] = @Original_part)) 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_userManager = 1 AND [userManager] IS NULL) OR" + + " ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [userma" + + "in] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AN" + + "D [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) 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_edate = 1 AND [edate] I" + + "S NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress" + + "] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [mem" + + "o] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wd" + + "ate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([or" + + "derno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS " + + "NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND" + + " [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status " + + "= 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgr" + + "oup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@" + + "IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_" + + "subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@Is" + + "Null_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@I" + + "sNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@" + + "IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((" + + "@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time" + + ")) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original" + + "_aft_time)));\r\nSELECT idx, gcode, isdel, asset, process, part, pdate, name, user" + + "Manager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, p" + + "rogress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, s" + + "ite, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHE" + + "RE (idx = @idx) ORDER BY pdate"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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, "", "", "")); @@ -27212,6 +27315,8 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@eepart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "eepart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fanout", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fanout", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@weekly", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", 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("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.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, "", "", "")); @@ -27266,6 +27371,10 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_fanout", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fanout", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_weekly", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_weekly", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "weekly", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bef_time", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bef_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bef_time", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_aft_time", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_aft_time", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aft_time", 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, "", "", "")); } @@ -27283,7 +27392,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, - category, status, workgroup, site, subcate, eepart, fanout, weekly + category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost ORDER BY pdate"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -27375,7 +27484,9 @@ ORDER BY pdate"; string Original_subcate, string Original_eepart, global::System.Nullable Original_fanout, - global::System.Nullable Original_weekly) { + global::System.Nullable Original_weekly, + global::System.Nullable Original_bef_time, + global::System.Nullable Original_aft_time) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); @@ -27590,6 +27701,22 @@ ORDER BY pdate"; this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[53].Value = global::System.DBNull.Value; } + if ((Original_bef_time.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[55].Value = ((double)(Original_bef_time.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[55].Value = global::System.DBNull.Value; + } + if ((Original_aft_time.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[57].Value = ((double)(Original_aft_time.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[57].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -27640,7 +27767,9 @@ ORDER BY pdate"; string subcate, string eepart, global::System.Nullable fanout, - global::System.Nullable weekly) { + global::System.Nullable weekly, + global::System.Nullable bef_time, + global::System.Nullable aft_time) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -27816,6 +27945,18 @@ ORDER BY pdate"; else { this.Adapter.InsertCommand.Parameters[29].Value = global::System.DBNull.Value; } + if ((bef_time.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[30].Value = ((double)(bef_time.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[30].Value = global::System.DBNull.Value; + } + if ((aft_time.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[31].Value = ((double)(aft_time.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[31].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -27867,6 +28008,8 @@ ORDER BY pdate"; string eepart, global::System.Nullable fanout, global::System.Nullable weekly, + global::System.Nullable bef_time, + global::System.Nullable aft_time, int Original_idx, string Original_gcode, global::System.Nullable Original_isdel, @@ -27896,6 +28039,8 @@ ORDER BY pdate"; string Original_eepart, global::System.Nullable Original_fanout, global::System.Nullable Original_weekly, + global::System.Nullable Original_bef_time, + global::System.Nullable Original_aft_time, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -28072,221 +28217,249 @@ ORDER BY pdate"; else { this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_idx)); + if ((bef_time.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[30].Value = ((double)(bef_time.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + } + if ((aft_time.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[31].Value = ((double)(aft_time.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_gcode)); } if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((bool)(Original_isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; - } - if ((Original_asset == null)) { this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_asset)); - } - if ((Original_process == null)) { + if ((Original_asset == null)) { this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_asset)); } - if ((Original_part == null)) { + if ((Original_process == null)) { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_part)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_process)); } - if ((Original_pdate == null)) { + if ((Original_part == null)) { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_part)); } - if ((Original_name == null)) { + if ((Original_pdate == null)) { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_pdate)); } - if ((Original_userManager == null)) { + if ((Original_name == null)) { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_userManager)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_name)); } - if ((Original_usermain == null)) { + if ((Original_userManager == null)) { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_userManager)); } - if ((Original_reqstaff == null)) { + if ((Original_usermain == null)) { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_usermain)); } - if ((Original_costo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((double)(Original_costo.Value)); - } - else { + if ((Original_reqstaff == null)) { this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } - if ((Original_costn.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_reqstaff)); + } + if ((Original_costo.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((double)(Original_costn.Value)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((double)(Original_costo.Value)); } else { this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } - if ((Original_cnt.HasValue == true)) { + if ((Original_costn.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((int)(Original_cnt.Value)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((double)(Original_costn.Value)); } else { this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } - if ((Original_edate == null)) { + if ((Original_cnt.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((int)(Original_cnt.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_edate)); - } - if ((Original_progress.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_progress.Value)); - } - else { + if ((Original_edate == null)) { this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } - if ((Original_memo == null)) { + else { + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_edate)); + } + if ((Original_progress.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((int)(Original_progress.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } + if ((Original_memo == null)) { + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; + } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[63].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((System.DateTime)(Original_wdate)); if ((Original_orderno == null)) { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_orderno)); - } - if ((Original_userprocess == null)) { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_userprocess)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((string)(Original_orderno)); } - if ((Original_category == null)) { + if ((Original_userprocess == null)) { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_category)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_userprocess)); } - if ((Original_status == null)) { + if ((Original_category == null)) { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_status)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_category)); } - if ((Original_workgroup == null)) { + if ((Original_status == null)) { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_workgroup)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_status)); } - if ((Original_site == null)) { + if ((Original_workgroup == null)) { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_site)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_workgroup)); } - if ((Original_subcate == null)) { + if ((Original_site == null)) { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_subcate)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_site)); } - if ((Original_eepart == null)) { + if ((Original_subcate == null)) { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_eepart)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_subcate)); } - if ((Original_fanout.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[81].Value = ((bool)(Original_fanout.Value)); - } - else { + if ((Original_eepart == null)) { this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; } - if ((Original_weekly.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_eepart)); + } + if ((Original_fanout.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[83].Value = ((bool)(Original_weekly.Value)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((bool)(Original_fanout.Value)); } else { this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[84].Value = ((int)(idx)); + if ((Original_weekly.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((bool)(Original_weekly.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; + } + if ((Original_bef_time.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((double)(Original_bef_time.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; + } + if ((Original_aft_time.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((double)(Original_aft_time.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[90].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)) { @@ -28338,6 +28511,8 @@ ORDER BY pdate"; string eepart, global::System.Nullable fanout, global::System.Nullable weekly, + global::System.Nullable bef_time, + global::System.Nullable aft_time, int Original_idx, string Original_gcode, global::System.Nullable Original_isdel, @@ -28366,8 +28541,10 @@ ORDER BY pdate"; string Original_subcate, string Original_eepart, global::System.Nullable Original_fanout, - global::System.Nullable Original_weekly) { - return this.Update(gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, Original_idx, Original_gcode, Original_isdel, Original_asset, Original_process, Original_part, Original_pdate, Original_name, Original_userManager, Original_usermain, Original_reqstaff, Original_costo, Original_costn, Original_cnt, Original_edate, Original_progress, Original_memo, Original_wuid, Original_wdate, Original_orderno, Original_userprocess, Original_category, Original_status, Original_workgroup, Original_site, Original_subcate, Original_eepart, Original_fanout, Original_weekly, Original_idx); + global::System.Nullable Original_weekly, + global::System.Nullable Original_bef_time, + global::System.Nullable Original_aft_time) { + return this.Update(gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, Original_idx, Original_gcode, Original_isdel, Original_asset, Original_process, Original_part, Original_pdate, Original_name, Original_userManager, Original_usermain, Original_reqstaff, Original_costo, Original_costn, Original_cnt, Original_edate, Original_progress, Original_memo, Original_wuid, Original_wdate, Original_orderno, Original_userprocess, Original_category, Original_status, Original_workgroup, Original_site, Original_subcate, Original_eepart, Original_fanout, Original_weekly, Original_bef_time, Original_aft_time, Original_idx); } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index f39ea29..b40496b 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1368,7 +1368,7 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO - DELETE FROM [EETGW_SaveCost] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) 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_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) 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_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) 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 ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly))) + DELETE FROM [EETGW_SaveCost] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) 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_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) 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_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) 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 ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time))) @@ -1424,13 +1424,17 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO + + + + - INSERT INTO [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly); -SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate + INSERT INTO [EETGW_SaveCost] ([gcode], [isdel], [asset], [process], [part], [pdate], [name], [userManager], [usermain], [reqstaff], [costo], [costn], [cnt], [remark_req], [remark_ans], [edate], [progress], [memo], [wuid], [wdate], [orderno], [userprocess], [category], [status], [workgroup], [site], [subcate], [eepart], [fanout], [weekly], [bef_time], [aft_time]) VALUES (@gcode, @isdel, @asset, @process, @part, @pdate, @name, @userManager, @usermain, @reqstaff, @costo, @costn, @cnt, @remark_req, @remark_ans, @edate, @progress, @memo, @wuid, @wdate, @orderno, @userprocess, @category, @status, @workgroup, @site, @subcate, @eepart, @fanout, @weekly, @bef_time, @aft_time); +SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate @@ -1462,13 +1466,15 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, - category, status, workgroup, site, subcate, eepart, fanout, weekly + category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost ORDER BY pdate @@ -1476,8 +1482,8 @@ ORDER BY pdate - UPDATE [EETGW_SaveCost] SET [gcode] = @gcode, [isdel] = @isdel, [asset] = @asset, [process] = @process, [part] = @part, [pdate] = @pdate, [name] = @name, [userManager] = @userManager, [usermain] = @usermain, [reqstaff] = @reqstaff, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [edate] = @edate, [progress] = @progress, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [orderno] = @orderno, [userprocess] = @userprocess, [category] = @category, [status] = @status, [workgroup] = @workgroup, [site] = @site, [subcate] = @subcate, [eepart] = @eepart, [fanout] = @fanout, [weekly] = @weekly WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) 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_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) 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_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) 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 ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly))); -SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly FROM EETGW_SaveCost WHERE (idx = @idx) ORDER BY pdate + UPDATE [EETGW_SaveCost] SET [gcode] = @gcode, [isdel] = @isdel, [asset] = @asset, [process] = @process, [part] = @part, [pdate] = @pdate, [name] = @name, [userManager] = @userManager, [usermain] = @usermain, [reqstaff] = @reqstaff, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [edate] = @edate, [progress] = @progress, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [orderno] = @orderno, [userprocess] = @userprocess, [category] = @category, [status] = @status, [workgroup] = @workgroup, [site] = @site, [subcate] = @subcate, [eepart] = @eepart, [fanout] = @fanout, [weekly] = @weekly, [bef_time] = @bef_time, [aft_time] = @aft_time WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) 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_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) 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_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) 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 ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_workgroup = 1 AND [workgroup] IS NULL) OR ([workgroup] = @Original_workgroup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft_time))); +SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time FROM EETGW_SaveCost WHERE (idx = @idx) ORDER BY pdate @@ -1509,6 +1515,8 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + @@ -1563,6 +1571,10 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + + + @@ -1601,6 +1613,8 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + @@ -2630,7 +2644,7 @@ WHERE (idx = @idx) - + @@ -2897,7 +2911,7 @@ WHERE (idx = @idx) - + @@ -2941,7 +2955,7 @@ WHERE (idx = @idx) - + @@ -2986,7 +3000,7 @@ WHERE (idx = @idx) - + @@ -3102,7 +3116,7 @@ WHERE (idx = @idx) - + @@ -3227,7 +3241,7 @@ WHERE (idx = @idx) - + @@ -3265,7 +3279,7 @@ WHERE (idx = @idx) - + @@ -3381,7 +3395,7 @@ WHERE (idx = @idx) - + @@ -3432,7 +3446,7 @@ WHERE (idx = @idx) - + @@ -3445,7 +3459,7 @@ WHERE (idx = @idx) - + @@ -3612,10 +3626,12 @@ WHERE (idx = @idx) + + - + @@ -3792,7 +3808,7 @@ WHERE (idx = @idx) - + @@ -3837,7 +3853,7 @@ WHERE (idx = @idx) - + @@ -3906,7 +3922,7 @@ WHERE (idx = @idx) - + @@ -4096,7 +4112,7 @@ WHERE (idx = @idx) - + @@ -4235,7 +4251,7 @@ WHERE (idx = @idx) - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 8e99ae3..8ec5b83 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,24 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + - + - - + + diff --git a/SubProject/WebServer/App.config b/SubProject/WebServer/App.config index 4ddbd88..20a8b67 100644 --- a/SubProject/WebServer/App.config +++ b/SubProject/WebServer/App.config @@ -3,7 +3,7 @@
- +
@@ -20,6 +20,14 @@ + + + + + + + + @@ -38,83 +46,83 @@ - { - "basicGoods": [ - { - "id": "1234561", - "name": "Mineral Water 550ml", - "barcode": "12421432143214321", - "price": "2.00", - "num": "1", - "amount": "2.00" - }, - { - "id": "1234562", - "name": "Herbal tea 300ml", - "barcode": "12421432143214322", - "price": "3.00", - "num": "2", - "amount": "6.00" - }, - { - "id": "1234563", - "name": "Delicious potato chips", - "barcode": "12421432143214323", - "price": "7.00", - "num": "4", - "amount": "28.00" - }, - { - "id": "1234564", - "name": "Specially delicious egg rolls", - "barcode": "12421432143214324", - "price": "8.50", - "num": "3", - "amount": "25.50" - } - ], - "basicProgress": [ - { - "key": "1", - "time": "2017-10-01 14:10", - "rate": "Contact Clients", - "status": "Processing", - "operator": "Pickup Assistant ID1234", - "cost": "5mins" - }, - { - "key": "2", - "time": "2017-10-01 14:05", - "rate": "Pickup Guy Departs", - "status": "Success", - "operator": "Pickup Assistant ID1234", - "cost": "1h" - }, - { - "key": "3", - "time": "2017-10-01 13:05", - "rate": "Pick-up person takes orders", - "status": "Success", - "operator": "Pickup Assistant ID1234", - "cost": "5mins" - }, - { - "key": "4", - "time": "2017-10-01 13:00", - "rate": "Apply For Approval", - "status": "Success", - "operator": "system", - "cost": "1h" - }, - { - "key": "5", - "time": "2017-10-01 12:00", - "rate": "Initiated a Return Request", - "status": "Success", - "operator": "user", - "cost": "5mins" - } - ] + { + "basicGoods": [ + { + "id": "1234561", + "name": "Mineral Water 550ml", + "barcode": "12421432143214321", + "price": "2.00", + "num": "1", + "amount": "2.00" + }, + { + "id": "1234562", + "name": "Herbal tea 300ml", + "barcode": "12421432143214322", + "price": "3.00", + "num": "2", + "amount": "6.00" + }, + { + "id": "1234563", + "name": "Delicious potato chips", + "barcode": "12421432143214323", + "price": "7.00", + "num": "4", + "amount": "28.00" + }, + { + "id": "1234564", + "name": "Specially delicious egg rolls", + "barcode": "12421432143214324", + "price": "8.50", + "num": "3", + "amount": "25.50" + } + ], + "basicProgress": [ + { + "key": "1", + "time": "2017-10-01 14:10", + "rate": "Contact Clients", + "status": "Processing", + "operator": "Pickup Assistant ID1234", + "cost": "5mins" + }, + { + "key": "2", + "time": "2017-10-01 14:05", + "rate": "Pickup Guy Departs", + "status": "Success", + "operator": "Pickup Assistant ID1234", + "cost": "1h" + }, + { + "key": "3", + "time": "2017-10-01 13:05", + "rate": "Pick-up person takes orders", + "status": "Success", + "operator": "Pickup Assistant ID1234", + "cost": "5mins" + }, + { + "key": "4", + "time": "2017-10-01 13:00", + "rate": "Apply For Approval", + "status": "Success", + "operator": "system", + "cost": "1h" + }, + { + "key": "5", + "time": "2017-10-01 12:00", + "rate": "Initiated a Return Request", + "status": "Success", + "operator": "user", + "cost": "5mins" + } + ] } diff --git a/SubProject/WebServer/Controller/APIController.cs b/SubProject/WebServer/Controller/APIController.cs new file mode 100644 index 0000000..81fd15d --- /dev/null +++ b/SubProject/WebServer/Controller/APIController.cs @@ -0,0 +1,150 @@ +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; +using Newtonsoft.Json; + +namespace WebServer +{ + public class APIController : BaseController + { + [HttpGet] + public HttpResponseMessage Getdata() + { + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + var sql = string.Empty; + var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault(); + if (p_sql.Key.isEmpty() == false) sql = p_sql.Value; + else + { + var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault(); + var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault(); + var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault(); + var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault(); + sql = "select * from {0} where gcode = '{gcode}'"; + sql = string.Format(sql, p_table.Value, p_gcode.Value); + if (p_where.Key != null) sql += " and " + p_where.Value; + if (p_order.Key != null) sql += " order by " + p_order.Value; + } + + + if (FCOMMON.info.Login.gcode == null) + FCOMMON.info.Login.gcode = "EET1P"; + sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); + + var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"; + var cn = new System.Data.SqlClient.SqlConnection(cs); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + var dt = new System.Data.DataTable(); + da.Fill(dt); + da.Dispose(); + cmd.Dispose(); + cn.Dispose(); + + var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + txtjson, + System.Text.Encoding.UTF8, + "application/json") + }; + + return resp; + + + } + + [HttpGet] + public HttpResponseMessage Gettable() + { + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + var sql = string.Empty; + var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault(); + if (p_sql.Key.isEmpty() == false) sql = p_sql.Value; + else + { + var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault(); + var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault(); + var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault(); + var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault(); + sql = "select * from {0} where gcode = '{gcode}'"; + sql = string.Format(sql, p_table.Value, p_gcode.Value); + if (p_where.Key != null) sql += " and " + p_where.Value; + if (p_order.Key != null) sql += " order by " + p_order.Value; + } + + + if (FCOMMON.info.Login.gcode == null) + FCOMMON.info.Login.gcode = "EET1P"; + sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); + + var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"; + var cn = new System.Data.SqlClient.SqlConnection(cs); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + var dt = new System.Data.DataTable(); + da.Fill(dt); + da.Dispose(); + cmd.Dispose(); + cn.Dispose(); + + var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + txtjson, + System.Text.Encoding.UTF8, + "application/json") + }; + + return resp; + + + } + + + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/SubProject/WebServer/WebServer.csproj b/SubProject/WebServer/WebServer.csproj index ddf595b..ecb4f2c 100644 --- a/SubProject/WebServer/WebServer.csproj +++ b/SubProject/WebServer/WebServer.csproj @@ -51,6 +51,9 @@ ..\..\packages\Microsoft.AspNet.SignalR.Owin.1.2.2\lib\net45\Microsoft.AspNet.SignalR.Owin.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\..\packages\Microsoft.Owin.4.2.0\lib\net45\Microsoft.Owin.dll @@ -79,21 +82,37 @@ ..\..\packages\Owin.1.0\lib\net40\Owin.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + ..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll + + ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + ..\..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + ..\..\packages\System.Net.Http.Json.5.0.0\lib\net461\System.Net.Http.Json.dll + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + ..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + @@ -108,6 +127,18 @@ ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll + + + ..\..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + ..\..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll @@ -133,6 +164,7 @@ + diff --git a/SubProject/WebServer/packages.config b/SubProject/WebServer/packages.config index 37ae6ea..cf3d8af 100644 --- a/SubProject/WebServer/packages.config +++ b/SubProject/WebServer/packages.config @@ -11,6 +11,7 @@ + @@ -22,11 +23,20 @@ + + + + + + + + + \ No newline at end of file