diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index f17bd60..eefa047 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("24.01.26.1128")] -[assembly: AssemblyFileVersion("24.01.26.1128")] +[assembly: AssemblyVersion("24.01.29.1000")] +[assembly: AssemblyFileVersion("24.01.29.1000")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 978ec56..f0a8088 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -411,7 +411,7 @@ // 일반구매ToolStripMenuItem // this.일반구매ToolStripMenuItem.Name = "일반구매ToolStripMenuItem"; - this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.일반구매ToolStripMenuItem.Size = new System.Drawing.Size(219, 24); this.일반구매ToolStripMenuItem.Text = "일반 구매"; this.일반구매ToolStripMenuItem.Click += new System.EventHandler(this.일반구매ToolStripMenuItem_Click); // @@ -419,7 +419,7 @@ // this.cR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.cR구매ToolStripMenuItem.Name = "cR구매ToolStripMenuItem"; - this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(219, 24); this.cR구매ToolStripMenuItem.Text = "CR 구매"; this.cR구매ToolStripMenuItem.Click += new System.EventHandler(this.cR구매ToolStripMenuItem_Click); // @@ -427,27 +427,27 @@ // this.sPR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.sPR구매ToolStripMenuItem.Name = "sPR구매ToolStripMenuItem"; - this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); - this.sPR구매ToolStripMenuItem.Text = "전자실 구매"; + this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(219, 24); + this.sPR구매ToolStripMenuItem.Text = "해외지원+전자실 구매"; this.sPR구매ToolStripMenuItem.Click += new System.EventHandler(this.sPR구매ToolStripMenuItem_Click); // // toolStripMenuItem14 // this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem14.Size = new System.Drawing.Size(216, 6); // // 전자실구매승인ToolStripMenuItem // this.전자실구매승인ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.전자실구매승인ToolStripMenuItem.Name = "전자실구매승인ToolStripMenuItem"; - this.전자실구매승인ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.전자실구매승인ToolStripMenuItem.Size = new System.Drawing.Size(219, 24); this.전자실구매승인ToolStripMenuItem.Text = "구매 승인"; this.전자실구매승인ToolStripMenuItem.Click += new System.EventHandler(this.전자실구매승인ToolStripMenuItem_Click); // // 품목입고ToolStripMenuItem // this.품목입고ToolStripMenuItem.Name = "품목입고ToolStripMenuItem"; - this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.품목입고ToolStripMenuItem.Size = new System.Drawing.Size(219, 24); this.품목입고ToolStripMenuItem.Text = "품목 입고"; this.품목입고ToolStripMenuItem.Click += new System.EventHandler(this.품목입고ToolStripMenuItem_Click); // @@ -515,21 +515,21 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); // // 자동입력ToolStripMenuItem // this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; - this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); // // 양식ToolStripMenuItem // this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; - this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // diff --git a/Project/fMain.cs b/Project/fMain.cs index 7b70668..8fdda74 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -509,7 +509,7 @@ namespace Project string formkey = "PUCHASEEB"; if (!ShowForm(formkey)) - AddForm(formkey, new FEQ0000.fPurchaseEB(), "전자실구매"); + AddForm(formkey, new FEQ0000.fPurchaseEB(), "해외지원+전자실 구매"); } private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/Project/fMain.resx b/Project/fMain.resx index a3190bd..e68815b 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -468,14 +468,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UTMr/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e + /U7m/E+5XP8/92TF/3lzYj/UTMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3t9r/vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP616fX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQB7QaqWKtAx+QAAAABJRU5ErkJggg== + 2d+jAdUG1LhtIjtQcP7VafX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQB1R6qRWIAd8wAAAABJRU5ErkJggg== diff --git a/SubProject/FCOMMON/fSFI.cs b/SubProject/FCOMMON/fSFI.cs index f73b48c..855068f 100644 --- a/SubProject/FCOMMON/fSFI.cs +++ b/SubProject/FCOMMON/fSFI.cs @@ -47,7 +47,7 @@ namespace FCOMMON { //mfg 절감시간 업데이트 var nud = sender as NumericUpDown; - if (nud.Tag.ToString().ToLower() == "o") + if (this.radO.Checked) { UpdateOffice(); } @@ -84,9 +84,9 @@ namespace FCOMMON { var savetime = (double)nudOsavetime.Value; var min = (int)numericUpDown2.Value; - var sfi = savetime / min; var cnt = (int)nudCnt.Value; - nudSFIOffice.Value = (decimal)(sfi * cnt); + var sfi = (savetime * cnt) / min; + nudSFIOffice.Value = (decimal)(sfi); } private void button1_Click(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs index e85a4fa..aedffbe 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs @@ -99,6 +99,7 @@ this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.btMakeItemsData = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton(); this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -147,7 +148,6 @@ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.btMakeItemsData = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -260,6 +260,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -386,6 +387,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -486,6 +488,13 @@ this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(223, 6); // + // btMakeItemsData + // + this.btMakeItemsData.Name = "btMakeItemsData"; + this.btMakeItemsData.Size = new System.Drawing.Size(226, 22); + this.btMakeItemsData.Text = "구매내역에서 품목정보 생성"; + this.btMakeItemsData.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // // toolStripButton6 // this.toolStripButton6.Enabled = false; @@ -511,14 +520,14 @@ // 집계표ToolStripMenuItem // this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem"; - this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.집계표ToolStripMenuItem.Text = "집계표"; this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click); // // 구매승인양식ToolStripMenuItem // this.구매승인양식ToolStripMenuItem.Name = "구매승인양식ToolStripMenuItem"; - this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식"; this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click); // @@ -697,6 +706,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(75, 37); this.dtSD.Text = "1982-11-23"; @@ -713,6 +723,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(75, 37); this.dtED.Text = "1982-11-23"; @@ -768,6 +779,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -1207,13 +1219,6 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btMakeItemsData - // - this.btMakeItemsData.Name = "btMakeItemsData"; - this.btMakeItemsData.Size = new System.Drawing.Size(226, 22); - this.btMakeItemsData.Text = "구매내역에서 품목정보 생성"; - this.btMakeItemsData.Click += new System.EventHandler(this.toolStripMenuItem6_Click); - // // fPurchaseEB // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1226,7 +1231,7 @@ this.Controls.Add(this.bn); this.DoubleBuffered = true; this.Name = "fPurchaseEB"; - this.Text = "전자실구매 신청"; + this.Text = "해외지원+전자실 구매"; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs index 4d3d30e..714a67c 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs @@ -91,7 +91,7 @@ this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.arLabel2 = new arCtl.arLabel(); this.panel3 = new System.Windows.Forms.Panel(); - this.textBox5 = new System.Windows.Forms.TextBox(); + this.tbSFI = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); this.arLabel5 = new arCtl.arLabel(); @@ -821,7 +821,7 @@ // this.panel3.BackColor = System.Drawing.Color.Gainsboro; this.panel3.Controls.Add(this.linkLabel1); - this.panel3.Controls.Add(this.textBox5); + this.panel3.Controls.Add(this.tbSFI); this.panel3.Controls.Add(this.textBox3); this.panel3.Controls.Add(label10); this.panel3.Controls.Add(this.textBox4); @@ -842,12 +842,12 @@ // // textBox5 // - this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sfi", true)); - this.textBox5.Location = new System.Drawing.Point(93, 86); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(88, 21); - this.textBox5.TabIndex = 92; - this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbSFI.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sfi", true)); + this.tbSFI.Location = new System.Drawing.Point(93, 86); + this.tbSFI.Name = "textBox5"; + this.tbSFI.Size = new System.Drawing.Size(88, 21); + this.tbSFI.TabIndex = 92; + this.tbSFI.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // textBox3 // @@ -1226,7 +1226,7 @@ private System.Windows.Forms.CheckBox fanoutCheckBox; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.TextBox tbSFI; private System.Windows.Forms.LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs index 890192e..1bb1146 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs @@ -170,9 +170,39 @@ namespace FPJ0000 private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - var f = new FCOMMON.fSFI("O",0f,0f,4,1); + int cnt; + if (int.TryParse(cntTextBox.Text, out cnt) == false) + { + FCOMMON.Util.MsgE($"수량이 입려되지 않았습니다"); + cntTextBox.Focus(); + return; + } + + var sfi_type = "O"; + var sfi_count = 0D; + var sfi_time = 0D; + var sfi_shiftcount = 0D; + if (dr.Issfi_typeNull() == false) sfi_type = dr.sfi_type; + if (dr.Issfi_savecountNull() == false) sfi_count = dr.sfi_savecount; + if (dr.Issfi_savetimeNull() == false) sfi_time = dr.sfi_savetime; + if (dr.Issfi_shiftcountNull() == false) sfi_shiftcount = dr.sfi_shiftcount; + if (sfi_shiftcount == 0) sfi_shiftcount = 4; + + + var f = new FCOMMON.fSFI(sfi_type, sfi_time, sfi_count, sfi_shiftcount, cnt); if (f.ShowDialog() == DialogResult.OK) - textBox5.Text = f.Value.ToString("N2"); + { + tbSFI.Text = f.Value.ToString("N2"); + dr.sfi_type = f.radO.Checked ? "O" : "M"; + if (f.radO.Checked) + dr.sfi_savetime = (float)f.nudOsavetime.Value; + else + dr.sfi_savetime = (float)f.nudMsavetime.Value; + dr.sfi_savecount = (float)f.nudMSaveCnt.Value; + dr.sfi_shiftcount = (float)f.nudShiftCnt.Value; + dr.EndEdit(); + } + } } } diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index d0da450..2f694d6 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -5584,6 +5584,16 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnsfi; + private global::System.Data.DataColumn columnsfi_type; + + private global::System.Data.DataColumn columnsfi_savetime; + + private global::System.Data.DataColumn columnsfi_savecount; + + private global::System.Data.DataColumn columnsfi_shiftcount; + + private global::System.Data.DataColumn columnsfic; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public EETGW_SaveCostDataTable() : @@ -5906,6 +5916,46 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sfi_typeColumn { + get { + return this.columnsfi_type; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sfi_savetimeColumn { + get { + return this.columnsfi_savetime; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sfi_savecountColumn { + get { + return this.columnsfi_savecount; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sfi_shiftcountColumn { + get { + return this.columnsfi_shiftcount; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn sficColumn { + get { + return this.columnsfic; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -5977,7 +6027,12 @@ namespace FPJ0000 { bool weekly, double bef_time, double aft_time, - double sfi) { + double sfi, + string sfi_type, + double sfi_savetime, + double sfi_savecount, + double sfi_shiftcount, + double sfic) { EETGW_SaveCostRow rowEETGW_SaveCostRow = ((EETGW_SaveCostRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -6014,7 +6069,12 @@ namespace FPJ0000 { weekly, bef_time, aft_time, - sfi}; + sfi, + sfi_type, + sfi_savetime, + sfi_savecount, + sfi_shiftcount, + sfic}; rowEETGW_SaveCostRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_SaveCostRow); return rowEETGW_SaveCostRow; @@ -6055,7 +6115,12 @@ namespace FPJ0000 { bool weekly, double bef_time, double aft_time, - double sfi) { + double sfi, + string sfi_type, + double sfi_savetime, + double sfi_savecount, + double sfi_shiftcount, + double sfic) { EETGW_SaveCostRow rowEETGW_SaveCostRow = ((EETGW_SaveCostRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -6092,7 +6157,12 @@ namespace FPJ0000 { weekly, bef_time, aft_time, - sfi}; + sfi, + sfi_type, + sfi_savetime, + sfi_savecount, + sfi_shiftcount, + sfic}; rowEETGW_SaveCostRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_SaveCostRow); return rowEETGW_SaveCostRow; @@ -6157,6 +6227,11 @@ namespace FPJ0000 { this.columnbef_time = base.Columns["bef_time"]; this.columnaft_time = base.Columns["aft_time"]; this.columnsfi = base.Columns["sfi"]; + this.columnsfi_type = base.Columns["sfi_type"]; + this.columnsfi_savetime = base.Columns["sfi_savetime"]; + this.columnsfi_savecount = base.Columns["sfi_savecount"]; + this.columnsfi_shiftcount = base.Columns["sfi_shiftcount"]; + this.columnsfic = base.Columns["sfic"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6232,6 +6307,16 @@ namespace FPJ0000 { base.Columns.Add(this.columnaft_time); this.columnsfi = new global::System.Data.DataColumn("sfi", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsfi); + this.columnsfi_type = new global::System.Data.DataColumn("sfi_type", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi_type); + this.columnsfi_savetime = new global::System.Data.DataColumn("sfi_savetime", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi_savetime); + this.columnsfi_savecount = new global::System.Data.DataColumn("sfi_savecount", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi_savecount); + this.columnsfi_shiftcount = new global::System.Data.DataColumn("sfi_shiftcount", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi_shiftcount); + this.columnsfic = new global::System.Data.DataColumn("sfic", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfic); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -6265,6 +6350,7 @@ namespace FPJ0000 { this.columnsite.MaxLength = 20; this.columnsubcate.MaxLength = 100; this.columneepart.MaxLength = 50; + this.columnsfi_type.MaxLength = 1; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17786,6 +17872,86 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string sfi_type { + get { + try { + return ((string)(this[this.tableEETGW_SaveCost.sfi_typeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_SaveCost\' 테이블의 \'sfi_type\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_SaveCost.sfi_typeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double sfi_savetime { + get { + try { + return ((double)(this[this.tableEETGW_SaveCost.sfi_savetimeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_SaveCost\' 테이블의 \'sfi_savetime\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_SaveCost.sfi_savetimeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double sfi_savecount { + get { + try { + return ((double)(this[this.tableEETGW_SaveCost.sfi_savecountColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_SaveCost\' 테이블의 \'sfi_savecount\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_SaveCost.sfi_savecountColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double sfi_shiftcount { + get { + try { + return ((double)(this[this.tableEETGW_SaveCost.sfi_shiftcountColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_SaveCost\' 테이블의 \'sfi_shiftcount\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_SaveCost.sfi_shiftcountColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double sfic { + get { + try { + return ((double)(this[this.tableEETGW_SaveCost.sficColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_SaveCost\' 테이블의 \'sfic\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_SaveCost.sficColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsisdelNull() { @@ -18157,6 +18323,66 @@ namespace FPJ0000 { public void SetsfiNull() { this[this.tableEETGW_SaveCost.sfiColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Issfi_typeNull() { + return this.IsNull(this.tableEETGW_SaveCost.sfi_typeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setsfi_typeNull() { + this[this.tableEETGW_SaveCost.sfi_typeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Issfi_savetimeNull() { + return this.IsNull(this.tableEETGW_SaveCost.sfi_savetimeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setsfi_savetimeNull() { + this[this.tableEETGW_SaveCost.sfi_savetimeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Issfi_savecountNull() { + return this.IsNull(this.tableEETGW_SaveCost.sfi_savecountColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setsfi_savecountNull() { + this[this.tableEETGW_SaveCost.sfi_savecountColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Issfi_shiftcountNull() { + return this.IsNull(this.tableEETGW_SaveCost.sfi_shiftcountColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setsfi_shiftcountNull() { + this[this.tableEETGW_SaveCost.sfi_shiftcountColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IssficNull() { + return this.IsNull(this.tableEETGW_SaveCost.sficColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetsficNull() { + this[this.tableEETGW_SaveCost.sficColumn] = global::System.Convert.DBNull; + } } /// @@ -31158,6 +31384,11 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e tableMapping.ColumnMappings.Add("bef_time", "bef_time"); tableMapping.ColumnMappings.Add("aft_time", "aft_time"); tableMapping.ColumnMappings.Add("sfi", "sfi"); + tableMapping.ColumnMappings.Add("sfi_type", "sfi_type"); + tableMapping.ColumnMappings.Add("sfi_savetime", "sfi_savetime"); + tableMapping.ColumnMappings.Add("sfi_savecount", "sfi_savecount"); + tableMapping.ColumnMappings.Add("sfi_shiftcount", "sfi_shiftcount"); + tableMapping.ColumnMappings.Add("sfic", "sfic"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -31191,7 +31422,13 @@ WHERE (gcode = @gcode) AND (ISNULL(share, 0) = 1) AND (pdate BETWEEN @sd AND @e "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)) AND ((@IsNull_sf" + - "i = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi)))"; + "i = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi)) AND ((@IsNull_sfi_type = 1 " + + "AND [sfi_type] IS NULL) OR ([sfi_type] = @Original_sfi_type)) AND ((@IsNull_sfi_" + + "savetime = 1 AND [sfi_savetime] IS NULL) OR ([sfi_savetime] = @Original_sfi_save" + + "time)) AND ((@IsNull_sfi_savecount = 1 AND [sfi_savecount] IS NULL) OR ([sfi_sav" + + "ecount] = @Original_sfi_savecount)) AND ((@IsNull_sfi_shiftcount = 1 AND [sfi_sh" + + "iftcount] IS NULL) OR ([sfi_shiftcount] = @Original_sfi_shiftcount)) AND ((@IsNu" + + "ll_sfic = 1 AND [sfic] IS NULL) OR ([sfic] = @Original_sfic)))"; 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, "", "", "")); @@ -31253,10 +31490,20 @@ 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_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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_savetime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_savecount", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_shiftcount", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfic", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfic", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", 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], [bef_time], [aft_time], [sfi]) 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, @sfi); -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, sfi 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], [sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount], [sfic]) 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, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount, @sfic); +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, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic FROM EETGW_SaveCost WITH (nolock) 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, "", "", "")); @@ -31291,6 +31538,11 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", 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," + @@ -31301,42 +31553,51 @@ 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, [bef_time] = @bef_time, [aft_time] = @aft_time, [sfi] = @sfi WHERE (([i" + - "dx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_isdel = 1 AND" + - " [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_asset = 1 AND [a" + - "sset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_process = 1 AND [pr" + - "ocess] 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 N" + - "ULL) OR ([name] = @Original_name)) AND ((@IsNull_userManager = 1 AND [userManage" + - "r] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_usermain =" + - " 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_r" + - "eqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((" + - "@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@Is" + - "Null_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNul" + - "l_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_mem" + - "o = 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 [us" + - "erprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_ca" + - "tegory = 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_workg" + - "roup)) AND ((@IsNull_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) " + - "AND ((@IsNull_subcate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subca" + - "te)) AND ((@IsNull_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eep" + - "art)) AND ((@IsNull_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fa" + - "nout)) AND ((@IsNull_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_w" + - "eekly)) AND ((@IsNull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Ori" + - "ginal_bef_time)) AND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_tim" + - "e] = @Original_aft_time)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @" + - "Original_sfi)));\r\nSELECT idx, gcode, isdel, asset, process, part, pdate, name, u" + - "serManager, 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, sfi FROM EETGW_Save" + - "Cost WHERE (idx = @idx) ORDER BY pdate"; + "@weekly, [bef_time] = @bef_time, [aft_time] = @aft_time, [sfi] = @sfi, [sfi_type" + + "] = @sfi_type, [sfi_savetime] = @sfi_savetime, [sfi_savecount] = @sfi_savecount," + + " [sfi_shiftcount] = @sfi_shiftcount, [sfic] = @sfic WHERE (([idx] = @Original_id" + + "x) 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 ([pda" + + "te] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = " + + "@Original_name)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([u" + + "serManager] = @Original_userManager)) AND ((@IsNull_usermain = 1 AND [usermain] " + + "IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_reqstaff = 1 AND [r" + + "eqstaff] 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 NU" + + "LL) OR ([edate] = @Original_edate)) AND ((@IsNull_progress = 1 AND [progress] IS" + + " NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_memo = 1 AND [memo] I" + + "S NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate]" + + " = @Original_wdate) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([ordern" + + "o] = @Original_orderno)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL" + + ") OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_category = 1 AND [ca" + + "tegory] 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 ((@IsNu" + + "ll_site = 1 AND [site] IS NULL) OR ([site] = @Original_site)) AND ((@IsNull_subc" + + "ate = 1 AND [subcate] IS NULL) OR ([subcate] = @Original_subcate)) AND ((@IsNull" + + "_eepart = 1 AND [eepart] IS NULL) OR ([eepart] = @Original_eepart)) AND ((@IsNul" + + "l_fanout = 1 AND [fanout] IS NULL) OR ([fanout] = @Original_fanout)) AND ((@IsNu" + + "ll_weekly = 1 AND [weekly] IS NULL) OR ([weekly] = @Original_weekly)) AND ((@IsN" + + "ull_bef_time = 1 AND [bef_time] IS NULL) OR ([bef_time] = @Original_bef_time)) A" + + "ND ((@IsNull_aft_time = 1 AND [aft_time] IS NULL) OR ([aft_time] = @Original_aft" + + "_time)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi)) AND" + + " ((@IsNull_sfi_type = 1 AND [sfi_type] IS NULL) OR ([sfi_type] = @Original_sfi_t" + + "ype)) AND ((@IsNull_sfi_savetime = 1 AND [sfi_savetime] IS NULL) OR ([sfi_saveti" + + "me] = @Original_sfi_savetime)) AND ((@IsNull_sfi_savecount = 1 AND [sfi_savecoun" + + "t] IS NULL) OR ([sfi_savecount] = @Original_sfi_savecount)) AND ((@IsNull_sfi_sh" + + "iftcount = 1 AND [sfi_shiftcount] IS NULL) OR ([sfi_shiftcount] = @Original_sfi_" + + "shiftcount)) AND ((@IsNull_sfic = 1 AND [sfic] IS NULL) OR ([sfic] = @Original_s" + + "fic)));\r\nSELECT idx, gcode, isdel, asset, process, part, pdate, name, userManage" + + "r, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progres" + + "s, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, s" + + "ubcate, eepart, fanout, weekly, bef_time, aft_time, sfi, sfi_type, sfi_savetime," + + " sfi_savecount, sfi_shiftcount, sfic FROM EETGW_SaveCost WITH (nolock) WHERE (id" + + "x = @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, "", "", "")); @@ -31371,6 +31632,11 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma 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("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", 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, "", "", "")); @@ -31431,6 +31697,16 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma 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("@IsNull_sfi", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_savetime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_savecount", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfi_shiftcount", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sfic", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sfic", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", 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, "", "", "")); } @@ -31448,7 +31724,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, bef_time, aft_time, sfi + category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic FROM EETGW_SaveCost WITH (nolock) ORDER BY pdate"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -31543,7 +31819,12 @@ ORDER BY pdate"; global::System.Nullable Original_weekly, global::System.Nullable Original_bef_time, global::System.Nullable Original_aft_time, - global::System.Nullable Original_sfi) { + global::System.Nullable Original_sfi, + string Original_sfi_type, + global::System.Nullable Original_sfi_savetime, + global::System.Nullable Original_sfi_savecount, + global::System.Nullable Original_sfi_shiftcount, + global::System.Nullable Original_sfic) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); @@ -31782,6 +32063,46 @@ ORDER BY pdate"; this.Adapter.DeleteCommand.Parameters[58].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[59].Value = global::System.DBNull.Value; } + if ((Original_sfi_type == null)) { + this.Adapter.DeleteCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[61].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[61].Value = ((string)(Original_sfi_type)); + } + if ((Original_sfi_savetime.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[63].Value = ((double)(Original_sfi_savetime.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[63].Value = global::System.DBNull.Value; + } + if ((Original_sfi_savecount.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[65].Value = ((double)(Original_sfi_savecount.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[65].Value = global::System.DBNull.Value; + } + if ((Original_sfi_shiftcount.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[67].Value = ((double)(Original_sfi_shiftcount.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[67].Value = global::System.DBNull.Value; + } + if ((Original_sfic.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[69].Value = ((double)(Original_sfic.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[69].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)) { @@ -31835,7 +32156,12 @@ ORDER BY pdate"; global::System.Nullable weekly, global::System.Nullable bef_time, global::System.Nullable aft_time, - global::System.Nullable sfi) { + global::System.Nullable sfi, + string sfi_type, + global::System.Nullable sfi_savetime, + global::System.Nullable sfi_savecount, + global::System.Nullable sfi_shiftcount, + global::System.Nullable sfic) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -32029,6 +32355,36 @@ ORDER BY pdate"; else { this.Adapter.InsertCommand.Parameters[32].Value = global::System.DBNull.Value; } + if ((sfi_type == null)) { + this.Adapter.InsertCommand.Parameters[33].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[33].Value = ((string)(sfi_type)); + } + if ((sfi_savetime.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[34].Value = ((double)(sfi_savetime.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[34].Value = global::System.DBNull.Value; + } + if ((sfi_savecount.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[35].Value = ((double)(sfi_savecount.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[35].Value = global::System.DBNull.Value; + } + if ((sfi_shiftcount.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[36].Value = ((double)(sfi_shiftcount.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[36].Value = global::System.DBNull.Value; + } + if ((sfic.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[37].Value = ((double)(sfic.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[37].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)) { @@ -32083,6 +32439,11 @@ ORDER BY pdate"; global::System.Nullable bef_time, global::System.Nullable aft_time, global::System.Nullable sfi, + string sfi_type, + global::System.Nullable sfi_savetime, + global::System.Nullable sfi_savecount, + global::System.Nullable sfi_shiftcount, + global::System.Nullable sfic, int Original_idx, string Original_gcode, global::System.Nullable Original_isdel, @@ -32115,6 +32476,11 @@ ORDER BY pdate"; global::System.Nullable Original_bef_time, global::System.Nullable Original_aft_time, global::System.Nullable Original_sfi, + string Original_sfi_type, + global::System.Nullable Original_sfi_savetime, + global::System.Nullable Original_sfi_savecount, + global::System.Nullable Original_sfi_shiftcount, + global::System.Nullable Original_sfic, int idx) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -32309,245 +32675,315 @@ ORDER BY pdate"; else { this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_idx)); + if ((sfi_type == null)) { + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(sfi_type)); + } + if ((sfi_savetime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[34].Value = ((double)(sfi_savetime.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; + } + if ((sfi_savecount.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[35].Value = ((double)(sfi_savecount.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + } + if ((sfi_shiftcount.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((double)(sfi_shiftcount.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + } + if ((sfic.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[37].Value = ((double)(sfic.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[38].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_gcode)); } if ((Original_isdel.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[36].Value = ((bool)(Original_isdel.Value)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((bool)(Original_isdel.Value)); } else { - this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_asset)); } if ((Original_process == null)) { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_process)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_process)); } if ((Original_part == null)) { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_part)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_part)); } if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_pdate)); } if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_name)); } if ((Original_userManager == null)) { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_userManager)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_userManager)); } if ((Original_usermain == null)) { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_usermain)); } if ((Original_reqstaff == null)) { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_reqstaff)); } if ((Original_costo.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[54].Value = ((double)(Original_costo.Value)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((double)(Original_costo.Value)); } else { - this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; } if ((Original_costn.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[56].Value = ((double)(Original_costn.Value)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((double)(Original_costn.Value)); } else { - this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; } if ((Original_cnt.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_cnt.Value)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[63].Value = ((int)(Original_cnt.Value)); } else { - this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value; } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_edate)); } if ((Original_progress.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[62].Value = ((int)(Original_progress.Value)); + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[67].Value = ((int)(Original_progress.Value)); } else { - this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[65].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[66].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[71].Value = ((System.DateTime)(Original_wdate)); if ((Original_orderno == null)) { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_orderno)); + this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_orderno)); } if ((Original_userprocess == null)) { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[70].Value = ((string)(Original_userprocess)); + this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[75].Value = ((string)(Original_userprocess)); } if ((Original_category == null)) { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[72].Value = ((string)(Original_category)); + this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_category)); } if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[74].Value = ((string)(Original_status)); + this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_status)); } if ((Original_workgroup == null)) { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[76].Value = ((string)(Original_workgroup)); + this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[81].Value = ((string)(Original_workgroup)); } if ((Original_site == null)) { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_site)); + this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_site)); } if ((Original_subcate == null)) { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[85].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_subcate)); + this.Adapter.UpdateCommand.Parameters[84].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[85].Value = ((string)(Original_subcate)); } if ((Original_eepart == null)) { - this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[87].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[82].Value = ((string)(Original_eepart)); + this.Adapter.UpdateCommand.Parameters[86].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[87].Value = ((string)(Original_eepart)); } if ((Original_fanout.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[84].Value = ((bool)(Original_fanout.Value)); + this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[89].Value = ((bool)(Original_fanout.Value)); } else { - this.Adapter.UpdateCommand.Parameters[83].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[84].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[88].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[89].Value = global::System.DBNull.Value; } if ((Original_weekly.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[86].Value = ((bool)(Original_weekly.Value)); + this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[91].Value = ((bool)(Original_weekly.Value)); } else { - this.Adapter.UpdateCommand.Parameters[85].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[86].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[90].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[91].Value = global::System.DBNull.Value; } if ((Original_bef_time.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[88].Value = ((double)(Original_bef_time.Value)); + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[93].Value = ((double)(Original_bef_time.Value)); } else { - this.Adapter.UpdateCommand.Parameters[87].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[88].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[92].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[93].Value = global::System.DBNull.Value; } if ((Original_aft_time.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[90].Value = ((double)(Original_aft_time.Value)); + this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[95].Value = ((double)(Original_aft_time.Value)); } else { - this.Adapter.UpdateCommand.Parameters[89].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[90].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[94].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[95].Value = global::System.DBNull.Value; } if ((Original_sfi.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[92].Value = ((double)(Original_sfi.Value)); + this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[97].Value = ((double)(Original_sfi.Value)); } else { - this.Adapter.UpdateCommand.Parameters[91].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[92].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[96].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[97].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[93].Value = ((int)(idx)); + if ((Original_sfi_type == null)) { + this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[99].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[98].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[99].Value = ((string)(Original_sfi_type)); + } + if ((Original_sfi_savetime.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[101].Value = ((double)(Original_sfi_savetime.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[100].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[101].Value = global::System.DBNull.Value; + } + if ((Original_sfi_savecount.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[102].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[103].Value = ((double)(Original_sfi_savecount.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[102].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[103].Value = global::System.DBNull.Value; + } + if ((Original_sfi_shiftcount.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[104].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[105].Value = ((double)(Original_sfi_shiftcount.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[104].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[105].Value = global::System.DBNull.Value; + } + if ((Original_sfic.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[106].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[107].Value = ((double)(Original_sfic.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[106].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[107].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[108].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)) { @@ -32602,6 +33038,11 @@ ORDER BY pdate"; global::System.Nullable bef_time, global::System.Nullable aft_time, global::System.Nullable sfi, + string sfi_type, + global::System.Nullable sfi_savetime, + global::System.Nullable sfi_savecount, + global::System.Nullable sfi_shiftcount, + global::System.Nullable sfic, int Original_idx, string Original_gcode, global::System.Nullable Original_isdel, @@ -32633,8 +33074,13 @@ ORDER BY pdate"; global::System.Nullable Original_weekly, global::System.Nullable Original_bef_time, global::System.Nullable Original_aft_time, - global::System.Nullable Original_sfi) { - 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, sfi, 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_sfi, Original_idx); + global::System.Nullable Original_sfi, + string Original_sfi_type, + global::System.Nullable Original_sfi_savetime, + global::System.Nullable Original_sfi_savecount, + global::System.Nullable Original_sfi_shiftcount, + global::System.Nullable Original_sfic) { + 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, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, 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_sfi, Original_sfi_type, Original_sfi_savetime, Original_sfi_savecount, Original_sfi_shiftcount, Original_sfic, Original_idx); } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index df46b76..632702d 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -1204,7 +1204,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)) 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)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi))) + 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)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi)) AND ((@IsNull_sfi_type = 1 AND [sfi_type] IS NULL) OR ([sfi_type] = @Original_sfi_type)) AND ((@IsNull_sfi_savetime = 1 AND [sfi_savetime] IS NULL) OR ([sfi_savetime] = @Original_sfi_savetime)) AND ((@IsNull_sfi_savecount = 1 AND [sfi_savecount] IS NULL) OR ([sfi_savecount] = @Original_sfi_savecount)) AND ((@IsNull_sfi_shiftcount = 1 AND [sfi_shiftcount] IS NULL) OR ([sfi_shiftcount] = @Original_sfi_shiftcount)) AND ((@IsNull_sfic = 1 AND [sfic] IS NULL) OR ([sfic] = @Original_sfic))) @@ -1266,13 +1266,23 @@ 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], [bef_time], [aft_time], [sfi]) 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, @sfi); -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, sfi 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], [sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount], [sfic]) 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, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount, @sfic); +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, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic FROM EETGW_SaveCost WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate @@ -1307,13 +1317,18 @@ 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, bef_time, aft_time, sfi + category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic FROM EETGW_SaveCost WITH (nolock) ORDER BY pdate @@ -1321,8 +1336,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, [bef_time] = @bef_time, [aft_time] = @aft_time, [sfi] = @sfi 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)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi))); -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, sfi 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, [sfi] = @sfi, [sfi_type] = @sfi_type, [sfi_savetime] = @sfi_savetime, [sfi_savecount] = @sfi_savecount, [sfi_shiftcount] = @sfi_shiftcount, [sfic] = @sfic 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)) AND ((@IsNull_sfi = 1 AND [sfi] IS NULL) OR ([sfi] = @Original_sfi)) AND ((@IsNull_sfi_type = 1 AND [sfi_type] IS NULL) OR ([sfi_type] = @Original_sfi_type)) AND ((@IsNull_sfi_savetime = 1 AND [sfi_savetime] IS NULL) OR ([sfi_savetime] = @Original_sfi_savetime)) AND ((@IsNull_sfi_savecount = 1 AND [sfi_savecount] IS NULL) OR ([sfi_savecount] = @Original_sfi_savecount)) AND ((@IsNull_sfi_shiftcount = 1 AND [sfi_shiftcount] IS NULL) OR ([sfi_shiftcount] = @Original_sfi_shiftcount)) AND ((@IsNull_sfic = 1 AND [sfic] IS NULL) OR ([sfic] = @Original_sfic))); +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, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic FROM EETGW_SaveCost WITH (nolock) WHERE (idx = @idx) ORDER BY pdate @@ -1357,6 +1372,11 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + + + + @@ -1417,7 +1437,17 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma - + + + + + + + + + + + @@ -1458,6 +1488,11 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma + + + + + @@ -4105,6 +4140,17 @@ WHERE (idx = @idx) + + + + + + + + + + +