diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index 7d6870f..26776ab 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -94,6 +94,8 @@ namespace AppData { private Pack2CartDataTable tablePack2Cart; + private CartIRKDataTable tableCartIRK; + private global::System.Data.DataRelation relationFK_BatchReqList_OrderList; private global::System.Data.DataRelation relationFK_ItemList_Materials1; @@ -251,6 +253,9 @@ namespace AppData { if ((ds.Tables["Pack2Cart"] != null)) { base.Tables.Add(new Pack2CartDataTable(ds.Tables["Pack2Cart"])); } + if ((ds.Tables["CartIRK"] != null)) { + base.Tables.Add(new CartIRKDataTable(ds.Tables["CartIRK"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -619,6 +624,16 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public CartIRKDataTable CartIRK { + get { + return this.tableCartIRK; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -791,6 +806,9 @@ namespace AppData { if ((ds.Tables["Pack2Cart"] != null)) { base.Tables.Add(new Pack2CartDataTable(ds.Tables["Pack2Cart"])); } + if ((ds.Tables["CartIRK"] != null)) { + base.Tables.Add(new CartIRKDataTable(ds.Tables["CartIRK"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -1034,6 +1052,12 @@ namespace AppData { this.tablePack2Cart.InitVars(); } } + this.tableCartIRK = ((CartIRKDataTable)(base.Tables["CartIRK"])); + if ((initTable == true)) { + if ((this.tableCartIRK != null)) { + this.tableCartIRK.InitVars(); + } + } this.relationFK_BatchReqList_OrderList = this.Relations["FK_BatchReqList_OrderList"]; this.relationFK_ItemList_Materials1 = this.Relations["FK_ItemList_Materials1"]; this.relationFK_OffOrd2Item_OfflineOrderList = this.Relations["FK_OffOrd2Item_OfflineOrderList"]; @@ -1126,6 +1150,8 @@ namespace AppData { base.Tables.Add(this.tableOKOI_sum); this.tablePack2Cart = new Pack2CartDataTable(); base.Tables.Add(this.tablePack2Cart); + this.tableCartIRK = new CartIRKDataTable(); + base.Tables.Add(this.tableCartIRK); this.relationFK_BatchReqList_OrderList = new global::System.Data.DataRelation("FK_BatchReqList_OrderList", new global::System.Data.DataColumn[] { this.tableOrderList.OrdIDColumn}, new global::System.Data.DataColumn[] { this.tableBatchReqList.OrdIDColumn}, false); @@ -1386,6 +1412,12 @@ namespace AppData { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeCartIRK() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1546,6 +1578,9 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void Pack2CartRowChangeEventHandler(object sender, Pack2CartRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void CartIRKRowChangeEventHandler(object sender, CartIRKRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -15432,6 +15467,10 @@ namespace AppData { private global::System.Data.DataColumn columnCartDtmx; + private global::System.Data.DataColumn columnOrderExtCode; + + private global::System.Data.DataColumn columnFamilyCode; + private global::System.Data.DataColumn columnStarted; private global::System.Data.DataColumn columnCompleted; @@ -15501,6 +15540,22 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OrderExtCodeColumn { + get { + return this.columnOrderExtCode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn FamilyCodeColumn { + get { + return this.columnFamilyCode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn StartedColumn { @@ -15554,13 +15609,15 @@ namespace AppData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, int Started, int Completed) { + public Pack2CartRow AddPack2CartRow(int PackListID, int CartID, int CartIndex, string CartDtmx, string OrderExtCode, string FamilyCode, int Started, int Completed) { Pack2CartRow rowPack2CartRow = ((Pack2CartRow)(this.NewRow())); object[] columnValuesArray = new object[] { PackListID, CartID, CartIndex, CartDtmx, + OrderExtCode, + FamilyCode, Started, Completed}; rowPack2CartRow.ItemArray = columnValuesArray; @@ -15597,6 +15654,8 @@ namespace AppData { this.columnCartID = base.Columns["CartID"]; this.columnCartIndex = base.Columns["CartIndex"]; this.columnCartDtmx = base.Columns["CartDtmx"]; + this.columnOrderExtCode = base.Columns["OrderExtCode"]; + this.columnFamilyCode = base.Columns["FamilyCode"]; this.columnStarted = base.Columns["Started"]; this.columnCompleted = base.Columns["Completed"]; } @@ -15612,6 +15671,10 @@ namespace AppData { base.Columns.Add(this.columnCartIndex); this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCartDtmx); + this.columnOrderExtCode = new global::System.Data.DataColumn("OrderExtCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOrderExtCode); + this.columnFamilyCode = new global::System.Data.DataColumn("FamilyCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnFamilyCode); this.columnStarted = new global::System.Data.DataColumn("Started", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnStarted); this.columnCompleted = new global::System.Data.DataColumn("Completed", typeof(int), null, global::System.Data.MappingType.Element); @@ -15624,6 +15687,10 @@ namespace AppData { this.columnCartIndex.AllowDBNull = false; this.columnCartDtmx.ReadOnly = true; this.columnCartDtmx.MaxLength = 10; + this.columnOrderExtCode.AllowDBNull = false; + this.columnOrderExtCode.MaxLength = 250; + this.columnFamilyCode.AllowDBNull = false; + this.columnFamilyCode.MaxLength = 250; this.columnStarted.ReadOnly = true; this.columnCompleted.ReadOnly = true; } @@ -15752,6 +15819,378 @@ namespace AppData { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class CartIRKDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnOrderExtCode; + + private global::System.Data.DataColumn columnCartDtmx; + + private global::System.Data.DataColumn columnItemExtCode; + + private global::System.Data.DataColumn columnItemDesc; + + private global::System.Data.DataColumn columnItemNote; + + private global::System.Data.DataColumn columnTotReq; + + private global::System.Data.DataColumn columnTotCur; + + private global::System.Data.DataColumn columnMatExtCode; + + private global::System.Data.DataColumn columnMatDesc; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKDataTable() { + this.TableName = "CartIRK"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal CartIRKDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected CartIRKDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OrderExtCodeColumn { + get { + return this.columnOrderExtCode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn CartDtmxColumn { + get { + return this.columnCartDtmx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ItemExtCodeColumn { + get { + return this.columnItemExtCode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ItemDescColumn { + get { + return this.columnItemDesc; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ItemNoteColumn { + get { + return this.columnItemNote; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotReqColumn { + get { + return this.columnTotReq; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn TotCurColumn { + get { + return this.columnTotCur; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn MatExtCodeColumn { + get { + return this.columnMatExtCode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn MatDescColumn { + get { + return this.columnMatDesc; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKRow this[int index] { + get { + return ((CartIRKRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event CartIRKRowChangeEventHandler CartIRKRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event CartIRKRowChangeEventHandler CartIRKRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event CartIRKRowChangeEventHandler CartIRKRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event CartIRKRowChangeEventHandler CartIRKRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddCartIRKRow(CartIRKRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKRow AddCartIRKRow(string OrderExtCode, string CartDtmx, string ItemExtCode, string ItemDesc, string ItemNote, int TotReq, int TotCur, int MatExtCode, string MatDesc) { + CartIRKRow rowCartIRKRow = ((CartIRKRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + OrderExtCode, + CartDtmx, + ItemExtCode, + ItemDesc, + ItemNote, + TotReq, + TotCur, + MatExtCode, + MatDesc}; + rowCartIRKRow.ItemArray = columnValuesArray; + this.Rows.Add(rowCartIRKRow); + return rowCartIRKRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + CartIRKDataTable cln = ((CartIRKDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new CartIRKDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnOrderExtCode = base.Columns["OrderExtCode"]; + this.columnCartDtmx = base.Columns["CartDtmx"]; + this.columnItemExtCode = base.Columns["ItemExtCode"]; + this.columnItemDesc = base.Columns["ItemDesc"]; + this.columnItemNote = base.Columns["ItemNote"]; + this.columnTotReq = base.Columns["TotReq"]; + this.columnTotCur = base.Columns["TotCur"]; + this.columnMatExtCode = base.Columns["MatExtCode"]; + this.columnMatDesc = base.Columns["MatDesc"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnOrderExtCode = new global::System.Data.DataColumn("OrderExtCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOrderExtCode); + this.columnCartDtmx = new global::System.Data.DataColumn("CartDtmx", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCartDtmx); + this.columnItemExtCode = new global::System.Data.DataColumn("ItemExtCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnItemExtCode); + this.columnItemDesc = new global::System.Data.DataColumn("ItemDesc", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnItemDesc); + this.columnItemNote = new global::System.Data.DataColumn("ItemNote", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnItemNote); + this.columnTotReq = new global::System.Data.DataColumn("TotReq", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotReq); + this.columnTotCur = new global::System.Data.DataColumn("TotCur", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTotCur); + this.columnMatExtCode = new global::System.Data.DataColumn("MatExtCode", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnMatExtCode); + this.columnMatDesc = new global::System.Data.DataColumn("MatDesc", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnMatDesc); + this.columnOrderExtCode.MaxLength = 250; + this.columnCartDtmx.MaxLength = 10; + this.columnItemExtCode.AllowDBNull = false; + this.columnItemExtCode.MaxLength = 250; + this.columnItemDesc.AllowDBNull = false; + this.columnItemDesc.MaxLength = 500; + this.columnItemNote.AllowDBNull = false; + this.columnItemNote.MaxLength = 500; + this.columnTotReq.ReadOnly = true; + this.columnTotCur.ReadOnly = true; + this.columnMatExtCode.AllowDBNull = false; + this.columnMatDesc.AllowDBNull = false; + this.columnMatDesc.MaxLength = 500; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKRow NewCartIRKRow() { + return ((CartIRKRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new CartIRKRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(CartIRKRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.CartIRKRowChanged != null)) { + this.CartIRKRowChanged(this, new CartIRKRowChangeEvent(((CartIRKRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.CartIRKRowChanging != null)) { + this.CartIRKRowChanging(this, new CartIRKRowChangeEvent(((CartIRKRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.CartIRKRowDeleted != null)) { + this.CartIRKRowDeleted(this, new CartIRKRowChangeEvent(((CartIRKRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.CartIRKRowDeleting != null)) { + this.CartIRKRowDeleting(this, new CartIRKRowChangeEvent(((CartIRKRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveCartIRKRow(CartIRKRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_App ds = new DS_App(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "CartIRKDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -22722,6 +23161,28 @@ namespace AppData { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OrderExtCode { + get { + return ((string)(this[this.tablePack2Cart.OrderExtCodeColumn])); + } + set { + this[this.tablePack2Cart.OrderExtCodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string FamilyCode { + get { + return ((string)(this[this.tablePack2Cart.FamilyCodeColumn])); + } + set { + this[this.tablePack2Cart.FamilyCodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int Started { @@ -22791,6 +23252,188 @@ namespace AppData { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class CartIRKRow : global::System.Data.DataRow { + + private CartIRKDataTable tableCartIRK; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal CartIRKRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableCartIRK = ((CartIRKDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OrderExtCode { + get { + try { + return ((string)(this[this.tableCartIRK.OrderExtCodeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'OrderExtCode\' nella tabella \'CartIRK\' è DBNull.", e); + } + } + set { + this[this.tableCartIRK.OrderExtCodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string CartDtmx { + get { + try { + return ((string)(this[this.tableCartIRK.CartDtmxColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'CartDtmx\' nella tabella \'CartIRK\' è DBNull.", e); + } + } + set { + this[this.tableCartIRK.CartDtmxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ItemExtCode { + get { + return ((string)(this[this.tableCartIRK.ItemExtCodeColumn])); + } + set { + this[this.tableCartIRK.ItemExtCodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ItemDesc { + get { + return ((string)(this[this.tableCartIRK.ItemDescColumn])); + } + set { + this[this.tableCartIRK.ItemDescColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string ItemNote { + get { + return ((string)(this[this.tableCartIRK.ItemNoteColumn])); + } + set { + this[this.tableCartIRK.ItemNoteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int TotReq { + get { + try { + return ((int)(this[this.tableCartIRK.TotReqColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'TotReq\' nella tabella \'CartIRK\' è DBNull.", e); + } + } + set { + this[this.tableCartIRK.TotReqColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int TotCur { + get { + try { + return ((int)(this[this.tableCartIRK.TotCurColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'TotCur\' nella tabella \'CartIRK\' è DBNull.", e); + } + } + set { + this[this.tableCartIRK.TotCurColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int MatExtCode { + get { + return ((int)(this[this.tableCartIRK.MatExtCodeColumn])); + } + set { + this[this.tableCartIRK.MatExtCodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string MatDesc { + get { + return ((string)(this[this.tableCartIRK.MatDescColumn])); + } + set { + this[this.tableCartIRK.MatDescColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsOrderExtCodeNull() { + return this.IsNull(this.tableCartIRK.OrderExtCodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetOrderExtCodeNull() { + this[this.tableCartIRK.OrderExtCodeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsCartDtmxNull() { + return this.IsNull(this.tableCartIRK.CartDtmxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetCartDtmxNull() { + this[this.tableCartIRK.CartDtmxColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsTotReqNull() { + return this.IsNull(this.tableCartIRK.TotReqColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTotReqNull() { + this[this.tableCartIRK.TotReqColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsTotCurNull() { + return this.IsNull(this.tableCartIRK.TotCurColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetTotCurNull() { + this[this.tableCartIRK.TotCurColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -23980,6 +24623,40 @@ namespace AppData { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class CartIRKRowChangeEvent : global::System.EventArgs { + + private CartIRKRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKRowChangeEvent(CartIRKRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace AppData.DS_AppTableAdapters { @@ -36452,6 +37129,8 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W tableMapping.ColumnMappings.Add("CartID", "CartID"); tableMapping.ColumnMappings.Add("CartIndex", "CartIndex"); tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); + tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); + tableMapping.ColumnMappings.Add("FamilyCode", "FamilyCode"); tableMapping.ColumnMappings.Add("Started", "Started"); tableMapping.ColumnMappings.Add("Completed", "Completed"); this._adapter.TableMappings.Add(tableMapping); @@ -36470,8 +37149,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT PackListID, CartID, CartIndex, CartDtmx, Started, Completed FROM v_Pack2Ca" + - "rt"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_Pack2Cart"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -36523,6 +37201,195 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class CartIRKTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public CartIRKTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "CartIRK"; + tableMapping.ColumnMappings.Add("OrderExtCode", "OrderExtCode"); + tableMapping.ColumnMappings.Add("CartDtmx", "CartDtmx"); + tableMapping.ColumnMappings.Add("ItemExtCode", "ItemExtCode"); + tableMapping.ColumnMappings.Add("ItemDesc", "ItemDesc"); + tableMapping.ColumnMappings.Add("ItemNote", "ItemNote"); + tableMapping.ColumnMappings.Add("TotReq", "TotReq"); + tableMapping.ColumnMappings.Add("TotCur", "TotCur"); + tableMapping.ColumnMappings.Add("MatExtCode", "MatExtCode"); + tableMapping.ColumnMappings.Add("MatDesc", "MatDesc"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::AppData.Properties.Settings.Default.Sauder_NKCConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + 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 = "dbo.stp_IRKSum_getByCart"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CartID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, 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(DS_App.CartIRKDataTable dataTable, global::System.Nullable CartID) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((CartID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_App.CartIRKDataTable GetData(global::System.Nullable CartID) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((CartID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(CartID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.CartIRKDataTable dataTable = new DS_App.CartIRKDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index a88cd83..c3f4bdc 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -3030,8 +3030,9 @@ FROM v_OKIB - - SELECT PackListID, CartID, CartIndex, CartDtmx, Started, Completed FROM v_Pack2Cart + + SELECT * +FROM v_Pack2Cart @@ -3042,6 +3043,8 @@ FROM v_OKIB + + @@ -3059,6 +3062,33 @@ FROM v_OKIB + + + + + + dbo.stp_IRKSum_getByCart + + + + + + + + + + + + + + + + + + + + + @@ -4329,11 +4359,76 @@ FROM v_OKIB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index 3bc1754..a2ffa5d 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -40,7 +40,7 @@ - + diff --git a/Jenkinsfile b/Jenkinsfile index 9037844..11343a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,10 +11,10 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=353']) { - // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') - env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=354']) { + // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'NKC' } } diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index d110d3d..a1d3860 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -400,6 +400,7 @@ + @@ -448,6 +449,7 @@ + @@ -757,6 +759,13 @@ BatchPreview.aspx + + CartDetIRK.aspx + ASPXCodeBehind + + + CartDetIRK.aspx + Contact.aspx ASPXCodeBehind @@ -1067,6 +1076,13 @@ cmp_BP_sheetList.ascx + + cmp_cartDetIRK.ascx + ASPXCodeBehind + + + cmp_cartDetIRK.ascx + cmp_devUtils.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_KR_cart.ascx b/NKC_WF/WebUserControls/cmp_KR_cart.ascx index 228c424..dae29d1 100644 --- a/NKC_WF/WebUserControls/cmp_KR_cart.ascx +++ b/NKC_WF/WebUserControls/cmp_KR_cart.ascx @@ -1,12 +1,24 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KR_cart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KR_cart" %> + + + + + + + +
+ +
+ + diff --git a/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs b/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs index 23de14c..7fd5195 100644 --- a/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_KR_cart.ascx.cs @@ -11,10 +11,24 @@ namespace NKC_WF.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - } + public bool showFull + { + get + { + bool answ = false; + bool.TryParse(hfShowFull.Value, out answ); + return answ; + } + set + { + hfShowFull.Value = value.ToString(); + grView.DataBind(); + } + } + /// /// Cart selezionato /// @@ -37,5 +51,6 @@ namespace NKC_WF.WebUserControls { grView.DataBind(); } + } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_KR_cart.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_KR_cart.ascx.designer.cs index 5d2990d..d58ec25 100644 --- a/NKC_WF/WebUserControls/cmp_KR_cart.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_KR_cart.ascx.designer.cs @@ -23,6 +23,15 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.HiddenField hfPackListID; + /// + /// Controllo hfShowFull. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowFull; + /// /// Controllo grView. /// diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx new file mode 100644 index 0000000..15b8845 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx @@ -0,0 +1,24 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_cartDetIRK.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_cartDetIRK" %> + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs new file mode 100644 index 0000000..d717018 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_cartDetIRK : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Cart selezionato + /// + public int CartID + { + get + { + int answ = 0; + int.TryParse(hfCartID.Value, out answ); + return answ; + } + set + { + hfCartID.Value = value.ToString(); + //grView.DataBind(); + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs new file mode 100644 index 0000000..0546521 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_cartDetIRK.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_cartDetIRK + { + + /// + /// Controllo hfCartID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfCartID; + + /// + /// Controllo grView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx index ae7f9d0..184a5f7 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx @@ -1,7 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitReqRunning.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitReqRunning" %> <%@ Register Src="~/WebUserControls/cmp_KR_cart.ascx" TagPrefix="uc1" TagName="cmp_KR_cart" %> -

<%: traduci("RunningKitReq") %>

+
+

<%: traduci("RunningKitReq") %>

+
+ @@ -11,15 +14,7 @@ <%# traduci("NoKitReqRunning") %> - - -
- - -
- - - +
@@ -31,10 +26,19 @@
+ + +
+ + +
+ + <%----%> <%----%> + @@ -46,20 +50,22 @@ - + - + / - + - + + + diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs index 01eb838..1c1d46a 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.cs @@ -16,6 +16,7 @@ namespace NKC_WF.WebUserControls private void fixVisibility() { cmp_KR_cart.Visible = (grView.SelectedIndex >= 0); + divHeader.Visible = showTitle; } internal void doUpdate() @@ -25,6 +26,20 @@ namespace NKC_WF.WebUserControls cmp_KR_cart.doUpdate(); } + public bool showTitle + { + get + { + bool answ = false; + bool.TryParse(hfShowTitle.Value, out answ); + return answ; + } + set + { + hfShowTitle.Value = value.ToString(); + fixVisibility(); + } + } public bool showFull { get @@ -39,6 +54,20 @@ namespace NKC_WF.WebUserControls grView.DataBind(); } } + public bool enableSuspend + { + get + { + bool answ = false; + bool.TryParse(hfEnableSuspend.Value, out answ); + return answ; + } + set + { + hfEnableSuspend.Value = value.ToString(); + grView.DataBind(); + } + } protected void grView_SelectedIndexChanged(object sender, EventArgs e) { int PackListId = 0; diff --git a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs index e6d9c6d..3f40066 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqRunning.ascx.designer.cs @@ -14,6 +14,24 @@ namespace NKC_WF.WebUserControls public partial class cmp_kitReqRunning { + /// + /// Controllo divHeader. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHeader; + + /// + /// Controllo hfShowTitle. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfShowTitle; + /// /// Controllo grView. /// @@ -32,15 +50,6 @@ namespace NKC_WF.WebUserControls /// protected global::System.Web.UI.WebControls.ObjectDataSource odsKit; - /// - /// Controllo cmp_KR_cart. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::NKC_WF.WebUserControls.cmp_KR_cart cmp_KR_cart; - /// /// Controllo hfShowFull. /// @@ -49,5 +58,23 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfShowFull; + + /// + /// Controllo hfEnableSuspend. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfEnableSuspend; + + /// + /// Controllo cmp_KR_cart. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_KR_cart cmp_KR_cart; } } diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx index 15f4ce7..8070619 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx @@ -1,8 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitReqSched.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitReqSched" %> +<%@ Register Src="~/WebUserControls/cmp_KR_cart.ascx" TagPrefix="uc1" TagName="cmp_KR_cart" %> +

<%: traduci("ScheduledKitReq") %>

- + @@ -11,23 +13,37 @@ <%# traduci("NoKitReq") %> - + + +
+ +
+ + +
+ +
+ + + - - + - - - + + + + + <%----%> + @@ -39,10 +55,10 @@ - + - + / @@ -51,3 +67,4 @@ + diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs index ec91f34..2287bdf 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.cs @@ -13,9 +13,14 @@ namespace NKC_WF.WebUserControls if (!Page.IsPostBack) { fixSchedOrd(); + fixVisibility(); } } + private void fixVisibility() + { + cmp_KR_cart.Visible = (grView.SelectedIndex >= 0); + } protected int numRows { get @@ -46,8 +51,10 @@ namespace NKC_WF.WebUserControls internal void doUpdate() { - grView.SelectedIndex = -1; + fixSchedOrd(); grView.DataBind(); + fixVisibility(); + cmp_KR_cart.doUpdate(); lblTitle.Focus(); } @@ -153,5 +160,23 @@ namespace NKC_WF.WebUserControls return answ; } + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + int PackListId = 0; + int.TryParse(grView.SelectedValue.ToString(), out PackListId); + // mostra dettaglio CART + cmp_KR_cart.PackListID = PackListId; + cmp_KR_cart.Visible = true; + } + /// + /// comando reset + /// + /// + /// + protected void lbtReset_Click(object sender, EventArgs e) + { + grView.SelectedIndex = -1; + doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs index 1123bb4..8364625 100644 --- a/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_kitReqSched.ascx.designer.cs @@ -58,5 +58,14 @@ namespace NKC_WF.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfShowFull; + + /// + /// Controllo cmp_KR_cart. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_KR_cart cmp_KR_cart; } } diff --git a/NKC_WF/site/CartDetIRK.aspx b/NKC_WF/site/CartDetIRK.aspx new file mode 100644 index 0000000..6614f8e --- /dev/null +++ b/NKC_WF/site/CartDetIRK.aspx @@ -0,0 +1,21 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="CartDetIRK.aspx.cs" Inherits="NKC_WF.site.CartDetIRK" %> + +<%@ Register Src="~/WebUserControls/cmp_cartDetIRK.ascx" TagPrefix="uc1" TagName="cmp_cartDetIRK" %> + + +
+
+
+
+

<%: traduci("CartSummary") %>

+
+
+ <%: traduci("Print") %> +
+
+
+
+ +
+
+ diff --git a/NKC_WF/site/CartDetIRK.aspx.cs b/NKC_WF/site/CartDetIRK.aspx.cs new file mode 100644 index 0000000..a834599 --- /dev/null +++ b/NKC_WF/site/CartDetIRK.aspx.cs @@ -0,0 +1,39 @@ +using NKC_SDK; +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class CartDetIRK : BasePage + { + protected void Page_Load(object sender, EventArgs e) + { + if(!Page.IsPostBack) + { + ((SiteContent)this.Master).showSearch = false; + } + cmp_cartDetIRK.CartID = memLayer.ML.QSI("CartID"); + } + + /// + /// Queue selezionata + /// + public string currQueue + { + get + { + return "queueIRKGroup"; + } + } + protected void lbtPrint_Click(object sender, EventArgs e) + { + // invio SINGOLO record in stampa + DLMan.stampaDoc(cmp_cartDetIRK.CartID.ToString(), currQueue, tipoDocumento.docCartIRKSum, Request.UserHostName); + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/CartDetIRK.aspx.designer.cs b/NKC_WF/site/CartDetIRK.aspx.designer.cs new file mode 100644 index 0000000..c9fbee2 --- /dev/null +++ b/NKC_WF/site/CartDetIRK.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.site +{ + + + public partial class CartDetIRK + { + + /// + /// Controllo lbtPrint. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtPrint; + + /// + /// Controllo cmp_cartDetIRK. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_cartDetIRK cmp_cartDetIRK; + } +} diff --git a/NKC_WF/site/KitRequestSched.aspx b/NKC_WF/site/KitRequestSched.aspx index 4e9cf30..a6749a1 100644 --- a/NKC_WF/site/KitRequestSched.aspx +++ b/NKC_WF/site/KitRequestSched.aspx @@ -15,7 +15,7 @@ - + diff --git a/NKC_WF/site/Kitting.aspx b/NKC_WF/site/Kitting.aspx index 087a444..5b39a2d 100644 --- a/NKC_WF/site/Kitting.aspx +++ b/NKC_WF/site/Kitting.aspx @@ -1,16 +1,14 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Kitting.aspx.cs" Inherits="NKC_WF.site.Kitting" %> <%@ Register Src="~/WebUserControls/cmp_kitting.ascx" TagPrefix="uc1" TagName="cmp_kitting" %> -<%@ Register Src="~/WebUserControls/cmp_kitRunning.ascx" TagPrefix="uc1" TagName="cmp_kitRunning" %> - - +<%@ Register Src="~/WebUserControls/cmp_kitReqRunning.ascx" TagPrefix="uc1" TagName="cmp_kitReqRunning" %>
- +
diff --git a/NKC_WF/site/Kitting.aspx.cs b/NKC_WF/site/Kitting.aspx.cs index 4f91932..e593bb0 100644 --- a/NKC_WF/site/Kitting.aspx.cs +++ b/NKC_WF/site/Kitting.aspx.cs @@ -15,7 +15,7 @@ namespace NKC_WF.site protected void timerKitting_Tick(object sender, EventArgs e) { - cmp_kitRunning.doUpdate(); + cmp_kitReqRunning.doUpdate(); cmp_kitting.doUpdate(); } } diff --git a/NKC_WF/site/Kitting.aspx.designer.cs b/NKC_WF/site/Kitting.aspx.designer.cs index 4304ba1..4518a9c 100644 --- a/NKC_WF/site/Kitting.aspx.designer.cs +++ b/NKC_WF/site/Kitting.aspx.designer.cs @@ -33,13 +33,13 @@ namespace NKC_WF.site protected global::System.Web.UI.Timer timerKitting; /// - /// Controllo cmp_kitRunning. + /// Controllo cmp_kitReqRunning. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::NKC_WF.WebUserControls.cmp_kitRunning cmp_kitRunning; + protected global::NKC_WF.WebUserControls.cmp_kitReqRunning cmp_kitReqRunning; /// /// Controllo cmp_kitting.