diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 20f66ad..0f12fa5 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("23.01.05.0830")] -[assembly: AssemblyFileVersion("23.01.05.0830")] +[assembly: AssemblyVersion("23.01.09.0830")] +[assembly: AssemblyFileVersion("23.01.09.0830")] diff --git a/SubProject/FEQ0000/DataBaseManager.cs b/SubProject/FEQ0000/DataBaseManager.cs index 1731f7f..638dbd0 100644 --- a/SubProject/FEQ0000/DataBaseManager.cs +++ b/SubProject/FEQ0000/DataBaseManager.cs @@ -19,12 +19,12 @@ namespace FEQ0000 List retval = new List(); var cn = getCn(); cn.Open(); - var sql = "select {0} from {1} where isnull({0},'') != '' group by {0} order by {0}"; + var sql = "select {0} from {1} where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' group by {0} order by {0}"; if (GroupColumn.IndexOf("+") == -1) sql = string.Format(sql, "[" + GroupColumn + "]", table); else - sql = string.Format(sql, GroupColumn , table); + sql = string.Format(sql, GroupColumn, table); var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); diff --git a/SubProject/FEQ0000/Equipment/EQFilterApply.cs b/SubProject/FEQ0000/Equipment/EQFilterApply.cs index ddabb57..a074e09 100644 --- a/SubProject/FEQ0000/Equipment/EQFilterApply.cs +++ b/SubProject/FEQ0000/Equipment/EQFilterApply.cs @@ -33,7 +33,7 @@ namespace FEQ0000 try { - ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype); + ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype, FCOMMON.info.Login.gcode); //필터목록을 미리 가져온다. //var fn = "eqfilter.xml"; diff --git a/SubProject/FEQ0000/Equipment/EQfilterManager.cs b/SubProject/FEQ0000/Equipment/EQfilterManager.cs index 5d65139..86858b8 100644 --- a/SubProject/FEQ0000/Equipment/EQfilterManager.cs +++ b/SubProject/FEQ0000/Equipment/EQfilterManager.cs @@ -26,13 +26,14 @@ namespace FEQ0000 e.Row["type"] = this.divtype; e.Row["wuid"] = FCOMMON.info.Login.no; e.Row["wdate"] = DateTime.Now; + e.Row["gcode"] = FCOMMON.info.Login.gcode; } private void EQfilter_Load(object sender, EventArgs e) { try { - ta.Fill(this.dsEQ.EquipmentFilter, divtype); + ta.Fill(this.dsEQ.EquipmentFilter, divtype, FCOMMON.info.Login.gcode); } catch (Exception ex) { diff --git a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs index 1cc4ee2..6537775 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs @@ -86,6 +86,7 @@ this.radexpa = new System.Windows.Forms.RadioButton(); this.radexpn = new System.Windows.Forms.RadioButton(); this.panel1 = new System.Windows.Forms.Panel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.radioButton1 = new System.Windows.Forms.RadioButton(); this.radioButton2 = new System.Windows.Forms.RadioButton(); @@ -108,7 +109,6 @@ this.장비모델생성공통07ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager(); this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); @@ -164,6 +164,7 @@ this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // // bindingNavigatorCountItem // @@ -613,6 +614,17 @@ this.panel1.TabIndex = 2; this.panel1.Visible = false; // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(21, 64); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(52, 12); + this.linkLabel1.TabIndex = 16; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "Process"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // // groupBox2 // this.groupBox2.Controls.Add(this.radioButton1); @@ -735,7 +747,7 @@ // applyToolStripMenuItem // this.applyToolStripMenuItem.Name = "applyToolStripMenuItem"; - this.applyToolStripMenuItem.Size = new System.Drawing.Size(172, 22); + this.applyToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.applyToolStripMenuItem.Text = "Apply"; this.applyToolStripMenuItem.Click += new System.EventHandler(this.applyToolStripMenuItem_Click); // @@ -819,17 +831,6 @@ // this.taAll.ClearBeforeFill = true; // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(21, 64); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(52, 12); - this.linkLabel1.TabIndex = 16; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "Process"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // // fEquipment // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs index 63fa62b..fd71c3e 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.cs @@ -100,8 +100,8 @@ namespace FEQ0000 var taDateList = new dsEQTableAdapters.EqDateListTableAdapter(); DataTable dtList = null; - if (dataType == eTabletype.ALL) dtList = taDateList.GetData(); - else dtList = taDateList.GetData(); + if (dataType == eTabletype.ALL) dtList = taDateList.GetData(FCOMMON.info.Login.gcode); + else dtList = taDateList.GetData(FCOMMON.info.Login.gcode); this.cmbDate.Items.Clear(); if (dtList != null) @@ -483,7 +483,7 @@ namespace FEQ0000 var ucnt = 0; var taLIne = new dsEQTableAdapters.LineCodeTableAdapter(); - var dtLineCode = taLIne.GetData(); + var dtLineCode = taLIne.GetData(FCOMMON.info.Login.gcode); this.prb1.Maximum = this.dsEQ.EETGW_Equipment.Count; @@ -540,6 +540,11 @@ namespace FEQ0000 { } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FEQ0000/Equipment/fEquipment.resx b/SubProject/FEQ0000/Equipment/fEquipment.resx index df394db..e4474bf 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.resx +++ b/SubProject/FEQ0000/Equipment/fEquipment.resx @@ -234,9 +234,6 @@ 83, 17 - - 83, 17 - 236, 17 @@ -247,6 +244,17 @@ IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d 2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7 xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95pidOqirqoi7mzR + SlNBok4K6k5dtabJKmspERcF0aUPCmPudaY05mH0wIHLnPudYWBIloQgC4PTkjmwy2swy+NiAsDv69ZD + YE7Bfl+zCpeYprno8aWTcbAxFS8dAYYZziCTa+lC2InD8yWuo/UySyDwL2hvHLAErAwlsJN4Dr6Z61Ye + rAw7I067sxIYRg7tFoGVsSRisGRol42ncP1ThXfXW2KzXsW50zLEcbuGc51VMVN7k3Dv4/6sskrc83jB + zWVDMFlweGCIo9Z3AWPL4vaqES+wKyv4DI/T5utj802Fvxl2gUFYyeP69nO4/54GzDsVVvIcupNXAhlc + JNfTlVWCcJTJtXz9LPkTrORzbRfAf8Eg+CRDu1Rzo38y+3UJEfIFvRLocMoRAWoAAAAASUVORK5CYII= @@ -261,17 +269,6 @@ qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY AOn3LwMH9jJlAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZJLS8NAFIVHf2dbzGRt95pidOKirqoi7qxo - pakgUScFdaeuWtNklb004kIQXfqgMOZeZ0pjHkYPHLjMud8ZBobkSQgyNzipmAOnugKzPC4nAIK+bt+H - qxNw0Nfs0iWmac77fOF4HLKJeOkIMMxwBplcyxbCbhKeLfFcrZdbAkFwTnvj0ErBylACO6nn4Ju5bhfB - yrAz4rQ7LYFh5NJuGVgZS2IGS4ZO1XiM1j5VeHu1IdatOs6dtiGO9hs4W6yOmdp7inY+7k5ry8Q7SxZc - XzQFkwUHe4Y4bH8XMLYobi6byQKntoTP8DltvT603lT4m2EXGISVfK5vPke771nArDNhJd+lW0UlkMFF - cj1beSUIx5lcK9bPkj/BSgHXtgH8FwyCTzJ0Kg0v/ifTX5cSIV8KkOiKQK+J5QAAAABJRU5ErkJggg== @@ -289,14 +286,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3 - BqQwK7V8WVtX23JNLW1rt02tzaTwLUrR0FOFnYoy6xJRZE67MZKrS9YDv8v8/s8wwzCKeqjI7SG9ex/T - U36H3hnQqLGdflT9jgpb7zF6g75A5v41XYBQTOqxBJnEZUHYiAAANKHRWoSy0ezhg8mH4rdYnVDy5nPR - 6cfQeC1aBzsazeU+5ORyuEQuryRcA0iRQjBhWk6qTCr/CXXrvgWkSFkNnIbkpOpgW0ESKVJsbJSTEyqT - EqJ3HxiRIkVj9ynPbt9kxXL47NWLyuwZQoqUsSWqk/DyT3KiGPF1TG6eRuNSACBb50l6b/EgVjTvnDyf - 371L5EjmumjaODycnMW7kPIDMBrbNWvMsWWLL81ZPZ4RHG8zuAJTVi6yZ2PDsWXmmNY4fMMKCBuQ8gPQ - kd06O3vEhNNwfsW7K8jNqKrPOGbvXaLYOBu5gAskzQOw2YKq+kxrqT4DtZvkYhkoHD80obZ2oOpvqAmv - hYtnoXgC8QOh5b+jNNsHZ3A3Ll4DLf0DheILn/WXKCs8OcIAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV/C7BNGlU0S3 + BqQwy5c0W9tW23JNLbetXdeXXE0KTaMUDT0leCt6v0QUWdNujNjakvXA7zK//zPMMIyqEVpyV23x7mMW + KuSyuMMGHbY3iKrf0WKbfVY6FgwXrp/z9xBKyd19QDZzcS9uRAAAWtDoT8Sy2eYTYtmbypdYn3im/L7o + DmFo/CdGFzd2XC6/KcnV8JnyrYbwDCFFDsEmGCXpe3K379C0GdQjRc56+CSuJNUH24mRSJHj4I55JeF7 + cmIs3ogVKXIMzqDm9PJFUaxGKJaetDafGilyxs1UN0ELD0qiFOl1lr0Cg8blAEC2L5BMwBRJVWx7R49n + V68yOVkoVZa3otGpObwHKTWA1dpp2GAPcTryMW/3+UZxvGPJE56288mAg0ukVthDxuAKjqggbEJKDWAi + e01O7oBN5OHCGu0X5VZUNWYCc/abKS7NJc+hnmQEALbbUNWYGSM1sET5s3yqAMXjxyd19i5U/Q0dQa/y + 6SKUTiB9ILT8dzQ25/As7sWla6Clf6BSfQKRtJchBF/ltgAAAABJRU5ErkJggg== diff --git a/SubProject/FEQ0000/Equipment/fImpEquipment.cs b/SubProject/FEQ0000/Equipment/fImpEquipment.cs index 7e0e215..c321db2 100644 --- a/SubProject/FEQ0000/Equipment/fImpEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fImpEquipment.cs @@ -196,7 +196,7 @@ namespace FEQ0000 private void button2_Click(object sender, EventArgs e) { var ta = new dsEQTableAdapters.LineCodeTableAdapter(); - var lineTd = ta.GetData(); + var lineTd = ta.GetData(FCOMMON.info.Login.gcode); lineTd.AcceptChanges(); //12,13 foreach (DataRow dr in dt.Rows) @@ -255,7 +255,7 @@ namespace FEQ0000 //라인코드를 읽어서 값을 기록해준다. var taLine = new dsEQTableAdapters.LineCodeTableAdapter(); - var lineTd = taLine.GetData(); + var lineTd = taLine.GetData(FCOMMON.info.Login.gcode); lineTd.AcceptChanges(); dt.Clear(); @@ -270,7 +270,7 @@ namespace FEQ0000 if (dlg == DialogResult.Yes) { var taE = new dsEQTableAdapters.EETGW_EquipmentTableAdapter(); - taE.DeleteData(dateStr); + taE.DeleteData(dateStr, FCOMMON.info.Login.gcode); } //12,13 @@ -327,6 +327,7 @@ namespace FEQ0000 //신규추가한다. var newli = lineTd.NewLineCodeRow(); newli.code = linecode; + newli.gcode = FCOMMON.info.Login.gcode; newli.team = lineT; newli.part = lineP; newli.memo = linedesc; @@ -364,6 +365,7 @@ namespace FEQ0000 newdr["memo"] = string.Empty; newdr["flag"] = rcsflag; //rcs flag 210325 newdr["version"] = version; //210810 + newdr["gcode"] = FCOMMON.info.Login.gcode; if (grp2.ToUpper() == "BUMP") newdr["param1"] = "8\""; else newdr["param1"] = string.Empty; diff --git a/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs b/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs index 560b41c..ff40127 100644 --- a/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs +++ b/SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs @@ -67,6 +67,7 @@ namespace FEQ0000 newdr.Remark = dr.memo; newdr.plant = dr.plant; newdr.grp2 = dr.grp2; + newdr.gcode = FCOMMON.info.Login.gcode; dtSum.AddvEquStockAllRow(newdr); } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs index b062291..02ec841 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Import.cs @@ -233,7 +233,7 @@ namespace FEQ0000 //라인코드를 읽어서 값을 기록해준다. var taLine = new dsEQTableAdapters.LineCodeTableAdapter(); - var lineTd = taLine.GetData(); + var lineTd = taLine.GetData(FCOMMON.info.Login.gcode); lineTd.AcceptChanges(); dt.Clear(); diff --git a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs b/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs index f7c922d..dd78072 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs @@ -240,7 +240,7 @@ namespace FEQ0000 //라인코드를 읽어서 값을 기록해준다. var taLine = new dsEQTableAdapters.LineCodeTableAdapter(); - var lineTd = taLine.GetData(); + var lineTd = taLine.GetData(FCOMMON.info.Login.gcode); lineTd.AcceptChanges(); dt.Clear(); diff --git a/SubProject/FEQ0000/dsEQ.Designer.cs b/SubProject/FEQ0000/dsEQ.Designer.cs index 30bb557..4be9de0 100644 --- a/SubProject/FEQ0000/dsEQ.Designer.cs +++ b/SubProject/FEQ0000/dsEQ.Designer.cs @@ -694,6 +694,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EquipmentFilterDataTable() { @@ -791,6 +793,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -828,7 +838,7 @@ namespace FEQ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public EquipmentFilterRow AddEquipmentFilterRow(string type, string Title, string Filter, string Apply, string memo, string wuid, System.DateTime wdate) { + public EquipmentFilterRow AddEquipmentFilterRow(string type, string Title, string Filter, string Apply, string memo, string wuid, System.DateTime wdate, string gcode) { EquipmentFilterRow rowEquipmentFilterRow = ((EquipmentFilterRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -838,7 +848,8 @@ namespace FEQ0000 { Apply, memo, wuid, - wdate}; + wdate, + gcode}; rowEquipmentFilterRow.ItemArray = columnValuesArray; this.Rows.Add(rowEquipmentFilterRow); return rowEquipmentFilterRow; @@ -876,6 +887,7 @@ namespace FEQ0000 { this.columnmemo = base.Columns["memo"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -897,6 +909,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -911,6 +925,7 @@ namespace FEQ0000 { this.columnApply.MaxLength = 2147483647; this.columnmemo.MaxLength = 255; this.columnwuid.MaxLength = 20; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1064,6 +1079,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columngrp2; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public LineCodeDataTable() { @@ -1177,6 +1194,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1214,7 +1239,7 @@ namespace FEQ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public LineCodeRow AddLineCodeRow(string code, string team, string part, bool except, string memo, string wuid, System.DateTime wdate, string plant, string grp2) { + public LineCodeRow AddLineCodeRow(string code, string team, string part, bool except, string memo, string wuid, System.DateTime wdate, string plant, string grp2, string gcode) { LineCodeRow rowLineCodeRow = ((LineCodeRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1226,7 +1251,8 @@ namespace FEQ0000 { wuid, wdate, plant, - grp2}; + grp2, + gcode}; rowLineCodeRow.ItemArray = columnValuesArray; this.Rows.Add(rowLineCodeRow); return rowLineCodeRow; @@ -1266,6 +1292,7 @@ namespace FEQ0000 { this.columnwdate = base.Columns["wdate"]; this.columnplant = base.Columns["plant"]; this.columngrp2 = base.Columns["grp2"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1291,6 +1318,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnplant); this.columngrp2 = new global::System.Data.DataColumn("grp2", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngrp2); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1308,6 +1337,7 @@ namespace FEQ0000 { this.columnwdate.AllowDBNull = false; this.columnplant.MaxLength = 10; this.columngrp2.MaxLength = 20; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1485,6 +1515,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnversion; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_EquipmentDataTable() { @@ -1694,6 +1726,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1752,7 +1792,8 @@ namespace FEQ0000 { string memo, string wuid, System.DateTime wdate, - string version) { + string version, + string gcode) { EETGW_EquipmentRow rowEETGW_EquipmentRow = ((EETGW_EquipmentRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1776,7 +1817,8 @@ namespace FEQ0000 { memo, wuid, wdate, - version}; + version, + gcode}; rowEETGW_EquipmentRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_EquipmentRow); return rowEETGW_EquipmentRow; @@ -1828,6 +1870,7 @@ namespace FEQ0000 { this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; this.columnversion = base.Columns["version"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1877,6 +1920,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnwdate); this.columnversion = new global::System.Data.DataColumn("version", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnversion); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1904,6 +1949,7 @@ namespace FEQ0000 { this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; this.columnversion.MaxLength = 255; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2059,6 +2105,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columngrp2; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public vEquStockAllDataTable() { @@ -2180,6 +2228,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2217,7 +2273,7 @@ namespace FEQ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public vEquStockAllRow AddvEquStockAllRow(string pdate, string grp, string manu, string model, string linecode, string lineT, string lineP, int cnt, string Remark, string plant, string grp2) { + public vEquStockAllRow AddvEquStockAllRow(string pdate, string grp, string manu, string model, string linecode, string lineT, string lineP, int cnt, string Remark, string plant, string grp2, string gcode) { vEquStockAllRow rowvEquStockAllRow = ((vEquStockAllRow)(this.NewRow())); object[] columnValuesArray = new object[] { pdate, @@ -2230,7 +2286,8 @@ namespace FEQ0000 { cnt, Remark, plant, - grp2}; + grp2, + gcode}; rowvEquStockAllRow.ItemArray = columnValuesArray; this.Rows.Add(rowvEquStockAllRow); return rowvEquStockAllRow; @@ -2264,6 +2321,7 @@ namespace FEQ0000 { this.columnRemark = base.Columns["Remark"]; this.columnplant = base.Columns["plant"]; this.columngrp2 = base.Columns["grp2"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2291,6 +2349,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnplant); this.columngrp2 = new global::System.Data.DataColumn("grp2", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngrp2); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.columnpdate.MaxLength = 20; this.columngrp.MaxLength = 50; this.columnmanu.MaxLength = 50; @@ -2301,6 +2361,7 @@ namespace FEQ0000 { this.columnRemark.MaxLength = 255; this.columnplant.MaxLength = 10; this.columngrp2.MaxLength = 20; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2590,6 +2651,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gcode { + get { + try { + return ((string)(this[this.tableEquipmentFilter.gcodeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EquipmentFilter\' 테이블의 \'gcode\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEquipmentFilter.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IstypeNull() { @@ -2673,6 +2750,18 @@ namespace FEQ0000 { public void SetwdateNull() { this[this.tableEquipmentFilter.wdateColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsgcodeNull() { + return this.IsNull(this.tableEquipmentFilter.gcodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetgcodeNull() { + this[this.tableEquipmentFilter.gcodeColumn] = global::System.Convert.DBNull; + } } /// @@ -2834,6 +2923,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gcode { + get { + try { + return ((string)(this[this.tableLineCode.gcodeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'LineCode\' 테이블의 \'gcode\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableLineCode.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IscodeNull() { @@ -2917,6 +3022,18 @@ namespace FEQ0000 { public void Setgrp2Null() { this[this.tableLineCode.grp2Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsgcodeNull() { + return this.IsNull(this.tableLineCode.gcodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetgcodeNull() { + this[this.tableLineCode.gcodeColumn] = global::System.Convert.DBNull; + } } /// @@ -3270,6 +3387,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gcode { + get { + try { + return ((string)(this[this.tableEETGW_Equipment.gcodeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'EETGW_Equipment\' 테이블의 \'gcode\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableEETGW_Equipment.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -3497,6 +3630,18 @@ namespace FEQ0000 { public void SetversionNull() { this[this.tableEETGW_Equipment.versionColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsgcodeNull() { + return this.IsNull(this.tableEETGW_Equipment.gcodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetgcodeNull() { + this[this.tableEETGW_Equipment.gcodeColumn] = global::System.Convert.DBNull; + } } /// @@ -3689,6 +3834,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gcode { + get { + try { + return ((string)(this[this.tablevEquStockAll.gcodeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'vEquStockAll\' 테이블의 \'gcode\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tablevEquStockAll.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -3820,6 +3981,18 @@ namespace FEQ0000 { public void Setgrp2Null() { this[this.tablevEquStockAll.grp2Column] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsgcodeNull() { + return this.IsNull(this.tablevEquStockAll.gcodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetgcodeNull() { + this[this.tablevEquStockAll.gcodeColumn] = global::System.Convert.DBNull; + } } /// @@ -4139,16 +4312,24 @@ namespace FEQ0000.dsEQTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT pdate\r\nFROM EETGW_Equipment\r\nGROUP BY pdate\r\nORDER BY pdate DESC"; + this._commandCollection[0].CommandText = "SELECT pdate\r\nFROM EETGW_Equipment\r\nWHERE (gcode = @gcode)\r\nGROUP BY pdate\r" + + "\nORDER BY pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsEQ.EqDateListDataTable dataTable) { + public virtual int Fill(dsEQ.EqDateListDataTable dataTable, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -4160,8 +4341,14 @@ namespace FEQ0000.dsEQTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsEQ.EqDateListDataTable GetData() { + public virtual dsEQ.EqDateListDataTable GetData(string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } dsEQ.EqDateListDataTable dataTable = new dsEQ.EqDateListDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -4326,10 +4513,11 @@ namespace FEQ0000.dsEQTableAdapters { tableMapping.ColumnMappings.Add("memo", "memo"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EquipmentFilter] WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EquipmentFilter] WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4342,10 +4530,12 @@ namespace FEQ0000.dsEQTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_wdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [EquipmentFilter] ([type], [Title], [Filter], [Apply], [memo], [wuid], [wdate]) VALUES (@type, @Title, @Filter, @Apply, @memo, @wuid, @wdate); -SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter WHERE (idx = SCOPE_IDENTITY()) ORDER BY Title"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EquipmentFilter] ([type], [Title], [Filter], [Apply], [memo], [wuid], [wdate], [gcode]) VALUES (@type, @Title, @Filter, @Apply, @memo, @wuid, @wdate, @gcode); +SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate, gcode FROM EquipmentFilter WHERE (idx = SCOPE_IDENTITY()) ORDER BY Title"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Title", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4354,10 +4544,11 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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 = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [EquipmentFilter] SET [type] = @type, [Title] = @Title, [Filter] = @Filter, [Apply] = @Apply, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate))); -SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter WHERE (idx = @idx) ORDER BY Title"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [EquipmentFilter] SET [type] = @type, [Title] = @Title, [Filter] = @Filter, [Apply] = @Apply, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))); +SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate, gcode FROM EquipmentFilter WHERE (idx = @idx) ORDER BY Title"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Title", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Title", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4366,6 +4557,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -4377,6 +4569,8 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_wdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4393,17 +4587,18 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate\r\nFROM EquipmentFil" + - "ter\r\nWHERE (type = @type)\r\nORDER BY Title"; + this._commandCollection[0].CommandText = "SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate, gcode\r\nFROM Equip" + + "mentFilter\r\nWHERE (type = @type) AND (gcode = @gcode)\r\nORDER BY Title"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsEQ.EquipmentFilterDataTable dataTable, string type) { + public virtual int Fill(dsEQ.EquipmentFilterDataTable dataTable, string type, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((type == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4411,6 +4606,12 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(type)); } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -4422,7 +4623,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsEQ.EquipmentFilterDataTable GetData(string type) { + public virtual dsEQ.EquipmentFilterDataTable GetData(string type, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((type == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4430,6 +4631,12 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(type)); } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsEQ.EquipmentFilterDataTable dataTable = new dsEQ.EquipmentFilterDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -4468,7 +4675,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_type, string Original_Title, string Original_memo, string Original_wuid, global::System.Nullable Original_wdate) { + public virtual int Delete(int Original_idx, string Original_type, string Original_Title, string Original_memo, string Original_wuid, global::System.Nullable Original_wdate, string Original_gcode) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_type == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -4510,6 +4717,14 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; } + if ((Original_gcode == null)) { + this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_gcode)); + } 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)) { @@ -4530,7 +4745,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string type, string Title, string Filter, string Apply, string memo, string wuid, global::System.Nullable wdate) { + public virtual int Insert(string type, string Title, string Filter, string Apply, string memo, string wuid, global::System.Nullable wdate, string gcode) { if ((type == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4573,6 +4788,12 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W else { this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; } + if ((gcode == null)) { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = ((string)(gcode)); + } 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)) { @@ -4593,7 +4814,23 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string type, string Title, string Filter, string Apply, string memo, string wuid, global::System.Nullable wdate, int Original_idx, string Original_type, string Original_Title, string Original_memo, string Original_wuid, global::System.Nullable Original_wdate, int idx) { + public virtual int Update( + string type, + string Title, + string Filter, + string Apply, + string memo, + string wuid, + global::System.Nullable wdate, + string gcode, + int Original_idx, + string Original_type, + string Original_Title, + string Original_memo, + string Original_wuid, + global::System.Nullable Original_wdate, + string Original_gcode, + int idx) { if ((type == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4636,48 +4873,62 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W else { this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_idx)); - if ((Original_type == null)) { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + if ((gcode == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_type)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(gcode)); + } + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx)); + if ((Original_type == null)) { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_type)); } if ((Original_Title == null)) { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_Title)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_Title)); } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_wuid)); } if ((Original_wdate.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(Original_wdate.Value)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((System.DateTime)(Original_wdate.Value)); } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(idx)); + if ((Original_gcode == null)) { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_gcode)); + } + this.Adapter.UpdateCommand.Parameters[21].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)) { @@ -4698,8 +4949,8 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string type, string Title, string Filter, string Apply, string memo, string wuid, global::System.Nullable wdate, int Original_idx, string Original_type, string Original_Title, string Original_memo, string Original_wuid, global::System.Nullable Original_wdate) { - return this.Update(type, Title, Filter, Apply, memo, wuid, wdate, Original_idx, Original_type, Original_Title, Original_memo, Original_wuid, Original_wdate, Original_idx); + public virtual int Update(string type, string Title, string Filter, string Apply, string memo, string wuid, global::System.Nullable wdate, string gcode, int Original_idx, string Original_type, string Original_Title, string Original_memo, string Original_wuid, global::System.Nullable Original_wdate, string Original_gcode) { + return this.Update(type, Title, Filter, Apply, memo, wuid, wdate, gcode, Original_idx, Original_type, Original_Title, Original_memo, Original_wuid, Original_wdate, Original_gcode, Original_idx); } } @@ -4834,10 +5085,11 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("plant", "plant"); tableMapping.ColumnMappings.Add("grp2", "grp2"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_code", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4856,10 +5108,12 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [LineCode] ([code], [team], [part], [plant], [except], [memo], [wuid], [wdate], [grp2]) VALUES (@code, @team, @part, @plant, @except, @memo, @wuid, @wdate, @grp2); -SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM LineCode WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [LineCode] ([code], [team], [part], [plant], [except], [memo], [wuid], [wdate], [grp2], [gcode]) VALUES (@code, @team, @part, @plant, @except, @memo, @wuid, @wdate, @grp2, @gcode); +SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2, gcode FROM LineCode WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@team", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "team", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4870,10 +5124,11 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [plant] = @plant, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [grp2] = @grp2 WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2))); -SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM LineCode WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [plant] = @plant, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [grp2] = @grp2, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))); +SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2, gcode FROM LineCode WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@team", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "team", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4884,6 +5139,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_code", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -4901,6 +5157,8 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4917,17 +5175,24 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2\r\nFROM " + - " LineCode"; + this._commandCollection[0].CommandText = "SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2, gcode\r\nF" + + "ROM LineCode\r\nWHERE (gcode = @gcode)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsEQ.LineCodeDataTable dataTable) { + public virtual int Fill(dsEQ.LineCodeDataTable dataTable, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -4939,8 +5204,14 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsEQ.LineCodeDataTable GetData() { + public virtual dsEQ.LineCodeDataTable GetData(string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } dsEQ.LineCodeDataTable dataTable = new dsEQ.LineCodeDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -4979,7 +5250,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_code, string Original_team, string Original_part, string Original_plant, global::System.Nullable Original_except, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_grp2) { + public virtual int Delete(int Original_idx, string Original_code, string Original_team, string Original_part, string Original_plant, global::System.Nullable Original_except, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_grp2, string Original_gcode) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_code == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -5044,6 +5315,14 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_grp2)); } + if ((Original_gcode == null)) { + this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_gcode)); + } 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)) { @@ -5064,7 +5343,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string code, string team, string part, string plant, global::System.Nullable except, string memo, string wuid, System.DateTime wdate, string grp2) { + public virtual int Insert(string code, string team, string part, string plant, global::System.Nullable except, string memo, string wuid, System.DateTime wdate, string grp2, string gcode) { if ((code == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -5114,6 +5393,12 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line else { this.Adapter.InsertCommand.Parameters[8].Value = ((string)(grp2)); } + if ((gcode == null)) { + this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[9].Value = ((string)(gcode)); + } 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)) { @@ -5144,6 +5429,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line string wuid, System.DateTime wdate, string grp2, + string gcode, int Original_idx, string Original_code, string Original_team, @@ -5154,6 +5440,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line string Original_wuid, System.DateTime Original_wdate, string Original_grp2, + string Original_gcode, int idx) { if ((code == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -5204,71 +5491,85 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line else { this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(grp2)); } - this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idx)); - if ((Original_code == null)) { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + if ((gcode == null)) { + this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_code)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(gcode)); + } + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx)); + if ((Original_code == null)) { + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_code)); } if ((Original_team == null)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_team)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_team)); } if ((Original_part == null)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_part)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_part)); } if ((Original_plant == null)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_plant)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_plant)); } if ((Original_except.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((bool)(Original_except.Value)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((bool)(Original_except.Value)); } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[23].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_wdate)); if ((Original_grp2 == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_grp2)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_grp2)); } - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(idx)); + if ((Original_gcode == null)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_gcode)); + } + this.Adapter.UpdateCommand.Parameters[29].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)) { @@ -5299,6 +5600,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line string wuid, System.DateTime wdate, string grp2, + string gcode, int Original_idx, string Original_code, string Original_team, @@ -5308,8 +5610,9 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line string Original_memo, string Original_wuid, System.DateTime Original_wdate, - string Original_grp2) { - return this.Update(code, team, part, plant, except, memo, wuid, wdate, grp2, Original_idx, Original_code, Original_team, Original_part, Original_plant, Original_except, Original_memo, Original_wuid, Original_wdate, Original_grp2, Original_idx); + string Original_grp2, + string Original_gcode) { + return this.Update(code, team, part, plant, except, memo, wuid, wdate, grp2, gcode, Original_idx, Original_code, Original_team, Original_part, Original_plant, Original_except, Original_memo, Original_wuid, Original_wdate, Original_grp2, Original_gcode, Original_idx); } } @@ -5456,6 +5759,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("version", "version"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -5478,7 +5782,8 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line "imary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_" + "except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)" + ") AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_ve" + - "rsion = 1 AND [version] IS NULL) OR ([version] = @Original_version)))"; + "rsion = 1 AND [version] IS NULL) OR ([version] = @Original_version)) AND ((@IsNu" + + "ll_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -5521,10 +5826,12 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_version", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "version", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "version", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_Equipment] ([pdate], [asset], [grp], [type], [flag], [plant], [grp2], [ing], [model], [linecode], [lineT], [lineP], [serial], [manu], [param1], [primary], [except], [memo], [wuid], [wdate], [version]) VALUES (@pdate, @asset, @grp, @type, @flag, @plant, @grp2, @ing, @model, @linecode, @lineT, @lineP, @serial, @manu, @param1, @primary, @except, @memo, @wuid, @wdate, @version); -SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version FROM EETGW_Equipment WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_Equipment] ([pdate], [asset], [grp], [type], [flag], [plant], [grp2], [ing], [model], [linecode], [lineT], [lineP], [serial], [manu], [param1], [primary], [except], [memo], [wuid], [wdate], [version], [gcode]) VALUES (@pdate, @asset, @grp, @type, @flag, @plant, @grp2, @ing, @model, @linecode, @lineT, @lineP, @serial, @manu, @param1, @primary, @except, @memo, @wuid, @wdate, @version, @gcode); +SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version, gcode FROM EETGW_Equipment WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -5547,6 +5854,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "version", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [EETGW_Equipment] SET [pdate] = @pdate, [asset] = @asset, [grp] = @grp, [t" + @@ -5554,29 +5862,30 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li "odel] = @model, [linecode] = @linecode, [lineT] = @lineT, [lineP] = @lineP, [ser" + "ial] = @serial, [manu] = @manu, [param1] = @param1, [primary] = @primary, [excep" + "t] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [version] = @ver" + - "sion WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL)" + - " OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR" + - " ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp]" + - " = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Orig" + - "inal_type)) AND ((@IsNull_flag = 1 AND [flag] IS NULL) OR ([flag] = @Original_fl" + - "ag)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)" + - ") AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND (" + - "(@IsNull_ing = 1 AND [ing] IS NULL) OR ([ing] = @Original_ing)) AND ((@IsNull_mo" + - "del = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linec" + - "ode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsN" + - "ull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull" + - "_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_se" + - "rial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_m" + - "anu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 =" + - " 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary" + - " = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_ex" + - "cept = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_m" + - "emo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Origina" + - "l_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_version = 1 AND [version] " + - "IS NULL) OR ([version] = @Original_version)));\r\nSELECT idx, pdate, asset, grp, t" + - "ype, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1" + - ", [primary], [except], memo, wuid, wdate, version FROM EETGW_Equipment WHERE (id" + - "x = @idx)"; + "sion, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AN" + + "D [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [" + + "asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] " + + "IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) " + + "OR ([type] = @Original_type)) AND ((@IsNull_flag = 1 AND [flag] IS NULL) OR ([fl" + + "ag] = @Original_flag)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] " + + "= @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Ori" + + "ginal_grp2)) AND ((@IsNull_ing = 1 AND [ing] IS NULL) OR ([ing] = @Original_ing)" + + ") AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) A" + + "ND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_lin" + + "ecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lin" + + "eT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)" + + ") AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial" + + ")) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND " + + "((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND" + + " ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)" + + ") AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except" + + ")) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND " + + "([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_version " + + "= 1 AND [version] IS NULL) OR ([version] = @Original_version)) AND ((@IsNull_gco" + + "de = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)));\r\nSELECT idx, pdate" + + ", asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, seria" + + "l, manu, param1, [primary], [except], memo, wuid, wdate, version, gcode FROM EET" + + "GW_Equipment WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -5599,6 +5908,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "version", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -5640,6 +5950,8 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_version", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "version", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_version", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "version", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -5658,21 +5970,24 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li" + "neT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, versio" + - "n\r\nFROM EETGW_Equipment\r\nWHERE (pdate = @pdate)"; + "n, gcode\r\nFROM EETGW_Equipment\r\nWHERE (pdate = @pdate) AND (gcode = @gcode)" + + ""; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "DELETE FROM [EETGW_Equipment] WHERE pdate = @pdate"; + this._commandCollection[1].CommandText = "DELETE FROM EETGW_Equipment\r\nWHERE (pdate = @pdate) AND (gcode = @gcode)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsEQ.EETGW_EquipmentDataTable dataTable, string pdate) { + public virtual int Fill(dsEQ.EETGW_EquipmentDataTable dataTable, string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -5680,6 +5995,12 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -5691,7 +6012,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsEQ.EETGW_EquipmentDataTable GetData(string pdate) { + public virtual dsEQ.EETGW_EquipmentDataTable GetData(string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -5699,6 +6020,12 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsEQ.EETGW_EquipmentDataTable dataTable = new dsEQ.EETGW_EquipmentDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -5759,7 +6086,8 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li string Original_memo, string Original_wuid, System.DateTime Original_wdate, - string Original_version) { + string Original_version, + string Original_gcode) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_pdate == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -5920,6 +6248,14 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li this.Adapter.DeleteCommand.Parameters[39].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[40].Value = ((string)(Original_version)); } + if ((Original_gcode == null)) { + this.Adapter.DeleteCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[42].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[42].Value = ((string)(Original_gcode)); + } 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)) { @@ -5961,7 +6297,8 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li string memo, string wuid, System.DateTime wdate, - string version) { + string version, + string gcode) { if ((pdate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -6083,6 +6420,12 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { this.Adapter.InsertCommand.Parameters[20].Value = ((string)(version)); } + if ((gcode == null)) { + this.Adapter.InsertCommand.Parameters[21].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[21].Value = ((string)(gcode)); + } 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)) { @@ -6125,6 +6468,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li string wuid, System.DateTime wdate, string version, + string gcode, int Original_idx, string Original_pdate, string Original_asset, @@ -6147,6 +6491,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li string Original_wuid, System.DateTime Original_wdate, string Original_version, + string Original_gcode, int idx) { if ((pdate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -6269,167 +6614,181 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(version)); } - this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_idx)); - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + if ((gcode == null)) { + this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(gcode)); + } + this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_idx)); + if ((Original_pdate == null)) { + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_pdate)); } if ((Original_asset == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_asset)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_asset)); } if ((Original_grp == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_grp)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_grp)); } if ((Original_type == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_type)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_type)); } if ((Original_flag == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_flag)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_flag)); } if ((Original_plant == null)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_plant)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_plant)); } if ((Original_grp2 == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_grp2)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_grp2)); } if ((Original_ing.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((bool)(Original_ing.Value)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((bool)(Original_ing.Value)); } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } if ((Original_model == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_model)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_model)); } if ((Original_linecode == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_linecode)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_linecode)); } if ((Original_lineT == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_lineT)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_lineT)); } if ((Original_lineP == null)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_lineP)); + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_lineP)); } if ((Original_serial == null)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_serial)); + this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_serial)); } if ((Original_manu == null)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_manu)); + this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_manu)); } if ((Original_param1 == null)) { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_param1)); + this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_param1)); } if ((Original_primary.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((bool)(Original_primary.Value)); + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((bool)(Original_primary.Value)); } else { - this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value; } if ((Original_except.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[55].Value = ((bool)(Original_except.Value)); + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[56].Value = ((bool)(Original_except.Value)); } else { - this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[57].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[59].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[60].Value = ((System.DateTime)(Original_wdate)); if ((Original_version == null)) { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_version)); + this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_version)); } - this.Adapter.UpdateCommand.Parameters[62].Value = ((int)(idx)); + if ((Original_gcode == null)) { + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[64].Value = ((string)(Original_gcode)); + } + this.Adapter.UpdateCommand.Parameters[65].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)) { @@ -6472,6 +6831,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li string wuid, System.DateTime wdate, string version, + string gcode, int Original_idx, string Original_pdate, string Original_asset, @@ -6493,15 +6853,15 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li string Original_memo, string Original_wuid, System.DateTime Original_wdate, - string Original_version) { - return this.Update(pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, primary, except, memo, wuid, wdate, version, Original_idx, Original_pdate, Original_asset, Original_grp, Original_type, Original_flag, Original_plant, Original_grp2, Original_ing, Original_model, Original_linecode, Original_lineT, Original_lineP, Original_serial, Original_manu, Original_param1, Original_primary, Original_except, Original_memo, Original_wuid, Original_wdate, Original_version, Original_idx); + string Original_version, + string Original_gcode) { + return this.Update(pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, primary, except, memo, wuid, wdate, version, gcode, Original_idx, Original_pdate, Original_asset, Original_grp, Original_type, Original_flag, Original_plant, Original_grp2, Original_ing, Original_model, Original_linecode, Original_lineT, Original_lineP, Original_serial, Original_manu, Original_param1, Original_primary, Original_except, Original_memo, Original_wuid, Original_wdate, Original_version, Original_gcode, Original_idx); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, false)] - public virtual int DeleteData(string pdate) { + public virtual int DeleteData(string pdate, string gcode) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; if ((pdate == null)) { command.Parameters[0].Value = global::System.DBNull.Value; @@ -6509,6 +6869,12 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { command.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(gcode)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -6659,6 +7025,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li tableMapping.ColumnMappings.Add("Remark", "Remark"); tableMapping.ColumnMappings.Add("plant", "plant"); tableMapping.ColumnMappings.Add("grp2", "grp2"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); this._adapter.TableMappings.Add(tableMapping); } @@ -6676,16 +7043,17 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT pdate, grp, manu, model, linecode, lineT, lineP, cnt, Remark, plant, grp2" + - "\r\nFROM vEquStockAll\r\nWHERE (pdate = @pdate)"; + ", gcode\r\nFROM vEquStockAll\r\nWHERE (pdate = @pdate) AND (gcode = @gcode)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsEQ.vEquStockAllDataTable dataTable, string pdate) { + public virtual int Fill(dsEQ.vEquStockAllDataTable dataTable, string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -6693,6 +7061,12 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -6704,7 +7078,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsEQ.vEquStockAllDataTable GetData(string pdate) { + public virtual dsEQ.vEquStockAllDataTable GetData(string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((pdate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -6712,6 +7086,12 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); } + if ((gcode == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsEQ.vEquStockAllDataTable dataTable = new dsEQ.vEquStockAllDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/SubProject/FEQ0000/dsEQ.xsd b/SubProject/FEQ0000/dsEQ.xsd index c198025..b086f5d 100644 --- a/SubProject/FEQ0000/dsEQ.xsd +++ b/SubProject/FEQ0000/dsEQ.xsd @@ -22,9 +22,12 @@ SELECT pdate FROM EETGW_Equipment +WHERE (gcode = @gcode) GROUP BY pdate ORDER BY pdate DESC - + + + @@ -39,7 +42,7 @@ ORDER BY pdate DESC - DELETE FROM [EquipmentFilter] WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate))) + DELETE FROM [EquipmentFilter] WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))) @@ -52,13 +55,15 @@ ORDER BY pdate DESC + + - INSERT INTO [EquipmentFilter] ([type], [Title], [Filter], [Apply], [memo], [wuid], [wdate]) VALUES (@type, @Title, @Filter, @Apply, @memo, @wuid, @wdate); -SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter WHERE (idx = SCOPE_IDENTITY()) ORDER BY Title + INSERT INTO [EquipmentFilter] ([type], [Title], [Filter], [Apply], [memo], [wuid], [wdate], [gcode]) VALUES (@type, @Title, @Filter, @Apply, @memo, @wuid, @wdate, @gcode); +SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate, gcode FROM EquipmentFilter WHERE (idx = SCOPE_IDENTITY()) ORDER BY Title @@ -67,24 +72,26 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W + - SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate + SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate, gcode FROM EquipmentFilter -WHERE (type = @type) +WHERE (type = @type) AND (gcode = @gcode) ORDER BY Title + - UPDATE [EquipmentFilter] SET [type] = @type, [Title] = @Title, [Filter] = @Filter, [Apply] = @Apply, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate))); -SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter WHERE (idx = @idx) ORDER BY Title + UPDATE [EquipmentFilter] SET [type] = @type, [Title] = @Title, [Filter] = @Filter, [Apply] = @Apply, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))); +SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate, gcode FROM EquipmentFilter WHERE (idx = @idx) ORDER BY Title @@ -93,6 +100,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W + @@ -104,6 +112,8 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W + + @@ -119,6 +129,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W + @@ -127,7 +138,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W - DELETE FROM [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2))) + DELETE FROM [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))) @@ -146,13 +157,15 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W + + - INSERT INTO [LineCode] ([code], [team], [part], [plant], [except], [memo], [wuid], [wdate], [grp2]) VALUES (@code, @team, @part, @plant, @except, @memo, @wuid, @wdate, @grp2); -SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM LineCode WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [LineCode] ([code], [team], [part], [plant], [except], [memo], [wuid], [wdate], [grp2], [gcode]) VALUES (@code, @team, @part, @plant, @except, @memo, @wuid, @wdate, @grp2, @gcode); +SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2, gcode FROM LineCode WHERE (idx = SCOPE_IDENTITY()) @@ -163,20 +176,24 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line + - SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 -FROM LineCode - + SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2, gcode +FROM LineCode +WHERE (gcode = @gcode) + + + - UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [plant] = @plant, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [grp2] = @grp2 WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2))); -SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM LineCode WHERE (idx = @idx) + UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [plant] = @plant, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [grp2] = @grp2, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))); +SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2, gcode FROM LineCode WHERE (idx = @idx) @@ -187,6 +204,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line + @@ -204,6 +222,8 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line + + @@ -221,6 +241,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line + @@ -229,7 +250,7 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line - DELETE FROM [EETGW_Equipment] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_flag = 1 AND [flag] IS NULL) OR ([flag] = @Original_flag)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_ing = 1 AND [ing] IS NULL) OR ([ing] = @Original_ing)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_version = 1 AND [version] IS NULL) OR ([version] = @Original_version))) + DELETE FROM [EETGW_Equipment] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_flag = 1 AND [flag] IS NULL) OR ([flag] = @Original_flag)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_ing = 1 AND [ing] IS NULL) OR ([ing] = @Original_ing)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_version = 1 AND [version] IS NULL) OR ([version] = @Original_version)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))) @@ -272,13 +293,15 @@ SELECT idx, code, team, part, plant, [except], memo, wuid, wdate, grp2 FROM Line + + - INSERT INTO [EETGW_Equipment] ([pdate], [asset], [grp], [type], [flag], [plant], [grp2], [ing], [model], [linecode], [lineT], [lineP], [serial], [manu], [param1], [primary], [except], [memo], [wuid], [wdate], [version]) VALUES (@pdate, @asset, @grp, @type, @flag, @plant, @grp2, @ing, @model, @linecode, @lineT, @lineP, @serial, @manu, @param1, @primary, @except, @memo, @wuid, @wdate, @version); -SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version FROM EETGW_Equipment WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [EETGW_Equipment] ([pdate], [asset], [grp], [type], [flag], [plant], [grp2], [ing], [model], [linecode], [lineT], [lineP], [serial], [manu], [param1], [primary], [except], [memo], [wuid], [wdate], [version], [gcode]) VALUES (@pdate, @asset, @grp, @type, @flag, @plant, @grp2, @ing, @model, @linecode, @lineT, @lineP, @serial, @manu, @param1, @primary, @except, @memo, @wuid, @wdate, @version, @gcode); +SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version, gcode FROM EETGW_Equipment WHERE (idx = SCOPE_IDENTITY()) @@ -301,23 +324,25 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li + - SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version + SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version, gcode FROM EETGW_Equipment -WHERE (pdate = @pdate) +WHERE (pdate = @pdate) AND (gcode = @gcode) + - UPDATE [EETGW_Equipment] SET [pdate] = @pdate, [asset] = @asset, [grp] = @grp, [type] = @type, [flag] = @flag, [plant] = @plant, [grp2] = @grp2, [ing] = @ing, [model] = @model, [linecode] = @linecode, [lineT] = @lineT, [lineP] = @lineP, [serial] = @serial, [manu] = @manu, [param1] = @param1, [primary] = @primary, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [version] = @version WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_flag = 1 AND [flag] IS NULL) OR ([flag] = @Original_flag)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_ing = 1 AND [ing] IS NULL) OR ([ing] = @Original_ing)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_version = 1 AND [version] IS NULL) OR ([version] = @Original_version))); -SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version FROM EETGW_Equipment WHERE (idx = @idx) + UPDATE [EETGW_Equipment] SET [pdate] = @pdate, [asset] = @asset, [grp] = @grp, [type] = @type, [flag] = @flag, [plant] = @plant, [grp2] = @grp2, [ing] = @ing, [model] = @model, [linecode] = @linecode, [lineT] = @lineT, [lineP] = @lineP, [serial] = @serial, [manu] = @manu, [param1] = @param1, [primary] = @primary, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [version] = @version, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_flag = 1 AND [flag] IS NULL) OR ([flag] = @Original_flag)) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)) AND ((@IsNull_ing = 1 AND [ing] IS NULL) OR ([ing] = @Original_ing)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_version = 1 AND [version] IS NULL) OR ([version] = @Original_version)) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode))); +SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate, version, gcode FROM EETGW_Equipment WHERE (idx = @idx) @@ -340,6 +365,7 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li + @@ -381,6 +407,8 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li + + @@ -410,9 +438,10 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li + - + DELETE FROM [EETGW_Equipment] WHERE pdate = @pdate @@ -421,6 +450,16 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li + + + DELETE FROM EETGW_Equipment +WHERE (pdate = @pdate) AND (gcode = @gcode) + + + + + + @@ -428,12 +467,13 @@ SELECT idx, pdate, asset, grp, type, flag, plant, grp2, ing, model, linecode, li - - SELECT pdate, grp, manu, model, linecode, lineT, lineP, cnt, Remark, plant, grp2 + + SELECT pdate, grp, manu, model, linecode, lineT, lineP, cnt, Remark, plant, grp2, gcode FROM vEquStockAll -WHERE (pdate = @pdate) +WHERE (pdate = @pdate) AND (gcode = @gcode) + @@ -451,6 +491,7 @@ WHERE (pdate = @pdate) + @@ -462,10 +503,10 @@ WHERE (pdate = @pdate) - + - + @@ -475,7 +516,7 @@ WHERE (pdate = @pdate) - + @@ -522,10 +563,17 @@ WHERE (pdate = @pdate) + + + + + + + - + @@ -580,10 +628,17 @@ WHERE (pdate = @pdate) + + + + + + + - + @@ -703,17 +758,24 @@ WHERE (pdate = @pdate) - + + + + + + + + - + @@ -787,6 +849,13 @@ WHERE (pdate = @pdate) + + + + + + + diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 7733cb7..ff7c702 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,29 +30,29 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -683,11 +683,11 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "SCR/CF"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.DecimalPlaces = 0; - numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType8.MaximumValue = 2147483647D; - numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType8; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -695,141 +695,141 @@ this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType9; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType10; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "finishrate"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name_champion"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "name_design"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "Design"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name_assembly"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asmb"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name_epanel"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "E-Panel"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name_software"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "Asset No."; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType11.MaximumValue = 2147483647D; - numberCellType11.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType11; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - numberCellType12.MaximumValue = 999999999999999D; - numberCellType12.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType12; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; - numberCellType13.MaximumValue = 999999999999999D; - numberCellType13.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType13; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType14; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(20).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "SCR/CF"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 63F; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 9efafdd..aca9dfc 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL55TLXClrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9psBGKzvoR9cwMmBN9Ayrx6JYwn9Y1Fd3+jSYt/DCMyuMLofhEEl07+Qq3q6hxMzEhh39Huu - lzrtbYHBo4N+VIsTrkbys870DGJGQq/7K5kPzPeA8V+GefYiKOQgGA5dmluzwDQSJvNsKIsnhGwJhoMX - fJKCKotCVcHsQlmXHOpuhcRPWSeCYleGcDwNzdnplYIqS6lKSZdwzSNNaBtrRvm5HSQoMDgezBTYp0Kw - TwbhnAni7ZcE9nZMkgJ1f6lKQW/ntHfrscdUjuJTBZC3bsGQNwSroAn27w1ef4qjotULFbOzsoyWc43O - OsjoQq6IzttmvLWIeGoZtimWeO38lxSQLfgNbLxqrAeg7C1B9bV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 - plncnsmIGn7CIpFafVnNlUro3VocsdegmC7g8psyYYGWoXdY+vYTd3yZDe7P8ofkfMwiW+ouJWTthSjS - 5yH/+LqVsIDu+gIpGOaDQpgU3OAfIpsXgRg0Ru+ad6C9+hJRvsD1NEy8bj9fIARytanD/VvMSGhgniOS - +AE2lsbnSAoBNglqt8GDXMka7tnFjIRj5vnx2k5/srZzDtXnfdh/ZvVe/hGK+gPE3yygwT7wCQAAAABJ + SKESs3bThpqMigpL15TLXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6LYwl9o1Fd78jSYu+jCMyuMLofhkEl07+Qq3raxIkZCYw7+j3X + S532tsDg0UE/osUJVyP5WWd6BjEjocf9lcz756+A8V+GefYiKOQgGA5dmluzwDQcJvNsKIsnhGwJhoMX + fJKCKotCVcHsQlmXHOpuhcRPWceDYleGcDwNzdmplYIqS6lKSZdwzcNNaBttRvm5HSQoMDAWzBTYJ0Ow + TwThnA7i7ZcE9nZMkAJ1X6lKQW/ntPfqscdUjuJTBZC3bsGgNwSroHH27w1ef4qjotULFbOzsoyWc43O + OsjoQq6IzttmvL2IeGoZtkmWeO38lxSQLfgNbLxqrAeg7ClB9fV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 + pljcmc6IGnrCIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd32ZDR7M8ofknGGRLXWXErL2QhTp + 85B/fN1KWEB3Y4EUDPFBIUwKbvIPkc2LQAwao3fNO9Bee4koX+B6GiZet58vEAK52tTh/i1mJDQwzxFJ + /AAbS+NzJIUAmwS12+BBrmQN9+1iRsIx8/xYbac/Wds5h+rzPuw/s3ov/whF/QHBaCyfq+CnsAAAAABJ RU5ErkJggg== @@ -275,9 +275,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 387, 17 @@ -335,18 +332,12 @@ 561, 17 - - 561, 17 - 731, 17 647, 17 - - 731, 17 - 828, 17