diff --git a/AppData/DS_App.Designer.cs b/AppData/DS_App.Designer.cs index c9cb34e..0f5d5e4 100644 --- a/AppData/DS_App.Designer.cs +++ b/AppData/DS_App.Designer.cs @@ -74,6 +74,8 @@ namespace AppData { private PackListDataTable tablePackList; + private OtherItemDataTable tableOtherItem; + private global::System.Data.DataRelation relationFK_BatchReqList_OrderList; private global::System.Data.DataRelation relationFK_ItemList_Materials1; @@ -201,6 +203,9 @@ namespace AppData { if ((ds.Tables["PackList"] != null)) { base.Tables.Add(new PackListDataTable(ds.Tables["PackList"])); } + if ((ds.Tables["OtherItem"] != null)) { + base.Tables.Add(new OtherItemDataTable(ds.Tables["OtherItem"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -469,6 +474,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 OtherItemDataTable OtherItem { + get { + return this.tableOtherItem; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -611,6 +626,9 @@ namespace AppData { if ((ds.Tables["PackList"] != null)) { base.Tables.Add(new PackListDataTable(ds.Tables["PackList"])); } + if ((ds.Tables["OtherItem"] != null)) { + base.Tables.Add(new OtherItemDataTable(ds.Tables["OtherItem"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -794,6 +812,12 @@ namespace AppData { this.tablePackList.InitVars(); } } + this.tableOtherItem = ((OtherItemDataTable)(base.Tables["OtherItem"])); + if ((initTable == true)) { + if ((this.tableOtherItem != null)) { + this.tableOtherItem.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"]; @@ -866,6 +890,8 @@ namespace AppData { base.Tables.Add(this.tableCartOnKit); this.tablePackList = new PackListDataTable(); base.Tables.Add(this.tablePackList); + this.tableOtherItem = new OtherItemDataTable(); + base.Tables.Add(this.tableOtherItem); 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); @@ -1066,6 +1092,12 @@ namespace AppData { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeOtherItem() { + 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) { @@ -1196,6 +1228,9 @@ namespace AppData { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void PackListRowChangeEventHandler(object sender, PackListRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void OtherItemRowChangeEventHandler(object sender, OtherItemRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -10513,6 +10548,347 @@ namespace AppData { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class OtherItemDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnOtherItemID; + + private global::System.Data.DataColumn columnOtherItemExtCode; + + private global::System.Data.DataColumn columnOtherItemDesc; + + private global::System.Data.DataColumn columnOtherItemDtmx; + + private global::System.Data.DataColumn columnOtherItemType; + + private global::System.Data.DataColumn columnOtherItemNote; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public OtherItemDataTable() { + this.TableName = "OtherItem"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal OtherItemDataTable(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 OtherItemDataTable(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 OtherItemIDColumn { + get { + return this.columnOtherItemID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OtherItemExtCodeColumn { + get { + return this.columnOtherItemExtCode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OtherItemDescColumn { + get { + return this.columnOtherItemDesc; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OtherItemDtmxColumn { + get { + return this.columnOtherItemDtmx; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OtherItemTypeColumn { + get { + return this.columnOtherItemType; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OtherItemNoteColumn { + get { + return this.columnOtherItemNote; + } + } + + [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 OtherItemRow this[int index] { + get { + return ((OtherItemRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event OtherItemRowChangeEventHandler OtherItemRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event OtherItemRowChangeEventHandler OtherItemRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event OtherItemRowChangeEventHandler OtherItemRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event OtherItemRowChangeEventHandler OtherItemRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddOtherItemRow(OtherItemRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public OtherItemRow AddOtherItemRow(string OtherItemExtCode, string OtherItemDesc, string OtherItemDtmx, string OtherItemType, string OtherItemNote) { + OtherItemRow rowOtherItemRow = ((OtherItemRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + OtherItemExtCode, + OtherItemDesc, + OtherItemDtmx, + OtherItemType, + OtherItemNote}; + rowOtherItemRow.ItemArray = columnValuesArray; + this.Rows.Add(rowOtherItemRow); + return rowOtherItemRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public OtherItemRow FindByOtherItemID(int OtherItemID) { + return ((OtherItemRow)(this.Rows.Find(new object[] { + OtherItemID}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + OtherItemDataTable cln = ((OtherItemDataTable)(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 OtherItemDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnOtherItemID = base.Columns["OtherItemID"]; + this.columnOtherItemExtCode = base.Columns["OtherItemExtCode"]; + this.columnOtherItemDesc = base.Columns["OtherItemDesc"]; + this.columnOtherItemDtmx = base.Columns["OtherItemDtmx"]; + this.columnOtherItemType = base.Columns["OtherItemType"]; + this.columnOtherItemNote = base.Columns["OtherItemNote"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnOtherItemID = new global::System.Data.DataColumn("OtherItemID", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOtherItemID); + this.columnOtherItemExtCode = new global::System.Data.DataColumn("OtherItemExtCode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOtherItemExtCode); + this.columnOtherItemDesc = new global::System.Data.DataColumn("OtherItemDesc", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOtherItemDesc); + this.columnOtherItemDtmx = new global::System.Data.DataColumn("OtherItemDtmx", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOtherItemDtmx); + this.columnOtherItemType = new global::System.Data.DataColumn("OtherItemType", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOtherItemType); + this.columnOtherItemNote = new global::System.Data.DataColumn("OtherItemNote", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOtherItemNote); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnOtherItemID}, true)); + this.columnOtherItemID.AutoIncrement = true; + this.columnOtherItemID.AutoIncrementSeed = -1; + this.columnOtherItemID.AutoIncrementStep = -1; + this.columnOtherItemID.AllowDBNull = false; + this.columnOtherItemID.ReadOnly = true; + this.columnOtherItemID.Unique = true; + this.columnOtherItemExtCode.AllowDBNull = false; + this.columnOtherItemExtCode.MaxLength = 250; + this.columnOtherItemDesc.AllowDBNull = false; + this.columnOtherItemDesc.MaxLength = 500; + this.columnOtherItemDtmx.MaxLength = 50; + this.columnOtherItemType.AllowDBNull = false; + this.columnOtherItemType.MaxLength = 50; + this.columnOtherItemNote.AllowDBNull = false; + this.columnOtherItemNote.MaxLength = 500; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public OtherItemRow NewOtherItemRow() { + return ((OtherItemRow)(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 OtherItemRow(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(OtherItemRow); + } + + [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.OtherItemRowChanged != null)) { + this.OtherItemRowChanged(this, new OtherItemRowChangeEvent(((OtherItemRow)(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.OtherItemRowChanging != null)) { + this.OtherItemRowChanging(this, new OtherItemRowChangeEvent(((OtherItemRow)(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.OtherItemRowDeleted != null)) { + this.OtherItemRowDeleted(this, new OtherItemRowChangeEvent(((OtherItemRow)(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.OtherItemRowDeleting != null)) { + this.OtherItemRowDeleting(this, new OtherItemRowChangeEvent(((OtherItemRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveOtherItemRow(OtherItemRow 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 = "OtherItemDataTable"; + 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. /// @@ -14648,6 +15024,104 @@ namespace AppData { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class OtherItemRow : global::System.Data.DataRow { + + private OtherItemDataTable tableOtherItem; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal OtherItemRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableOtherItem = ((OtherItemDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int OtherItemID { + get { + return ((int)(this[this.tableOtherItem.OtherItemIDColumn])); + } + set { + this[this.tableOtherItem.OtherItemIDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OtherItemExtCode { + get { + return ((string)(this[this.tableOtherItem.OtherItemExtCodeColumn])); + } + set { + this[this.tableOtherItem.OtherItemExtCodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OtherItemDesc { + get { + return ((string)(this[this.tableOtherItem.OtherItemDescColumn])); + } + set { + this[this.tableOtherItem.OtherItemDescColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OtherItemDtmx { + get { + try { + return ((string)(this[this.tableOtherItem.OtherItemDtmxColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'OtherItemDtmx\' nella tabella \'OtherItem\' è DBNull.", e); + } + } + set { + this[this.tableOtherItem.OtherItemDtmxColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OtherItemType { + get { + return ((string)(this[this.tableOtherItem.OtherItemTypeColumn])); + } + set { + this[this.tableOtherItem.OtherItemTypeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string OtherItemNote { + get { + return ((string)(this[this.tableOtherItem.OtherItemNoteColumn])); + } + set { + this[this.tableOtherItem.OtherItemNoteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsOtherItemDtmxNull() { + return this.IsNull(this.tableOtherItem.OtherItemDtmxColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetOtherItemDtmxNull() { + this[this.tableOtherItem.OtherItemDtmxColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -15497,6 +15971,40 @@ namespace AppData { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class OtherItemRowChangeEvent : global::System.EventArgs { + + private OtherItemRow 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 OtherItemRowChangeEvent(OtherItemRow 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 OtherItemRow 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 { @@ -24963,6 +25471,201 @@ 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 OtherItemTableAdapter : 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 OtherItemTableAdapter() { + 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 = "OtherItem"; + tableMapping.ColumnMappings.Add("OtherItemID", "OtherItemID"); + tableMapping.ColumnMappings.Add("OtherItemExtCode", "OtherItemExtCode"); + tableMapping.ColumnMappings.Add("OtherItemDesc", "OtherItemDesc"); + tableMapping.ColumnMappings.Add("OtherItemDtmx", "OtherItemDtmx"); + tableMapping.ColumnMappings.Add("OtherItemType", "OtherItemType"); + tableMapping.ColumnMappings.Add("OtherItemNote", "OtherItemNote"); + 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[2]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "select * from OtherItemList"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_OtherItem_getByKey"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OtherItemID", 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.OtherItemDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + 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.OtherItemDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_App.OtherItemDataTable dataTable = new DS_App.OtherItemDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [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, false)] + public virtual DS_App.OtherItemDataTable getByKey(global::System.Nullable OtherItemID) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((OtherItemID.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(OtherItemID.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_App.OtherItemDataTable dataTable = new DS_App.OtherItemDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -25436,15 +26139,6 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allChangedRows.AddRange(updatedRows); } } - if ((this._order2FinalKitTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._order2FinalKitTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._nestingTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Nesting.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -25454,6 +26148,15 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allChangedRows.AddRange(updatedRows); } } + if ((this._binListTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._binListTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -25472,12 +26175,12 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allChangedRows.AddRange(updatedRows); } } - if ((this._binListTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._order2FinalKitTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._binListTableAdapter.Update(updatedRows)); + result = (result + this._order2FinalKitTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -25563,14 +26266,6 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allAddedRows.AddRange(addedRows); } } - if ((this._order2FinalKitTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._order2FinalKitTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._nestingTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Nesting.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -25579,6 +26274,14 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allAddedRows.AddRange(addedRows); } } + if ((this._binListTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._binListTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._offOrd2ItemTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.OffOrd2Item.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -25595,11 +26298,11 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allAddedRows.AddRange(addedRows); } } - if ((this._binListTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._order2FinalKitTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._binListTableAdapter.Update(addedRows)); + result = (result + this._order2FinalKitTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -25613,11 +26316,11 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private int UpdateDeletedRows(DS_App dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._binListTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._order2FinalKitTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._binListTableAdapter.Update(deletedRows)); + result = (result + this._order2FinalKitTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -25637,6 +26340,14 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allChangedRows.AddRange(deletedRows); } } + if ((this._binListTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.BinList.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._binListTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._nestingTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Nesting.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -25645,14 +26356,6 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W allChangedRows.AddRange(deletedRows); } } - if ((this._order2FinalKitTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Order2FinalKit.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._order2FinalKitTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._countersTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Counters.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) diff --git a/AppData/DS_App.xsd b/AppData/DS_App.xsd index d964445..1648273 100644 --- a/AppData/DS_App.xsd +++ b/AppData/DS_App.xsd @@ -2264,6 +2264,39 @@ FROM v_CartKitDetail + + + + + + select * from OtherItemList + + + + + + + + + + + + + + + + + + dbo.stp_OtherItem_getByKey + + + + + + + + + @@ -2957,6 +2990,48 @@ FROM v_CartKitDetail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3054,6 +3129,10 @@ FROM v_CartKitDetail + + + + diff --git a/AppData/DS_App.xss b/AppData/DS_App.xss index becb48b..189f968 100644 --- a/AppData/DS_App.xss +++ b/AppData/DS_App.xss @@ -4,36 +4,37 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + 352 @@ -45,7 +46,7 @@ - + 1197 @@ -57,7 +58,7 @@ - + 1054 @@ -69,7 +70,7 @@ - + 788 @@ -81,7 +82,7 @@ - + 986 @@ -93,7 +94,7 @@ - + 699 @@ -105,7 +106,7 @@ - + 550 @@ -117,7 +118,7 @@ - + 1129 @@ -129,7 +130,7 @@ - + 1380 @@ -141,7 +142,7 @@ - + 1161 @@ -153,7 +154,7 @@ - + 131 @@ -165,7 +166,7 @@ - + 352 diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index a07edb0..93b069a 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -23,6 +23,7 @@ namespace AppData public DS_AppTableAdapters.OfflineOrderListTableAdapter taOffOL; public DS_AppTableAdapters.OffOrd2ItemTableAdapter taOO2I; public DS_AppTableAdapters.OrderListTableAdapter taOL; + public DS_AppTableAdapters.OtherItemTableAdapter taOtItem; public DS_AppTableAdapters.PackListTableAdapter taPLD; public DS_AppTableAdapters.PartValidParetoTableAdapter taPVP; public DS_AppTableAdapters.RemnantsTableAdapter taRem; @@ -58,6 +59,7 @@ namespace AppData taOffOL.Connection.ConnectionString = connString; taOO2I.Connection.ConnectionString = connString; taOL.Connection.ConnectionString = connString; + taOtItem.Connection.ConnectionString = connString; taPLD.Connection.ConnectionString = connString; taPVP.Connection.ConnectionString = connString; taRem.Connection.ConnectionString = connString; @@ -85,6 +87,7 @@ namespace AppData taOffOL = new DS_AppTableAdapters.OfflineOrderListTableAdapter(); taOO2I = new DS_AppTableAdapters.OffOrd2ItemTableAdapter(); taOL = new DS_AppTableAdapters.OrderListTableAdapter(); + taOtItem = new DS_AppTableAdapters.OtherItemTableAdapter(); taPLD = new DS_AppTableAdapters.PackListTableAdapter(); taPVP = new DS_AppTableAdapters.PartValidParetoTableAdapter(); taRem = new DS_AppTableAdapters.RemnantsTableAdapter(); @@ -149,6 +152,15 @@ namespace AppData answ.codeInt = codeInt; answ.description = $"Item Generic: {answ.code}"; } + else if (bcValue.StartsWith("IX")) + { + answ.codeType = codeType.OtherItem; + answ.code = bcValue.Replace("IX", ""); + int codeInt = 0; + int.TryParse(answ.code, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codeInt); + answ.codeInt = codeInt; + answ.description = $"Other Item: {answ.code}"; + } else if (bcValue.StartsWith("IT")) { answ.codeType = codeType.Item; diff --git a/NKC_SDK/Enums.cs b/NKC_SDK/Enums.cs index 99ed6ad..46557a8 100644 --- a/NKC_SDK/Enums.cs +++ b/NKC_SDK/Enums.cs @@ -222,6 +222,7 @@ UNK = 0, Item, ItemGeneric, + OtherItem, Material, Sheet, Stack, diff --git a/NKC_WF/WebUserControls/cmp_kitting.ascx b/NKC_WF/WebUserControls/cmp_kitting.ascx index 3624a5c..6699987 100644 --- a/NKC_WF/WebUserControls/cmp_kitting.ascx +++ b/NKC_WF/WebUserControls/cmp_kitting.ascx @@ -5,7 +5,7 @@ -
+

<%: traduci("BinList") %>

@@ -16,7 +16,7 @@
-
+

<%: traduci("CartList") %>

diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx b/NKC_WF/WebUserControls/cmp_kittingBin.ascx index 9f21fb5..476c1b3 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx @@ -4,9 +4,9 @@
-
-